diff --git a/src/Discord.Net.Core/Entities/Channels/IStageChannel.cs b/src/Discord.Net.Core/Entities/Channels/IStageChannel.cs
index 5e0be5b7..8dbc4c28 100644
--- a/src/Discord.Net.Core/Entities/Channels/IStageChannel.cs
+++ b/src/Discord.Net.Core/Entities/Channels/IStageChannel.cs
@@ -8,14 +8,6 @@ namespace Discord
     /// </summary>
     public interface IStageChannel : IVoiceChannel
     {
-        /// <summary>
-        ///     Gets the topic of the Stage instance.
-        /// </summary>
-        /// <remarks>
-        ///     If the stage isn't live then this property will be set to <see langword="null"/>.
-        /// </remarks>
-        string Topic { get; }
-
         /// <summary>
         ///     Gets the <see cref="StagePrivacyLevel"/> of the current stage.
         /// </summary>
diff --git a/src/Discord.Net.Core/Entities/Channels/IVoiceChannel.cs b/src/Discord.Net.Core/Entities/Channels/IVoiceChannel.cs
index 5973e4a2..5976abe3 100644
--- a/src/Discord.Net.Core/Entities/Channels/IVoiceChannel.cs
+++ b/src/Discord.Net.Core/Entities/Channels/IVoiceChannel.cs
@@ -7,7 +7,7 @@ namespace Discord
     /// <summary>
     ///     Represents a generic voice channel in a guild.
     /// </summary>
-    public interface IVoiceChannel : IMessageChannel, INestedChannel, IAudioChannel, IMentionable
+    public interface IVoiceChannel : ITextChannel, IAudioChannel
     {
         /// <summary>
         ///     Gets the bit-rate that the clients in this voice channel are requested to use.
@@ -31,44 +31,6 @@ namespace Discord
         /// </summary>
         VideoQualityMode VideoQualityMode { get; }
 
-        /// <summary>
-        ///     Bulk-deletes multiple messages.
-        /// </summary>
-        /// <example>
-        ///     <para>The following example gets 250 messages from the channel and deletes them.</para>
-        ///     <code language="cs">
-        ///     var messages = await voiceChannel.GetMessagesAsync(250).FlattenAsync();
-        ///     await voiceChannel.DeleteMessagesAsync(messages);
-        ///     </code>
-        /// </example>
-        /// <remarks>
-        ///     This method attempts to remove the messages specified in bulk.
-        ///     <note type="important">
-        ///         Due to the limitation set by Discord, this method can only remove messages that are posted within 14 days!
-        ///     </note>
-        /// </remarks>
-        /// <param name="messages">The messages to be bulk-deleted.</param>
-        /// <param name="options">The options to be used when sending the request.</param>
-        /// <returns>
-        ///     A task that represents the asynchronous bulk-removal operation.
-        /// </returns>
-        Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null);
-        /// <summary>
-        ///     Bulk-deletes multiple messages.
-        /// </summary>
-        /// <remarks>
-        ///     This method attempts to remove the messages specified in bulk.
-        ///     <note type="important">
-        ///         Due to the limitation set by Discord, this method can only remove messages that are posted within 14 days!
-        ///     </note>
-        /// </remarks>
-        /// <param name="messageIds">The snowflake identifier of the messages to be bulk-deleted.</param>
-        /// <param name="options">The options to be used when sending the request.</param>
-        /// <returns>
-        ///     A task that represents the asynchronous bulk-removal operation.
-        /// </returns>
-        Task DeleteMessagesAsync(IEnumerable<ulong> messageIds, RequestOptions options = null);
-
         /// <summary>
         ///     Modifies this voice channel.
         /// </summary>
diff --git a/src/Discord.Net.Core/Entities/Channels/VoiceChannelProperties.cs b/src/Discord.Net.Core/Entities/Channels/VoiceChannelProperties.cs
index 417e391c..30d692d6 100644
--- a/src/Discord.Net.Core/Entities/Channels/VoiceChannelProperties.cs
+++ b/src/Discord.Net.Core/Entities/Channels/VoiceChannelProperties.cs
@@ -1,26 +1,33 @@
-namespace Discord
+using System;
+
+namespace Discord;
+
+/// <summary>
+///     Provides properties that are used to modify an <see cref="IVoiceChannel" /> with the specified changes.
+/// </summary>
+public class VoiceChannelProperties : TextChannelProperties
 {
     /// <summary>
-    ///     Provides properties that are used to modify an <see cref="IVoiceChannel" /> with the specified changes.
+    ///     Gets or sets the bitrate of the voice connections in this channel. Must be greater than 8000.
     /// </summary>
-    public class VoiceChannelProperties : GuildChannelProperties
-    {
-        /// <summary>
-        ///     Gets or sets the bitrate of the voice connections in this channel. Must be greater than 8000.
-        /// </summary>
-        public Optional<int> Bitrate { get; set; }
-        /// <summary>
-        ///     Gets or sets the maximum number of users that can be present in a channel, or <c>null</c> if none.
-        /// </summary>
-        public Optional<int?> UserLimit { get; set; }
-        /// <summary>
-        ///     Gets or sets the channel voice region id, automatic when set to <see langword="null"/>.
-        /// </summary>
-        public Optional<string> RTCRegion { get; set; }
+    public Optional<int> Bitrate { get; set; }
+    /// <summary>
+    ///     Gets or sets the maximum number of users that can be present in a channel, or <c>null</c> if none.
+    /// </summary>
+    public Optional<int?> UserLimit { get; set; }
+    /// <summary>
+    ///     Gets or sets the channel voice region id, automatic when set to <see langword="null"/>.
+    /// </summary>
+    public Optional<string> RTCRegion { get; set; }
 
-        /// <summary>
-        ///     Get or sets the video quality mode for this channel.
-        /// </summary>
-        public Optional<VideoQualityMode> VideoQualityMode { get; set; }
-    }
+    /// <summary>
+    ///     Get or sets the video quality mode for this channel.
+    /// </summary>
+    public Optional<VideoQualityMode> VideoQualityMode { get; set; }
+
+    /// <remarks>
+    ///     Not supported in voice channels
+    /// </remarks>
+    /// <inheritdoc cref="TextChannelProperties.Topic"/>
+    public new Optional<string> Topic { get; }
 }
diff --git a/src/Discord.Net.Rest/API/Rest/ModifyVoiceChannelParams.cs b/src/Discord.Net.Rest/API/Rest/ModifyVoiceChannelParams.cs
index 2f8cacc6..0f0c6ccf 100644
--- a/src/Discord.Net.Rest/API/Rest/ModifyVoiceChannelParams.cs
+++ b/src/Discord.Net.Rest/API/Rest/ModifyVoiceChannelParams.cs
@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 namespace Discord.API.Rest
 {
     [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-    internal class ModifyVoiceChannelParams : ModifyGuildChannelParams
+    internal class ModifyVoiceChannelParams : ModifyTextChannelParams
     {
         [JsonProperty("bitrate")]
         public Optional<int> Bitrate { get; set; }
diff --git a/src/Discord.Net.Rest/Entities/Channels/ChannelHelper.cs b/src/Discord.Net.Rest/Entities/Channels/ChannelHelper.cs
index fbfa0f3d..3e1d0a60 100644
--- a/src/Discord.Net.Rest/Entities/Channels/ChannelHelper.cs
+++ b/src/Discord.Net.Rest/Entities/Channels/ChannelHelper.cs
@@ -91,6 +91,8 @@ namespace Discord.Rest
                         Deny = overwrite.Permissions.DenyValue.ToString()
                     }).ToArray()
                     : Optional.Create<API.Overwrite[]>(),
+                SlowModeInterval = args.SlowModeInterval,
+                IsNsfw = args.IsNsfw,
             };
             return await client.ApiClient.ModifyGuildChannelAsync(channel.Id, apiArgs, options).ConfigureAwait(false);
         }
