DSharpPlus · Plerx2493 · Jul 10, 2024 · Jun 4, 2024 · Jun 4, 2024 · Jun 5, 2024
diff --git a/DSharpPlus.Commands/ExtensionMethods.cs b/DSharpPlus.Commands/ExtensionMethods.cs
@@ -33,27 +33,6 @@ public static CommandsExtension UseCommands(this DiscordClient client, CommandsC
         return extension;
     }
 
-    /// <summary>
-    /// Registers the extension with all the shards on the <see cref="DiscordShardedClient"/>.
-    /// </summary>
-    /// <param name="shardedClient">The client to register the extension with.</param>
-    /// <param name="configuration">The configuration to use for the extension.</param>
-    public static async Task<IReadOnlyDictionary<int, CommandsExtension>> UseCommandsAsync(this DiscordShardedClient shardedClient, CommandsConfiguration? configuration = null)
-    {
-        ArgumentNullException.ThrowIfNull(shardedClient);
-
-        await shardedClient.InitializeShardsAsync();
-        configuration ??= new();
-
-        Dictionary<int, CommandsExtension> extensions = [];
-        foreach (DiscordClient shard in shardedClient.ShardClients.Values)
-        {
-            extensions[shard.ShardId] = shard.GetExtension<CommandsExtension>() ?? shard.UseCommands(configuration);
-        }
-
-        return extensions.AsReadOnly();
-    }
-
     /// <summary>
     /// Retrieves the <see cref="CommandsExtension"/> from the <see cref="DiscordClient"/>.
     /// </summary>
@@ -62,27 +41,6 @@ public static async Task<IReadOnlyDictionary<int, CommandsExtension>> UseCommand
         ? throw new ArgumentNullException(nameof(client))
         : client.GetExtension<CommandsExtension>();
 
-    /// <summary>
-    /// Retrieves the <see cref="CommandsExtension"/> from all of the shards on <see cref="DiscordShardedClient"/>.
-    /// </summary>
-    /// <param name="shardedClient">The client to retrieve the extension from.</param>
-    public static IReadOnlyDictionary<int, CommandsExtension> GetCommandsExtensions(this DiscordShardedClient shardedClient)
-    {
-        ArgumentNullException.ThrowIfNull(shardedClient);
-
-        Dictionary<int, CommandsExtension> extensions = [];
-        foreach (DiscordClient shard in shardedClient.ShardClients.Values)
-        {
-            CommandsExtension? extension = shard.GetExtension<CommandsExtension>();
-            if (extension is not null)
-            {
-                extensions[shard.ShardId] = extension;
-            }
-        }
-
-        return extensions.AsReadOnly();
-    }
-
     /// <inheritdoc cref="Array.IndexOf{T}(T[], T)"/>
     internal static int IndexOf<T>(this IEnumerable<T> array, T? value) where T : IEquatable<T>
     {

diff --git a/DSharpPlus.Commands/Processors/SlashCommands/SlashCommandProcessor.cs b/DSharpPlus.Commands/Processors/SlashCommands/SlashCommandProcessor.cs
@@ -67,13 +67,7 @@ public override async ValueTask ConfigureAsync(CommandsExtension extension)
         {
             this.configured = true;
             extension.Client.InteractionCreated += ExecuteInteractionAsync;
-            extension.Client.GuildDownloadCompleted += async (client, eventArgs) =>
-            {
-                if (client.ShardId == 0)
-                {
-                    await RegisterSlashCommandsAsync(extension);
-                }
-            };
+            extension.Client.GuildDownloadCompleted += async (client, eventArgs) => await RegisterSlashCommandsAsync(extension);
         }
     }
 

diff --git a/DSharpPlus.CommandsNext/ExtensionMethods.cs b/DSharpPlus.CommandsNext/ExtensionMethods.cs
@@ -28,12 +28,12 @@ public static CommandsNextExtension UseCommandsNext(this DiscordClient client, C
             throw new InvalidOperationException("CommandsNext is already enabled for that client.");
         }
 
