Get Archived thread calls on text channels (#3198)

* Get Archived thread calls on text channels

* Throw not supported exceptions on Thread&Voice channels

* Extract interface

* Should probably also change these

* Move to regions

Author: RobinLaevaert

src/Discord.Net.Core/Entities/Channels/IForumChannel.cs

@@ -10,7 +10,7 @@ namespace Discord
     /// <summary>
     ///     Represents a forum channel in a guild that can create posts.
     /// </summary>
-    public interface IForumChannel : IMentionable, INestedChannel, IIntegrationChannel
+    public interface IForumChannel : IMentionable, INestedChannel, IIntegrationChannel, IThreadContainerChannel
     {
         /// <summary>
         ///     Gets a value that indicates whether the channel is NSFW.
@@ -226,53 +226,5 @@ public Task<IThreadChannel> CreatePostWithFilesAsync(string title, IEnumerable<F
             int? slowmode = null, string text = null, Embed embed = null, RequestOptions options = null, AllowedMentions allowedMentions = null,
             MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None, ForumTag[] tags = null);
 
-        /// <summary>
-        ///     Gets a collection of active threads within this forum channel.
-        /// </summary>
-        /// <param name="options">The options to be used when sending the request.</param>
-        /// <returns>
-        ///     A task that represents an asynchronous get operation for retrieving the threads. The task result contains
-        ///     a collection of active threads.
-        /// </returns>
-        Task<IReadOnlyCollection<IThreadChannel>> GetActiveThreadsAsync(RequestOptions options = null);
-
-        /// <summary>
-        ///     Gets a collection of publicly archived threads within this forum channel.
-        /// </summary>
-        /// <param name="limit">The optional limit of how many to get.</param>
-        /// <param name="before">The optional date to return threads created before this timestamp.</param>
-        /// <param name="options">The options to be used when sending the request.</param>
-        /// <returns>
-        ///     A task that represents an asynchronous get operation for retrieving the threads. The task result contains
-        ///     a collection of publicly archived threads.
-        /// </returns>
-        Task<IReadOnlyCollection<IThreadChannel>> GetPublicArchivedThreadsAsync(int? limit = null, DateTimeOffset? before = null, RequestOptions options = null);
-
-        /// <summary>
-        ///     Gets a collection of privately archived threads within this forum channel.
-        /// </summary>
-        /// <remarks>
-        ///     The bot requires the <see cref="GuildPermission.ManageThreads"/> permission in order to execute this request.
-        /// </remarks>
-        /// <param name="limit">The optional limit of how many to get.</param>
-        /// <param name="before">The optional date to return threads created before this timestamp.</param>
-        /// <param name="options">The options to be used when sending the request.</param>
-        /// <returns>
-        ///     A task that represents an asynchronous get operation for retrieving the threads. The task result contains
-        ///     a collection of privately archived threads.
-        /// </returns>
-        Task<IReadOnlyCollection<IThreadChannel>> GetPrivateArchivedThreadsAsync(int? limit = null, DateTimeOffset? before = null, RequestOptions options = null);
-
-        /// <summary>
-        ///     Gets a collection of privately archived threads that the current bot has joined within this forum channel.
-        /// </summary>
-        /// <param name="limit">The optional limit of how many to get.</param>
-        /// <param name="before">The optional date to return threads created before this timestamp.</param>
-        /// <param name="options">The options to be used when sending the request.</param>
-        /// <returns>
-        ///     A task that represents an asynchronous get operation for retrieving the threads. The task result contains
-        ///     a collection of privately archived threads.
-        /// </returns>
-        Task<IReadOnlyCollection<IThreadChannel>> GetJoinedPrivateArchivedThreadsAsync(int? limit = null, DateTimeOffset? before = null, RequestOptions options = null);
     }
 }

src/Discord.Net.Core/Entities/Channels/ITextChannel.cs

@@ -8,7 +8,7 @@ namespace Discord
     /// <summary>
     ///     Represents a generic channel in a guild that can send and receive messages.
     /// </summary>