diff --git a/src/Discord.Net.Rest/Entities/Channels/RestStageChannel.cs b/src/Discord.Net.Rest/Entities/Channels/RestStageChannel.cs
index bbb68932..47a19967 100644
--- a/src/Discord.Net.Rest/Entities/Channels/RestStageChannel.cs
+++ b/src/Discord.Net.Rest/Entities/Channels/RestStageChannel.cs
@@ -13,10 +13,12 @@ namespace Discord.Rest
     {
         /// <inheritdoc/>
         /// <remarks>
-        ///     This field is always false for stage channels.
+        ///     This field is always true for stage channels.
         /// </remarks>
+        /// 
+        [Obsolete("This property is no longer used because Discord enabled text-in-voice and text-in-stage for all channels.")]
         public override bool IsTextInVoice
-            => false;
+            => true;
 
         /// <inheritdoc/>
         public StagePrivacyLevel? PrivacyLevel { get; private set; }
diff --git a/src/Discord.Net.Rest/Entities/Channels/RestVoiceChannel.cs b/src/Discord.Net.Rest/Entities/Channels/RestVoiceChannel.cs
index df5b187f..eac40538 100644
--- a/src/Discord.Net.Rest/Entities/Channels/RestVoiceChannel.cs
+++ b/src/Discord.Net.Rest/Entities/Channels/RestVoiceChannel.cs
@@ -19,7 +19,9 @@ namespace Discord.Rest
         /// <summary>
         ///     Gets whether or not the guild has Text-In-Voice enabled and the voice channel is a TiV channel.
         /// </summary>
+        [Obsolete("This property is no longer used because Discord enabled text-in-voice for all channels.")]
         public virtual bool IsTextInVoice => true;
+
         /// <inheritdoc />
         public int Bitrate { get; private set; }
         /// <inheritdoc />
@@ -62,11 +64,6 @@ namespace Discord.Rest
             Update(model);
         }
 