-        if (!Utilities.HasMessageIntents(client.Configuration.Intents))
+        if (!Utilities.HasMessageIntents(client.Intents))
         {
             client.Logger.LogCritical(CommandsNextEvents.Intents, "The CommandsNext extension is registered but there are no message intents enabled. It is highly recommended to enable them.");
         }
 
-        if (!client.Configuration.Intents.HasIntent(DiscordIntents.Guilds))
+        if (!client.Intents.HasIntent(DiscordIntents.Guilds))
         {
             client.Logger.LogCritical(CommandsNextEvents.Intents, "The CommandsNext extension is registered but the guilds intent is not enabled. It is highly recommended to enable it.");
         }
@@ -43,26 +43,6 @@ public static CommandsNextExtension UseCommandsNext(this DiscordClient client, C
         return cnext;
     }
 
-    /// <summary>
-    /// Enables CommandsNext module on all shards in this <see cref="DiscordShardedClient"/>.
-    /// </summary>
-    /// <param name="client">Client to enable CommandsNext for.</param>
-    /// <param name="cfg">CommandsNext configuration to use.</param>
-    /// <returns>A dictionary of created <see cref="CommandsNextExtension"/>, indexed by shard id.</returns>
-    public static async Task<IReadOnlyDictionary<int, CommandsNextExtension>> UseCommandsNextAsync(this DiscordShardedClient client, CommandsNextConfiguration cfg)
-    {
-        Dictionary<int, CommandsNextExtension> modules = [];
-        await client.InitializeShardsAsync();
-
-        foreach (DiscordClient? shard in client.ShardClients.Select(xkvp => xkvp.Value))
-        {
-            CommandsNextExtension? cnext = shard.GetExtension<CommandsNextExtension>() ?? shard.UseCommandsNext(cfg);
-            modules[shard.ShardId] = cnext;
-        }
-
-        return new ReadOnlyDictionary<int, CommandsNextExtension>(modules);
-    }
-
     /// <summary>
     /// Gets the active CommandsNext module for this client.
     /// </summary>
@@ -71,24 +51,6 @@ public static async Task<IReadOnlyDictionary<int, CommandsNextExtension>> UseCom
     public static CommandsNextExtension GetCommandsNext(this DiscordClient client)
         => client.GetExtension<CommandsNextExtension>();
 
-    /// <summary>
-    /// Gets the active CommandsNext modules for all shards in this client.
-    /// </summary>
-    /// <param name="client">Client to get CommandsNext instances from.</param>
-    /// <returns>A dictionary of the modules, indexed by shard id.</returns>
-    public static async Task<IReadOnlyDictionary<int, CommandsNextExtension>> GetCommandsNextAsync(this DiscordShardedClient client)
-    {
-        await client.InitializeShardsAsync();
-        Dictionary<int, CommandsNextExtension> extensions = [];
-
-        foreach (DiscordClient? shard in client.ShardClients.Select(xkvp => xkvp.Value))
-        {
-            extensions.Add(shard.ShardId, shard.GetExtension<CommandsNextExtension>());
-        }
-
-        return new ReadOnlyDictionary<int, CommandsNextExtension>(extensions);
-    }
-
     /// <summary>
     /// Registers all commands from a given assembly. The command classes need to be public to be considered for registration.
     /// </summary>

diff --git a/DSharpPlus.Interactivity/Extensions/ClientExtensions.cs b/DSharpPlus.Interactivity/Extensions/ClientExtensions.cs
@@ -1,13 +1,9 @@
 using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace DSharpPlus.Interactivity.Extensions;
 
 /// <summary>