-    public interface ITextChannel : IMessageChannel, IMentionable, INestedChannel, IIntegrationChannel
+    public interface ITextChannel : IMessageChannel, IMentionable, INestedChannel, IIntegrationChannel, IThreadContainerChannel
     {
         /// <summary>
         ///     Gets a value that indicates whether the channel is NSFW.
@@ -125,7 +125,7 @@ public interface ITextChannel : IMessageChannel, IMentionable, INestedChannel, I
         ///     The duration on which this thread archives after.
         ///     <para>
         ///         <b>Note: </b> Options <see cref="ThreadArchiveDuration.OneWeek"/> and <see cref="ThreadArchiveDuration.ThreeDays"/>
-        ///         are only available for guilds that are boosted. You can check in the <see cref="IGuild.Features"/> to see if the 
+        ///         are only available for guilds that are boosted. You can check in the <see cref="IGuild.Features"/> to see if the
         ///         guild has the <b>THREE_DAY_THREAD_ARCHIVE</b> and <b>SEVEN_DAY_THREAD_ARCHIVE</b>.
         ///     </para>
         /// </param>
@@ -139,14 +139,5 @@ public interface ITextChannel : IMessageChannel, IMentionable, INestedChannel, I
         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);
 
-        /// <summary>
-        ///     Gets a collection of active threads within this channel.
-        /// </summary>
-        /// <param name="options">The options to be used when sending the request.</param>
-        /// <returns>
-        ///     A task that represents an asynchronous get operation for retrieving the threads. The task result contains
-        ///     a collection of active threads.
-        /// </returns>
-        Task<IReadOnlyCollection<IThreadChannel>> GetActiveThreadsAsync(RequestOptions options = null);
     }
 }

src/Discord.Net.Core/Entities/Channels/IThreadContainerChannel.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Discord
+{
+    /// <summary>
+    ///     Represents a channel that can contain and query threads.
+    /// </summary>
+    public interface IThreadContainerChannel
+    {
+        /// <summary>
+        ///     Gets a collection of active threads within this channel.
+        /// </summary>
+        /// <param name="options">The options to be used when sending the request.</param>
+        /// <returns>
+        ///     A task that represents an asynchronous get operation for retrieving the threads. The task result contains
+        ///     a collection of active threads.
+        /// </returns>
+        Task<IReadOnlyCollection<IThreadChannel>> GetActiveThreadsAsync(RequestOptions options = null);
+
+        /// <summary>
+        ///     Gets a collection of publicly archived threads within this channel.
+        /// </summary>
+        /// <param name="limit">The optional limit of how many to get.</param>
+        /// <param name="before">The optional date to return threads created before this timestamp.</param>
+        /// <param name="options">The options to be used when sending the request.</param>
+        /// <returns>
+        ///     A task that represents an asynchronous get operation for retrieving the threads. The task result contains
+        ///     a collection of publicly archived threads.
+        /// </returns>
+        Task<IReadOnlyCollection<IThreadChannel>> GetPublicArchivedThreadsAsync(int? limit = null, DateTimeOffset? before = null, RequestOptions options = null);
+
+        /// <summary>
+        ///     Gets a collection of privately archived threads within this channel.
+        /// </summary>
+        /// <remarks>
+        ///     The bot requires the <see cref="GuildPermission.ManageThreads"/> permission in order to execute this request.
+        /// </remarks>
+        /// <param name="limit">The optional limit of how many to get.</param>
+        /// <param name="before">The optional date to return threads created before this timestamp.</param>
+        /// <param name="options">The options to be used when sending the request.</param>
+        /// <returns>
+        ///     A task that represents an asynchronous get operation for retrieving the threads. The task result contains
+        ///     a collection of privately archived threads.
+        /// </returns>
+        Task<IReadOnlyCollection<IThreadChannel>> GetPrivateArchivedThreadsAsync(int? limit = null, DateTimeOffset? before = null, RequestOptions options = null);
+
+        /// <summary>
+        ///     Gets a collection of privately archived threads that the current bot has joined within this channel.
+        /// </summary>
+        /// <param name="limit">The optional limit of how many to get.</param>
+        /// <param name="before">The optional date to return threads created before this timestamp.</param>
+        /// <param name="options">The options to be used when sending the request.</param>
+        /// <returns>
+        ///     A task that represents an asynchronous get operation for retrieving the threads. The task result contains
+        ///     a collection of privately archived threads.
+        /// </returns>
+        Task<IReadOnlyCollection<IThreadChannel>> GetJoinedPrivateArchivedThreadsAsync(int? limit = null, DateTimeOffset? before = null, RequestOptions options = null);
+    }
+}