-        /// <inheritdoc/>
-        /// <exception cref="InvalidOperationException">Cannot modify text channel properties of a voice channel.</exception>
-        public override Task ModifyAsync(Action<TextChannelProperties> func, RequestOptions options = null)
-            => throw new InvalidOperationException("Cannot modify text channel properties of a voice channel");
-
         /// <inheritdoc/>
         /// <exception cref="InvalidOperationException">Cannot create a thread within a voice channel.</exception>
         public override Task<RestThreadChannel> CreateThreadAsync(string name, ThreadType type = ThreadType.PublicThread, ThreadArchiveDuration autoArchiveDuration = ThreadArchiveDuration.OneDay, IMessage message = null, bool? invitable = null, int? slowmode = null, RequestOptions options = null)
@@ -78,166 +75,6 @@ namespace Discord.Rest
 
         #region TextOverrides
 
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task<RestMessage> GetMessageAsync(ulong id, RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.GetMessageAsync(id, options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task DeleteMessageAsync(IMessage message, RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.DeleteMessageAsync(message, options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task DeleteMessageAsync(ulong messageId, RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.DeleteMessageAsync(messageId, options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.DeleteMessagesAsync(messages, options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task DeleteMessagesAsync(IEnumerable<ulong> messageIds, RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.DeleteMessagesAsync(messageIds, options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override IDisposable EnterTypingState(RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.EnterTypingState(options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override IAsyncEnumerable<IReadOnlyCollection<RestMessage>> GetMessagesAsync(IMessage fromMessage, Direction dir, int limit = 100, RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.GetMessagesAsync(fromMessage, dir, limit, options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override IAsyncEnumerable<IReadOnlyCollection<RestMessage>> GetMessagesAsync(int limit = 100, RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.GetMessagesAsync(limit, options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override IAsyncEnumerable<IReadOnlyCollection<RestMessage>> GetMessagesAsync(ulong fromMessageId, Direction dir, int limit = 100, RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.GetMessagesAsync(fromMessageId, dir, limit, options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task<IReadOnlyCollection<RestMessage>> GetPinnedMessagesAsync(RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.GetPinnedMessagesAsync(options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task<RestWebhook> GetWebhookAsync(ulong id, RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.GetWebhookAsync(id, options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task<IReadOnlyCollection<RestWebhook>> GetWebhooksAsync(RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.GetWebhooksAsync(options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task<RestWebhook> CreateWebhookAsync(string name, Stream avatar = null, RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.CreateWebhookAsync(name, avatar, options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task<IUserMessage> ModifyMessageAsync(ulong messageId, Action<MessageProperties> func, RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.ModifyMessageAsync(messageId, func, options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task<RestUserMessage> SendFileAsync(FileAttachment attachment, string text, bool isTTS = false, Embed embed = null, RequestOptions options = null, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.SendFileAsync(attachment, text, isTTS, embed, options, allowedMentions, messageReference, components, stickers, embeds, flags);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task<RestUserMessage> SendFileAsync(Stream stream, string filename, string text, bool isTTS = false, Embed embed = null, RequestOptions options = null, bool isSpoiler = false, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.SendFileAsync(stream, filename, text, isTTS, embed, options, isSpoiler, allowedMentions, messageReference, components, stickers, embeds, flags);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task<RestUserMessage> SendFileAsync(string filePath, string text, bool isTTS = false, Embed embed = null, RequestOptions options = null, bool isSpoiler = false, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.SendFileAsync(filePath, text, isTTS, embed, options, isSpoiler, allowedMentions, messageReference, components, stickers, embeds, flags);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task<RestUserMessage> SendFilesAsync(IEnumerable<FileAttachment> attachments, string text, bool isTTS = false, Embed embed = null, RequestOptions options = null, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.SendFilesAsync(attachments, text, isTTS, embed, options, allowedMentions, messageReference, components, stickers, embeds, flags);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task<RestUserMessage> SendMessageAsync(string text = null, bool isTTS = false, Embed embed = null, RequestOptions options = null, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.SendMessageAsync(text, isTTS, embed, options, allowedMentions, messageReference, components, stickers, embeds, flags);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task TriggerTypingAsync(RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.TriggerTypingAsync(options);
-        }
-
         /// <inheritdoc/> <exception cref="NotSupportedException">Threads are not supported in voice channels</exception>
         public override Task<IReadOnlyCollection<RestThreadChannel>> GetActiveThreadsAsync(RequestOptions options = null)
             => throw new NotSupportedException("Threads are not supported in voice channels");
diff --git a/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs b/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs
index 1cb9f07e..384be196 100644
--- a/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs
+++ b/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs
@@ -212,6 +212,8 @@ namespace Discord.Rest
         public static async Task PinAsync(IMessage msg, BaseDiscordClient client,
             RequestOptions options)
         {
+            if (msg.Channel is IVoiceChannel)
+                throw new NotSupportedException("Pinned messages are not supported in text-in-voice channels.");
             await client.ApiClient.AddPinAsync(msg.Channel.Id, msg.Id, options).ConfigureAwait(false);
         }
 
diff --git a/src/Discord.Net.WebSocket/Entities/Channels/SocketStageChannel.cs b/src/Discord.Net.WebSocket/Entities/Channels/SocketStageChannel.cs
index 4983bc46..c7aea573 100644
--- a/src/Discord.Net.WebSocket/Entities/Channels/SocketStageChannel.cs
+++ b/src/Discord.Net.WebSocket/Entities/Channels/SocketStageChannel.cs
@@ -16,10 +16,11 @@ namespace Discord.WebSocket
     {
         /// <inheritdoc/>
         /// <remarks>
-        ///     This field is always false for stage channels.
+        ///     This field is always true for stage channels.
         /// </remarks>
+        [Obsolete("This property is no longer used because Discord enabled text-in-stage for all channels.")]
         public override bool IsTextInVoice
-            => false;
+            => true;
 
         /// <inheritdoc/>
         public StagePrivacyLevel? PrivacyLevel { get; private set; }
diff --git a/src/Discord.Net.WebSocket/Entities/Channels/SocketVoiceChannel.cs b/src/Discord.Net.WebSocket/Entities/Channels/SocketVoiceChannel.cs
index 2993feda..6e3b9a77 100644
--- a/src/Discord.Net.WebSocket/Entities/Channels/SocketVoiceChannel.cs
+++ b/src/Discord.Net.WebSocket/Entities/Channels/SocketVoiceChannel.cs
@@ -23,9 +23,10 @@ namespace Discord.WebSocket
         /// </summary>
         /// <remarks>
         ///     Discord currently doesn't have a way to disable Text-In-Voice yet so this field is always
-        ///     <see langword="true"/> on <see cref="SocketVoiceChannel"/>s and <see langword="false"/> on
+        ///     <see langword="true"/> on <see cref="SocketVoiceChannel"/>s and <see langword="true"/> on
         ///     <see cref="SocketStageChannel"/>s.
         /// </remarks>
+        [Obsolete("This property is no longer used because Discord enabled text-in-voice for all channels.")]
         public virtual bool IsTextInVoice => true;
 
         /// <inheritdoc />
@@ -99,206 +100,10 @@ namespace Discord.WebSocket
         public override Task<SocketThreadChannel> CreateThreadAsync(string name, ThreadType type = ThreadType.PublicThread, ThreadArchiveDuration autoArchiveDuration = ThreadArchiveDuration.OneDay, IMessage message = null, bool? invitable = null, int? slowmode = null, RequestOptions options = null)
             => throw new InvalidOperationException("Voice channels cannot contain threads.");
 
-        /// <inheritdoc/> <exception cref="InvalidOperationException">Cannot modify text channel properties for voice channels.</exception>
-        public override Task ModifyAsync(Action<TextChannelProperties> func, RequestOptions options = null)
-            => throw new InvalidOperationException("Cannot modify text channel properties for voice channels.");
-
         #endregion
 
         #region TextOverrides
 
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task<IMessage> GetMessageAsync(ulong id, RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.GetMessageAsync(id, options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task DeleteMessageAsync(IMessage message, RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.DeleteMessageAsync(message, options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task DeleteMessageAsync(ulong messageId, RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.DeleteMessageAsync(messageId, options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.DeleteMessagesAsync(messages, options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task DeleteMessagesAsync(IEnumerable<ulong> messageIds, RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.DeleteMessagesAsync(messageIds, options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override IDisposable EnterTypingState(RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.EnterTypingState(options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override SocketMessage GetCachedMessage(ulong id)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.GetCachedMessage(id);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override IReadOnlyCollection<SocketMessage> GetCachedMessages(IMessage fromMessage, Direction dir, int limit = 100)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.GetCachedMessages(fromMessage, dir, limit);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override IReadOnlyCollection<SocketMessage> GetCachedMessages(int limit = 100)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.GetCachedMessages(limit);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override IReadOnlyCollection<SocketMessage> GetCachedMessages(ulong fromMessageId, Direction dir, int limit = 100)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.GetCachedMessages(fromMessageId, dir, limit);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override IAsyncEnumerable<IReadOnlyCollection<IMessage>> GetMessagesAsync(IMessage fromMessage, Direction dir, int limit = 100, RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.GetMessagesAsync(fromMessage, dir, limit, options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override IAsyncEnumerable<IReadOnlyCollection<IMessage>> GetMessagesAsync(int limit = 100, RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.GetMessagesAsync(limit, options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override IAsyncEnumerable<IReadOnlyCollection<IMessage>> GetMessagesAsync(ulong fromMessageId, Direction dir, int limit = 100, RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.GetMessagesAsync(fromMessageId, dir, limit, options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task<IReadOnlyCollection<RestMessage>> GetPinnedMessagesAsync(RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.GetPinnedMessagesAsync(options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task<RestWebhook> GetWebhookAsync(ulong id, RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.GetWebhookAsync(id, options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task<IReadOnlyCollection<RestWebhook>> GetWebhooksAsync(RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.GetWebhooksAsync(options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task<RestWebhook> CreateWebhookAsync(string name, Stream avatar = null, RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.CreateWebhookAsync(name, avatar, options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task<IUserMessage> ModifyMessageAsync(ulong messageId, Action<MessageProperties> func, RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.ModifyMessageAsync(messageId, func, options);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task<RestUserMessage> SendFileAsync(FileAttachment attachment, string text, bool isTTS = false, Embed embed = null, RequestOptions options = null, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.SendFileAsync(attachment, text, isTTS, embed, options, allowedMentions, messageReference, components, stickers, embeds, flags);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task<RestUserMessage> SendFileAsync(Stream stream, string filename, string text, bool isTTS = false, Embed embed = null, RequestOptions options = null, bool isSpoiler = false, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.SendFileAsync(stream, filename, text, isTTS, embed, options, isSpoiler, allowedMentions, messageReference, components, stickers, embeds, flags);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task<RestUserMessage> SendFileAsync(string filePath, string text, bool isTTS = false, Embed embed = null, RequestOptions options = null, bool isSpoiler = false, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.SendFileAsync(filePath, text, isTTS, embed, options, isSpoiler, allowedMentions, messageReference, components, stickers, embeds, flags);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task<RestUserMessage> SendFilesAsync(IEnumerable<FileAttachment> attachments, string text, bool isTTS = false, Embed embed = null, RequestOptions options = null, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.SendFilesAsync(attachments, text, isTTS, embed, options, allowedMentions, messageReference, components, stickers, embeds, flags);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task<RestUserMessage> SendMessageAsync(string text = null, bool isTTS = false, Embed embed = null, RequestOptions options = null, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.SendMessageAsync(text, isTTS, embed, options, allowedMentions, messageReference, components, stickers, embeds, flags);
-        }
-
-        /// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception>
-        public override Task TriggerTypingAsync(RequestOptions options = null)
-        {
-            if (!IsTextInVoice)
-                throw new NotSupportedException("This function is only supported in Text-In-Voice channels");
-            return base.TriggerTypingAsync(options);
-        }
-
         /// <inheritdoc/> <exception cref="NotSupportedException">Threads are not supported in voice channels</exception>
         public override Task<IReadOnlyCollection<RestThreadChannel>> GetActiveThreadsAsync(RequestOptions options = null)
             => throw new NotSupportedException("Threads are not supported in voice channels");
diff --git a/test/Discord.Net.Tests.Unit/MockedEntities/MockedVoiceChannel.cs b/test/Discord.Net.Tests.Unit/MockedEntities/MockedVoiceChannel.cs
index 3373ec93..30328877 100644
--- a/test/Discord.Net.Tests.Unit/MockedEntities/MockedVoiceChannel.cs
+++ b/test/Discord.Net.Tests.Unit/MockedEntities/MockedVoiceChannel.cs
@@ -12,9 +12,17 @@ namespace Discord
         public int Bitrate => throw new NotImplementedException();
 
         public int? UserLimit => throw new NotImplementedException();
+        public string Topic { get; }
+        public int SlowModeInterval { get; }
+        public ThreadArchiveDuration DefaultArchiveDuration { get; }
         public Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null) => throw new NotImplementedException();
 
         public Task DeleteMessagesAsync(IEnumerable<ulong> messageIds, RequestOptions options = null) => throw new NotImplementedException();
+        public Task ModifyAsync(Action<TextChannelProperties> func, RequestOptions options = null) => throw new NotImplementedException();
+
+        public Task<IThreadChannel> CreateThreadAsync(string name, ThreadType type = ThreadType.PublicThread, ThreadArchiveDuration autoArchiveDuration = ThreadArchiveDuration.OneDay, IMessage message = null, bool? invitable = null, int? slowmode = null, RequestOptions options = null) => throw new NotImplementedException();
+
+        public Task<IReadOnlyCollection<IThreadChannel>> GetActiveThreadsAsync(RequestOptions options = null) => throw new NotImplementedException();
 
         public ulong? CategoryId => throw new NotImplementedException();
 
@@ -39,6 +47,7 @@ namespace Discord
         public ChannelFlags Flags => throw new NotImplementedException();
 
         public VideoQualityMode VideoQualityMode => throw new NotImplementedException();
+        public bool IsNsfw { get; }
 
         public Task AddPermissionOverwriteAsync(IRole role, OverwritePermissions permissions, RequestOptions options = null) => throw new NotImplementedException();
         public Task AddPermissionOverwriteAsync(IUser user, OverwritePermissions permissions, RequestOptions options = null) => throw new NotImplementedException();
@@ -78,5 +87,10 @@ namespace Discord
         public Task TriggerTypingAsync(RequestOptions options = null) => throw new NotImplementedException();
         Task<IUser> IChannel.GetUserAsync(ulong id, CacheMode mode, RequestOptions options) => throw new NotImplementedException();
         IAsyncEnumerable<IReadOnlyCollection<IUser>> IChannel.GetUsersAsync(CacheMode mode, RequestOptions options) => throw new NotImplementedException();
+        public Task<IWebhook> CreateWebhookAsync(string name, Stream avatar = null, RequestOptions options = null) => throw new NotImplementedException();
+
+        public Task<IWebhook> GetWebhookAsync(ulong id, RequestOptions options = null) => throw new NotImplementedException();
+
+        public Task<IReadOnlyCollection<IWebhook>> GetWebhooksAsync(RequestOptions options = null) => throw new NotImplementedException();
     }
 }