-/// Interactivity extension methods for <see cref="DiscordClient"/> and <see cref="DiscordShardedClient"/>.
+/// Interactivity extension methods for <see cref="DiscordClient"/>.
 /// </summary>
 public static class ClientExtensions
 {
@@ -32,49 +28,11 @@ public static InteractivityExtension UseInteractivity(this DiscordClient client,
         return extension;
     }
 
-    /// <summary>
-    /// Enables interactivity for each shard.
-    /// </summary>
-    /// <param name="client">The shard client to enable interactivity for.</param>
-    /// <param name="configuration">Configuration to use for all shards. If one isn't provided, default configuration values will be used.</param>
-    /// <returns>A dictionary containing new <see cref="InteractivityExtension"/> instances for each shard.</returns>
-    public static async Task<IReadOnlyDictionary<int, InteractivityExtension>> UseInteractivityAsync(this DiscordShardedClient client, InteractivityConfiguration configuration = null)
-    {
-        Dictionary<int, InteractivityExtension> extensions = [];
-        await client.InitializeShardsAsync();
-
-        foreach (DiscordClient? shard in client.ShardClients.Select(xkvp => xkvp.Value))
-        {
-            InteractivityExtension extension = shard.GetExtension<InteractivityExtension>() ?? shard.UseInteractivity(configuration);
-            extensions.Add(shard.ShardId, extension);
-        }
-
-        return new ReadOnlyDictionary<int, InteractivityExtension>(extensions);
-    }
-
     /// <summary>
     /// Retrieves the registered <see cref="InteractivityExtension"/> instance for this client.
     /// </summary>
     /// <param name="client">The client to retrieve an <see cref="InteractivityExtension"/> instance from.</param>
     /// <returns>An existing <see cref="InteractivityExtension"/> instance, or <see langword="null"/> if interactivity is not enabled for the <see cref="DiscordClient"/> instance.</returns>
     public static InteractivityExtension GetInteractivity(this DiscordClient client)
         => client.GetExtension<InteractivityExtension>();
-
-    /// <summary>
-    /// Retrieves a <see cref="InteractivityExtension"/> instance for each shard.
-    /// </summary>
-    /// <param name="client">The shard client to retrieve interactivity instances from.</param>
-    /// <returns>A dictionary containing <see cref="InteractivityExtension"/> instances for each shard.</returns>
-    public static async Task<ReadOnlyDictionary<int, InteractivityExtension>> GetInteractivityAsync(this DiscordShardedClient client)
-    {
-        await client.InitializeShardsAsync();
-        Dictionary<int, InteractivityExtension> extensions = [];
-
-        foreach (DiscordClient? shard in client.ShardClients.Select(xkvp => xkvp.Value))
-        {
-            extensions.Add(shard.ShardId, shard.GetExtension<InteractivityExtension>());
-        }
-
-        return new ReadOnlyDictionary<int, InteractivityExtension>(extensions);
-    }
 }