src/Discord.Net.Rest/Entities/Channels/RestForumChannel.cs

@@ -138,22 +138,6 @@ public Task<RestThreadChannel> CreatePostWithFilesAsync(string title, IEnumerabl
             MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None, ForumTag[] tags = null)
             => ThreadHelper.CreatePostAsync(this, Discord, title, attachments, archiveDuration, slowmode, text, embed, options, allowedMentions, components, stickers, embeds, flags, tags?.Select(tag => tag.Id).ToArray());
 
-        /// <inheritdoc cref="ITextChannel.GetActiveThreadsAsync(RequestOptions)"/>
-        public Task<IReadOnlyCollection<RestThreadChannel>> GetActiveThreadsAsync(RequestOptions options = null)
-            => ThreadHelper.GetActiveThreadsAsync(Guild, Id, Discord, options);
-
-        /// <inheritdoc cref="IForumChannel.GetJoinedPrivateArchivedThreadsAsync(int?, DateTimeOffset?, RequestOptions)"/>
-        public Task<IReadOnlyCollection<RestThreadChannel>> GetJoinedPrivateArchivedThreadsAsync(int? limit = null, DateTimeOffset? before = null, RequestOptions options = null)
-            => ThreadHelper.GetJoinedPrivateArchivedThreadsAsync(this, Discord, limit, before, options);
-
-        /// <inheritdoc cref="IForumChannel.GetPrivateArchivedThreadsAsync(int?, DateTimeOffset?, RequestOptions)"/>
-        public Task<IReadOnlyCollection<RestThreadChannel>> GetPrivateArchivedThreadsAsync(int? limit = null, DateTimeOffset? before = null, RequestOptions options = null)
-            => ThreadHelper.GetPrivateArchivedThreadsAsync(this, Discord, limit, before, options);
-
-        /// <inheritdoc cref="IForumChannel.GetPublicArchivedThreadsAsync(int?, DateTimeOffset?, RequestOptions)"/>
-        public Task<IReadOnlyCollection<RestThreadChannel>> GetPublicArchivedThreadsAsync(int? limit = null, DateTimeOffset? before = null, RequestOptions options = null)
-            => ThreadHelper.GetPublicArchivedThreadsAsync(this, Discord, limit, before, options);
-
         /// <inheritdoc cref="IIntegrationChannel.CreateWebhookAsync"/>
         public Task<RestWebhook> CreateWebhookAsync(string name, Stream avatar = null, RequestOptions options = null)
             => ChannelHelper.CreateWebhookAsync(this, Discord, name, avatar, options);