diff --git a/DSharpPlus.Interactivity/InteractivityExtension.cs b/DSharpPlus.Interactivity/InteractivityExtension.cs
@@ -75,7 +75,7 @@ protected internal override void Setup(DiscordClient client)
     /// <returns></returns>
     public async Task<ReadOnlyCollection<PollEmoji>> DoPollAsync(DiscordMessage m, IEnumerable<DiscordEmoji> emojis, PollBehaviour? behaviour = default, TimeSpan? timeout = null)
     {
-        if (!Utilities.HasReactionIntents(this.Client.Configuration.Intents))
+        if (!Utilities.HasReactionIntents(this.Client.Intents))
         {
             throw new InvalidOperationException("No reaction intents are enabled.");
         }
@@ -559,7 +559,7 @@ public async Task<InteractivityResult<ComponentInteractionCreatedEventArgs>> Wai
     public async Task<InteractivityResult<DiscordMessage>> WaitForMessageAsync(Func<DiscordMessage, bool> predicate,
         TimeSpan? timeoutoverride = null)
     {
-        if (!Utilities.HasMessageIntents(this.Client.Configuration.Intents))
+        if (!Utilities.HasMessageIntents(this.Client.Intents))
         {
             throw new InvalidOperationException("No message intents are enabled.");
         }
@@ -579,7 +579,7 @@ public async Task<InteractivityResult<DiscordMessage>> WaitForMessageAsync(Func<
     public async Task<InteractivityResult<MessageReactionAddedEventArgs>> WaitForReactionAsync(Func<MessageReactionAddedEventArgs, bool> predicate,
         TimeSpan? timeoutoverride = null)
     {
-        if (!Utilities.HasReactionIntents(this.Client.Configuration.Intents))
+        if (!Utilities.HasReactionIntents(this.Client.Intents))
         {
             throw new InvalidOperationException("No reaction intents are enabled.");
         }
@@ -592,7 +592,7 @@ public async Task<InteractivityResult<MessageReactionAddedEventArgs>> WaitForRea
 
     /// <summary>
     /// Wait for a specific reaction.
-    /// For this Event you need the <see cref="DiscordIntents.GuildMessageReactions"/> intent specified in <seealso cref="DiscordConfiguration.Intents"/>
+    /// For this Event you need the <see cref="DiscordIntents.GuildMessageReactions"/> intent specified in <see cref="BaseDiscordClient.Intents"/>
     /// </summary>
     /// <param name="message">Message reaction was added to.</param>
     /// <param name="user">User that made the reaction.</param>
@@ -604,7 +604,7 @@ public async Task<InteractivityResult<MessageReactionAddedEventArgs>> WaitForRea
 
     /// <summary>
     /// Waits for a specific reaction.
-    /// For this Event you need the <see cref="DiscordIntents.GuildMessageReactions"/> intent specified in <seealso cref="DiscordConfiguration.Intents"/>
+    /// For this Event you need the <see cref="DiscordIntents.GuildMessageReactions"/> intent specified in <see cref="BaseDiscordClient.Intents"/>
     /// </summary>
     /// <param name="predicate">Predicate to match.</param>
     /// <param name="message">Message reaction was added to.</param>
@@ -617,7 +617,7 @@ public async Task<InteractivityResult<MessageReactionAddedEventArgs>> WaitForRea
 
     /// <summary>
     /// Waits for a specific reaction.
-    /// For this Event you need the <see cref="DiscordIntents.GuildMessageReactions"/> intent specified in <seealso cref="DiscordConfiguration.Intents"/>
+    /// For this Event you need the <see cref="DiscordIntents.GuildMessageReactions"/> intent specified in <see cref="BaseDiscordClient.Intents"/>
     /// </summary>
     /// <param name="predicate">predicate to match.</param>
     /// <param name="user">User that made the reaction.</param>
@@ -637,7 +637,7 @@ public async Task<InteractivityResult<MessageReactionAddedEventArgs>> WaitForRea
     public async Task<InteractivityResult<TypingStartedEventArgs>> WaitForUserTypingAsync(DiscordUser user,
         DiscordChannel channel, TimeSpan? timeoutoverride = null)
     {
-        if (!Utilities.HasTypingIntents(this.Client.Configuration.Intents))
+        if (!Utilities.HasTypingIntents(this.Client.Intents))
         {
             throw new InvalidOperationException("No typing intents are enabled.");
         }
@@ -658,7 +658,7 @@ public async Task<InteractivityResult<TypingStartedEventArgs>> WaitForUserTyping
     /// <returns></returns>
     public async Task<InteractivityResult<TypingStartedEventArgs>> WaitForUserTypingAsync(DiscordUser user, TimeSpan? timeoutoverride = null)
     {
-        if (!Utilities.HasTypingIntents(this.Client.Configuration.Intents))
+        if (!Utilities.HasTypingIntents(this.Client.Intents))
         {
             throw new InvalidOperationException("No typing intents are enabled.");
         }
@@ -679,7 +679,7 @@ public async Task<InteractivityResult<TypingStartedEventArgs>> WaitForUserTyping
     /// <returns></returns>
     public async Task<InteractivityResult<TypingStartedEventArgs>> WaitForTypingAsync(DiscordChannel channel, TimeSpan? timeoutoverride = null)
     {
-        if (!Utilities.HasTypingIntents(this.Client.Configuration.Intents))
+        if (!Utilities.HasTypingIntents(this.Client.Intents))
         {
             throw new InvalidOperationException("No typing intents are enabled.");
         }
@@ -700,7 +700,7 @@ public async Task<InteractivityResult<TypingStartedEventArgs>> WaitForTypingAsyn
     /// <returns></returns>
     public async Task<ReadOnlyCollection<Reaction>> CollectReactionsAsync(DiscordMessage m, TimeSpan? timeoutoverride = null)
     {
-        if (!Utilities.HasReactionIntents(this.Client.Configuration.Intents))
+        if (!Utilities.HasReactionIntents(this.Client.Intents))
         {
             throw new InvalidOperationException("No reaction intents are enabled.");
         }
@@ -822,7 +822,7 @@ public Task SendPaginatedMessageAsync(DiscordChannel channel, DiscordUser user,
 
     /// <summary>
     /// Sends a paginated message.
-    /// For this Event you need the <see cref="DiscordIntents.GuildMessageReactions"/> intent specified in <seealso cref="DiscordConfiguration.Intents"/>
+    /// For this Event you need the <see cref="DiscordIntents.GuildMessageReactions"/> intent specified in <see cref="BaseDiscordClient.Intents"/>
     /// </summary>
     /// <param name="channel">Channel to send paginated message in.</param>
     /// <param name="user">User to give control.</param>

diff --git a/DSharpPlus.Rest/DiscordRestClient.cs b/DSharpPlus.Rest/DiscordRestClient.cs
@@ -24,20 +24,22 @@ public override IReadOnlyDictionary<ulong, DiscordGuild> Guilds
     internal Dictionary<ulong, DiscordGuild> guilds = [];
     private bool disposedValue;
 
-    public DiscordRestClient(DiscordConfiguration config) : base() 
+    public string Token { get; }
+
+    public TokenType TokenType { get; }
+
+    public DiscordRestClient(DiscordConfiguration config, string token, TokenType tokenType) : base() 
     {
         this.ApiClient = new(new
         (
             new(),
             TimeSpan.FromSeconds(10),
-            NullLogger.Instance,
-            config.MaximumRatelimitRetries,
-            config.RatelimitRetryDelayFallback,
-            config.TimeoutForInitialApiRequest,
-            config.MaximumRestRequestsPerSecond
+            NullLogger.Instance
         ));
 
         this.ApiClient.SetClient(this);
+        this.Token = token;
+        this.TokenType = tokenType;
     }
 
     /// <summary>
@@ -1015,7 +1017,7 @@ public async Task UnpinMessageAsync(ulong channelId, ulong messageId)
     /// <param name="nickname">DM nickname</param>
     /// <returns></returns>
     public async Task JoinGroupDmAsync(ulong channelId, string nickname)
-        => await this.ApiClient.AddGroupDmRecipientAsync(channelId, this.CurrentUser.Id, this.Configuration.Token, nickname);
+        => await this.ApiClient.AddGroupDmRecipientAsync(channelId, this.CurrentUser.Id, this.Token, nickname);
 
     /// <summary>
     /// Adds a member to a group DM
@@ -1063,7 +1065,7 @@ public async Task<DiscordDmChannel> CreateGroupDmAsync(IEnumerable<string> acces
     public async Task<DiscordDmChannel> CreateGroupDmWithCurrentUserAsync(IEnumerable<string> accessTokens, IDictionary<ulong, string> nicks)
     {
         List<string> a = accessTokens.ToList();
-        a.Add(this.Configuration.Token);
+        a.Add(this.Token);
         return await this.ApiClient.CreateGroupDmAsync(a, nicks);
     }