@@ -167,14 +151,6 @@ public Task<IReadOnlyCollection<RestWebhook>> GetWebhooksAsync(RequestOptions op
             => ChannelHelper.GetWebhooksAsync(this, Discord, options);
 
         #region IForumChannel
-        async Task<IReadOnlyCollection<IThreadChannel>> IForumChannel.GetActiveThreadsAsync(RequestOptions options)
-            => await GetActiveThreadsAsync(options).ConfigureAwait(false);
-        async Task<IReadOnlyCollection<IThreadChannel>> IForumChannel.GetPublicArchivedThreadsAsync(int? limit, DateTimeOffset? before, RequestOptions options)
-            => await GetPublicArchivedThreadsAsync(limit, before, options).ConfigureAwait(false);
-        async Task<IReadOnlyCollection<IThreadChannel>> IForumChannel.GetPrivateArchivedThreadsAsync(int? limit, DateTimeOffset? before, RequestOptions options)
-            => await GetPrivateArchivedThreadsAsync(limit, before, options).ConfigureAwait(false);
-        async Task<IReadOnlyCollection<IThreadChannel>> IForumChannel.GetJoinedPrivateArchivedThreadsAsync(int? limit, DateTimeOffset? before, RequestOptions options)
-            => await GetJoinedPrivateArchivedThreadsAsync(limit, before, options).ConfigureAwait(false);
         async Task<IThreadChannel> IForumChannel.CreatePostAsync(string title, ThreadArchiveDuration archiveDuration, int? slowmode, string text, Embed embed, RequestOptions options, AllowedMentions allowedMentions, MessageComponent components, ISticker[] stickers, Embed[] embeds, MessageFlags flags, ForumTag[] tags)
             => await CreatePostAsync(title, archiveDuration, slowmode, text, embed, options, allowedMentions, components, stickers, embeds, flags, tags).ConfigureAwait(false);
         async Task<IThreadChannel> IForumChannel.CreatePostWithFileAsync(string title, string filePath, ThreadArchiveDuration archiveDuration, int? slowmode, string text, Embed embed, RequestOptions options, bool isSpoiler, AllowedMentions allowedMentions, MessageComponent components, ISticker[] stickers, Embed[] embeds, MessageFlags flags, ForumTag[] tags)
@@ -230,5 +206,32 @@ async Task<IReadOnlyCollection<IWebhook>> IIntegrationChannel.GetWebhooksAsync(R
 
         #endregion
 
+        #region IThreadContainerChannel
+        /// <inheritdoc cref="IThreadContainerChannel.GetActiveThreadsAsync(RequestOptions)"/>
+        public Task<IReadOnlyCollection<RestThreadChannel>> GetActiveThreadsAsync(RequestOptions options = null)
+            => ThreadHelper.GetActiveThreadsAsync(Guild, Id, Discord, options);
+
+        /// <inheritdoc cref="IThreadContainerChannel.GetJoinedPrivateArchivedThreadsAsync(int?, DateTimeOffset?, RequestOptions)"/>
+        public Task<IReadOnlyCollection<RestThreadChannel>> GetJoinedPrivateArchivedThreadsAsync(int? limit = null, DateTimeOffset? before = null, RequestOptions options = null)
+            => ThreadHelper.GetJoinedPrivateArchivedThreadsAsync(this, Discord, limit, before, options);
+
+        /// <inheritdoc cref="IThreadContainerChannel.GetPrivateArchivedThreadsAsync(int?, DateTimeOffset?, RequestOptions)"/>
+        public Task<IReadOnlyCollection<RestThreadChannel>> GetPrivateArchivedThreadsAsync(int? limit = null, DateTimeOffset? before = null, RequestOptions options = null)
+            => ThreadHelper.GetPrivateArchivedThreadsAsync(this, Discord, limit, before, options);
+
+        /// <inheritdoc cref="IThreadContainerChannel.GetPublicArchivedThreadsAsync(int?, DateTimeOffset?, RequestOptions)"/>
+        public Task<IReadOnlyCollection<RestThreadChannel>> GetPublicArchivedThreadsAsync(int? limit = null, DateTimeOffset? before = null, RequestOptions options = null)
+            => ThreadHelper.GetPublicArchivedThreadsAsync(this, Discord, limit, before, options);
+
+        async Task<IReadOnlyCollection<IThreadChannel>> IThreadContainerChannel.GetActiveThreadsAsync(RequestOptions options)
+            => await GetActiveThreadsAsync(options).ConfigureAwait(false);
+        async Task<IReadOnlyCollection<IThreadChannel>> IThreadContainerChannel.GetPublicArchivedThreadsAsync(int? limit, DateTimeOffset? before, RequestOptions options)
+            => await GetPublicArchivedThreadsAsync(limit, before, options).ConfigureAwait(false);
+        async Task<IReadOnlyCollection<IThreadChannel>> IThreadContainerChannel.GetPrivateArchivedThreadsAsync(int? limit, DateTimeOffset? before, RequestOptions options)
+            => await GetPrivateArchivedThreadsAsync(limit, before, options).ConfigureAwait(false);
+        async Task<IReadOnlyCollection<IThreadChannel>> IThreadContainerChannel.GetJoinedPrivateArchivedThreadsAsync(int? limit, DateTimeOffset? before, RequestOptions options)
+            => await GetJoinedPrivateArchivedThreadsAsync(limit, before, options).ConfigureAwait(false);
+        #endregion
+
     }
 }