DSharpPlus · akiraveliara · Jun 2, 2024 · May 17, 2024 · May 17, 2024 · May 17, 2024
diff --git a/DSharpPlus.Commands/CommandsConfiguration.cs b/DSharpPlus.Commands/CommandsConfiguration.cs
@@ -1,17 +1,10 @@
-using System;
-
 namespace DSharpPlus.Commands;
 
 /// <summary>
 /// The configuration copied to an instance of <see cref="CommandsExtension"/>.
 /// </summary>
 public sealed record CommandsConfiguration
 {
-    /// <summary>
-    /// The service provider to use for dependency injection.
-    /// </summary>
-    public required IServiceProvider ServiceProvider { get; set; }
-
     /// <summary>
     /// The guild id to use for debugging. Leave as 0 to disable.
     /// </summary>

diff --git a/DSharpPlus.Commands/CommandsExtension.cs b/DSharpPlus.Commands/CommandsExtension.cs
@@ -8,6 +8,7 @@
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
+
 using DSharpPlus.AsyncEvents;
 using DSharpPlus.Commands.ContextChecks;
 using DSharpPlus.Commands.ContextChecks.ParameterChecks;
@@ -23,16 +24,18 @@
 using DSharpPlus.Commands.Trees.Metadata;
 using DSharpPlus.Entities;
 using DSharpPlus.Exceptions;
+
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
+
 using CheckFunc = System.Func
 <
     object,
     DSharpPlus.Commands.ContextChecks.ContextCheckAttribute,
     DSharpPlus.Commands.CommandContext,
     System.Threading.Tasks.ValueTask<string?>
 >;
+
 using ParameterCheckFunc = System.Func
 <
     object,
@@ -49,8 +52,8 @@ namespace DSharpPlus.Commands;
 /// </summary>
 public sealed class CommandsExtension : BaseExtension
 {
-    /// <inheritdoc cref="CommandsConfiguration.ServiceProvider"/>
-    public IServiceProvider ServiceProvider { get; init; }
+    /// <inheritdoc cref="DiscordClient.ServiceProvider"/>
+    public IServiceProvider ServiceProvider { get; private set; }
 
     /// <inheritdoc cref="CommandsConfiguration.DebugGuildId"/>
     public ulong DebugGuildId { get; init; }
@@ -84,19 +87,29 @@ public sealed class CommandsExtension : BaseExtension
     /// <summary>
     /// Executed everytime a command is finished executing.
     /// </summary>
-    public event AsyncEventHandler<CommandsExtension, CommandExecutedEventArgs> CommandExecuted { add => this.commandExecuted.Register(value); remove => this.commandExecuted.Unregister(value); }
-    internal readonly AsyncEvent<CommandsExtension, CommandExecutedEventArgs> commandExecuted = new("COMMANDS_COMMAND_EXECUTED", EverythingWentWrongErrorHandler);
+    public event AsyncEventHandler<CommandsExtension, CommandExecutedEventArgs> CommandExecuted 
+    { 
+        add => this.commandExecuted.Register(value); 
+        remove => this.commandExecuted.Unregister(value); 
+    }
+
+    internal AsyncEvent<CommandsExtension, CommandExecutedEventArgs> commandExecuted;
 
     /// <summary>
     /// Executed everytime a command has errored.
     /// </summary>
-    public event AsyncEventHandler<CommandsExtension, CommandErroredEventArgs> CommandErrored { add => this.commandErrored.Register(value); remove => this.commandErrored.Unregister(value); }
-    internal readonly AsyncEvent<CommandsExtension, CommandErroredEventArgs> commandErrored = new("COMMANDS_COMMAND_ERRORED", EverythingWentWrongErrorHandler);
+    public event AsyncEventHandler<CommandsExtension, CommandErroredEventArgs> CommandErrored 
+    { 
+        add => this.commandErrored.Register(value); 
+        remove => this.commandErrored.Unregister(value); 
+    }
+
+    internal AsyncEvent<CommandsExtension, CommandErroredEventArgs> commandErrored;
 
     /// <summary>
     /// Used to log messages from this extension.
     /// </summary>
-    private readonly ILogger<CommandsExtension> logger;
+    private ILogger<CommandsExtension> logger;
 
     /// <summary>
     /// Creates a new instance of the <see cref="CommandsExtension"/> class.
@@ -106,18 +119,10 @@ internal CommandsExtension(CommandsConfiguration configuration)
     {
         ArgumentNullException.ThrowIfNull(configuration);
 
-        this.ServiceProvider = configuration.ServiceProvider;
         this.DebugGuildId = configuration.DebugGuildId;
         this.UseDefaultCommandErrorHandler = configuration.UseDefaultCommandErrorHandler;
         this.RegisterDefaultCommandProcessors = configuration.RegisterDefaultCommandProcessors;
         this.CommandExecutor = configuration.CommandExecutor;
-        if (this.UseDefaultCommandErrorHandler)
-        {
-            this.CommandErrored += DefaultCommandErrorHandlerAsync;
-        }
-
-        // Attempt to get the user defined logging, otherwise setup a null logger since the D#+ Default Logger is internal.
-        this.logger = this.ServiceProvider.GetService<ILogger<CommandsExtension>>() ?? NullLogger<CommandsExtension>.Instance;
     }
 
     /// <summary>
@@ -136,8 +141,20 @@ protected override void Setup(DiscordClient client)
         }
 
         this.Client = client;
+        this.ServiceProvider = client.ServiceProvider;
         this.Client.SessionCreated += async (_, _) => await RefreshAsync();
 
+        this.logger = client.ServiceProvider.GetService<ILogger<CommandsExtension>>();
+
+        DefaultClientErrorHandler errorHandler = new(client.Logger);
+        this.commandErrored = new(errorHandler);
+        this.commandExecuted = new(errorHandler);
+
+        if (this.UseDefaultCommandErrorHandler)
+        {
+            this.CommandErrored += DefaultCommandErrorHandlerAsync;
+        }
+
         AddCheck<DirectMessageUsageCheck>();
         AddCheck<RequireApplicationOwnerCheck>();
         AddCheck<RequireGuildCheck>();

diff --git a/DSharpPlus.Commands/Converters/BooleanConverter.cs b/DSharpPlus.Commands/Converters/BooleanConverter.cs
@@ -13,14 +13,14 @@ public class BooleanConverter : ISlashArgumentConverter<bool>, ITextArgumentConv
     public bool RequiresText => true;
 
     /// <inheritdoc/>
-    public Task<Optional<bool>> ConvertAsync(TextConverterContext context, MessageCreateEventArgs eventArgs) => Task.FromResult(context.Argument.ToLowerInvariant() switch
+    public Task<Optional<bool>> ConvertAsync(TextConverterContext context, MessageCreatedEventArgs eventArgs) => Task.FromResult(context.Argument.ToLowerInvariant() switch
     {
         "true" or "yes" or "y" or "1" or "on" or "enable" or "enabled" or "t" => Optional.FromValue(true),
         "false" or "no" or "n" or "0" or "off" or "disable" or "disabled" or "f" => Optional.FromValue(false),
         _ => Optional.FromNoValue<bool>()
     });
 
-    public Task<Optional<bool>> ConvertAsync(InteractionConverterContext context, InteractionCreateEventArgs eventArgs)
+    public Task<Optional<bool>> ConvertAsync(InteractionConverterContext context, InteractionCreatedEventArgs eventArgs)
     {
         return bool.TryParse(context.Argument.RawValue, out bool result)
             ? Task.FromResult(Optional.FromValue(result))

diff --git a/DSharpPlus.Commands/Converters/ByteConverter.cs b/DSharpPlus.Commands/Converters/ByteConverter.cs
@@ -13,11 +13,11 @@ public class ByteConverter : ISlashArgumentConverter<byte>, ITextArgumentConvert
     public string ReadableName => "Positive Tiny Integer";
     public bool RequiresText => true;
 
-    public Task<Optional<byte>> ConvertAsync(TextConverterContext context, MessageCreateEventArgs eventArgs) => byte.TryParse(context.Argument, CultureInfo.InvariantCulture, out byte result)
+    public Task<Optional<byte>> ConvertAsync(TextConverterContext context, MessageCreatedEventArgs eventArgs) => byte.TryParse(context.Argument, CultureInfo.InvariantCulture, out byte result)
         ? Task.FromResult(Optional.FromValue(result))
         : Task.FromResult(Optional.FromNoValue<byte>());
 
-    public Task<Optional<byte>> ConvertAsync(InteractionConverterContext context, InteractionCreateEventArgs eventArgs) => byte.TryParse(context.Argument.RawValue, CultureInfo.InvariantCulture, out byte result)
+    public Task<Optional<byte>> ConvertAsync(InteractionConverterContext context, InteractionCreatedEventArgs eventArgs) => byte.TryParse(context.Argument.RawValue, CultureInfo.InvariantCulture, out byte result)
         ? Task.FromResult(Optional.FromValue(result))
         : Task.FromResult(Optional.FromNoValue<byte>());
 }
diff --git a/DSharpPlus.Commands/Converters/DateTimeOffsetConverter.cs b/DSharpPlus.Commands/Converters/DateTimeOffsetConverter.cs
@@ -14,11 +14,11 @@ public class DateTimeOffsetConverter : ISlashArgumentConverter<DateTimeOffset>,
     public string ReadableName => "Date and Time";
     public bool RequiresText => true;
 
-    public Task<Optional<DateTimeOffset>> ConvertAsync(TextConverterContext context, MessageCreateEventArgs eventArgs) => DateTimeOffset.TryParse(context.Argument, CultureInfo.InvariantCulture, out DateTimeOffset result)
+    public Task<Optional<DateTimeOffset>> ConvertAsync(TextConverterContext context, MessageCreatedEventArgs eventArgs) => DateTimeOffset.TryParse(context.Argument, CultureInfo.InvariantCulture, out DateTimeOffset result)
         ? Task.FromResult(Optional.FromValue(result))
         : Task.FromResult(Optional.FromNoValue<DateTimeOffset>());
 
-    public Task<Optional<DateTimeOffset>> ConvertAsync(InteractionConverterContext context, InteractionCreateEventArgs eventArgs) => DateTimeOffset.TryParse(context.Argument.RawValue, CultureInfo.InvariantCulture, out DateTimeOffset result)
+    public Task<Optional<DateTimeOffset>> ConvertAsync(InteractionConverterContext context, InteractionCreatedEventArgs eventArgs) => DateTimeOffset.TryParse(context.Argument.RawValue, CultureInfo.InvariantCulture, out DateTimeOffset result)
         ? Task.FromResult(Optional.FromValue(result))
         : Task.FromResult(Optional.FromNoValue<DateTimeOffset>());
 }
diff --git a/DSharpPlus.Commands/Converters/DiscordAttachmentConverter.cs b/DSharpPlus.Commands/Converters/DiscordAttachmentConverter.cs
@@ -15,7 +15,7 @@ public class AttachmentConverter : ISlashArgumentConverter<DiscordAttachment>, I
     public string ReadableName => "Discord File";
     public bool RequiresText => false;
 
-    public Task<Optional<DiscordAttachment>> ConvertAsync(TextConverterContext context, MessageCreateEventArgs eventArgs)
+    public Task<Optional<DiscordAttachment>> ConvertAsync(TextConverterContext context, MessageCreatedEventArgs eventArgs)
     {
         DiscordMessage message = eventArgs.Message;
         int currentAttachmentArgumentIndex = context.Command.Parameters.Where(argument => argument.Type == typeof(DiscordAttachment)).IndexOf(context.Parameter);
@@ -37,7 +37,7 @@ public Task<Optional<DiscordAttachment>> ConvertAsync(TextConverterContext conte
             : Task.FromResult(Optional.FromValue(message.Attachments[currentAttachmentArgumentIndex]));
     }
 
-    public Task<Optional<DiscordAttachment>> ConvertAsync(InteractionConverterContext context, InteractionCreateEventArgs eventArgs)
+    public Task<Optional<DiscordAttachment>> ConvertAsync(InteractionConverterContext context, InteractionCreatedEventArgs eventArgs)
     {
         int currentAttachmentArgumentIndex = context.Command.Parameters.Where(argument => argument.Type == typeof(DiscordAttachment)).IndexOf(context.Parameter);
         if (eventArgs.Interaction.Data.Resolved is null)

diff --git a/DSharpPlus.Commands/Converters/DiscordChannelConverter.cs b/DSharpPlus.Commands/Converters/DiscordChannelConverter.cs
@@ -19,7 +19,7 @@ public partial class DiscordChannelConverter : ISlashArgumentConverter<DiscordCh
     public string ReadableName => "Discord Channel";
     public bool RequiresText => true;
 
-    public Task<Optional<DiscordChannel>> ConvertAsync(TextConverterContext context, MessageCreateEventArgs eventArgs)
+    public Task<Optional<DiscordChannel>> ConvertAsync(TextConverterContext context, MessageCreatedEventArgs eventArgs)
     {
         // Attempt to parse the channel id
         if (!ulong.TryParse(context.Argument, CultureInfo.InvariantCulture, out ulong channelId))
@@ -52,7 +52,7 @@ public Task<Optional<DiscordChannel>> ConvertAsync(TextConverterContext context,
         return Task.FromResult(Optional.FromNoValue<DiscordChannel>());
     }
 
-    public Task<Optional<DiscordChannel>> ConvertAsync(InteractionConverterContext context, InteractionCreateEventArgs eventArgs) => context.Interaction.Data.Resolved is null
+    public Task<Optional<DiscordChannel>> ConvertAsync(InteractionConverterContext context, InteractionCreatedEventArgs eventArgs) => context.Interaction.Data.Resolved is null
         || !ulong.TryParse(context.Argument.RawValue, CultureInfo.InvariantCulture, out ulong channelId)
         || !context.Interaction.Data.Resolved.Channels.TryGetValue(channelId, out DiscordChannel? channel)
             ? Task.FromResult(Optional.FromNoValue<DiscordChannel>())

diff --git a/DSharpPlus.Commands/Converters/DiscordEmojiConverter.cs b/DSharpPlus.Commands/Converters/DiscordEmojiConverter.cs
@@ -12,8 +12,8 @@ public class DiscordEmojiConverter : ISlashArgumentConverter<DiscordEmoji>, ITex
     public string ReadableName => "Discord Emoji";
     public bool RequiresText => true;
 
-    public Task<Optional<DiscordEmoji>> ConvertAsync(TextConverterContext context, MessageCreateEventArgs eventArgs) => ConvertAsync(context, context.Argument);
-    public Task<Optional<DiscordEmoji>> ConvertAsync(InteractionConverterContext context, InteractionCreateEventArgs eventArgs) => ConvertAsync(context, context.Argument.RawValue);
+    public Task<Optional<DiscordEmoji>> ConvertAsync(TextConverterContext context, MessageCreatedEventArgs eventArgs) => ConvertAsync(context, context.Argument);
+    public Task<Optional<DiscordEmoji>> ConvertAsync(InteractionConverterContext context, InteractionCreatedEventArgs eventArgs) => ConvertAsync(context, context.Argument.RawValue);
     public static Task<Optional<DiscordEmoji>> ConvertAsync(ConverterContext context, string? value) => !string.IsNullOrWhiteSpace(value)
         && (DiscordEmoji.TryFromUnicode(context.Client, value, out DiscordEmoji? emoji) || DiscordEmoji.TryFromName(context.Client, value, out emoji))
             ? Task.FromResult(Optional.FromValue(emoji))

diff --git a/DSharpPlus.Commands/Converters/DiscordMemberConverter.cs b/DSharpPlus.Commands/Converters/DiscordMemberConverter.cs
@@ -25,7 +25,7 @@ public partial class DiscordMemberConverter : ISlashArgumentConverter<DiscordMem
 
     public DiscordMemberConverter(ILogger<DiscordMemberConverter>? logger = null) => this.logger = logger ?? NullLogger<DiscordMemberConverter>.Instance;
 
-    public async Task<Optional<DiscordMember>> ConvertAsync(TextConverterContext context, MessageCreateEventArgs eventArgs)
+    public async Task<Optional<DiscordMember>> ConvertAsync(TextConverterContext context, MessageCreatedEventArgs eventArgs)
     {
         if (context.Guild is null)
         {
@@ -55,7 +55,7 @@ public async Task<Optional<DiscordMember>> ConvertAsync(TextConverterContext con
         }
     }
 
-    public Task<Optional<DiscordMember>> ConvertAsync(InteractionConverterContext context, InteractionCreateEventArgs eventArgs) => context.Interaction.Data.Resolved is null
+    public Task<Optional<DiscordMember>> ConvertAsync(InteractionConverterContext context, InteractionCreatedEventArgs eventArgs) => context.Interaction.Data.Resolved is null
         || !ulong.TryParse(context.Argument.RawValue, CultureInfo.InvariantCulture, out ulong memberId)
         || !context.Interaction.Data.Resolved.Members.TryGetValue(memberId, out DiscordMember? member)
             ? Task.FromResult(Optional.FromNoValue<DiscordMember>())

diff --git a/DSharpPlus.Commands/Converters/DiscordMessageConverter.cs b/DSharpPlus.Commands/Converters/DiscordMessageConverter.cs
@@ -18,8 +18,8 @@ public partial class DiscordMessageConverter : ISlashArgumentConverter<DiscordMe
     public string ReadableName => "Discord Message Link";
     public bool RequiresText => true;
 
-    public Task<Optional<DiscordMessage>> ConvertAsync(TextConverterContext context, MessageCreateEventArgs eventArgs) => ConvertAsync(context, context.Argument);
-    public Task<Optional<DiscordMessage>> ConvertAsync(InteractionConverterContext context, InteractionCreateEventArgs eventArgs) => ConvertAsync(context, context.Argument.RawValue);
+    public Task<Optional<DiscordMessage>> ConvertAsync(TextConverterContext context, MessageCreatedEventArgs eventArgs) => ConvertAsync(context, context.Argument);
+    public Task<Optional<DiscordMessage>> ConvertAsync(InteractionConverterContext context, InteractionCreatedEventArgs eventArgs) => ConvertAsync(context, context.Argument.RawValue);
 
     public static async Task<Optional<DiscordMessage>> ConvertAsync(ConverterContext context, string? value)
     {

diff --git a/DSharpPlus.Commands/Converters/DiscordRoleConverter.cs b/DSharpPlus.Commands/Converters/DiscordRoleConverter.cs
@@ -19,7 +19,7 @@ public partial class DiscordRoleConverter : ISlashArgumentConverter<DiscordRole>
     public string ReadableName => "Discord Role";
     public bool RequiresText => true;
 
-    public Task<Optional<DiscordRole>> ConvertAsync(TextConverterContext context, MessageCreateEventArgs eventArgs)
+    public Task<Optional<DiscordRole>> ConvertAsync(TextConverterContext context, MessageCreatedEventArgs eventArgs)
     {
         if (context.Guild is null)
         {
@@ -43,7 +43,7 @@ public Task<Optional<DiscordRole>> ConvertAsync(TextConverterContext context, Me
             : Task.FromResult(Optional.FromNoValue<DiscordRole>());
     }
 
-    public Task<Optional<DiscordRole>> ConvertAsync(InteractionConverterContext context, InteractionCreateEventArgs eventArgs) => context.Interaction.Data.Resolved is null
+    public Task<Optional<DiscordRole>> ConvertAsync(InteractionConverterContext context, InteractionCreatedEventArgs eventArgs) => context.Interaction.Data.Resolved is null
         || !ulong.TryParse(context.Argument.RawValue, CultureInfo.InvariantCulture, out ulong roleId)
         || !context.Interaction.Data.Resolved.Roles.TryGetValue(roleId, out DiscordRole? role)
             ? Task.FromResult(Optional.FromNoValue<DiscordRole>())

diff --git a/DSharpPlus.Commands/Converters/DiscordSnowflakeObjectConverter.cs b/DSharpPlus.Commands/Converters/DiscordSnowflakeObjectConverter.cs
@@ -25,7 +25,7 @@ public DiscordSnowflakeObjectConverter(ILogger<DiscordMemberConverter>? discordM
         this.discordRoleSlashArgumentConverter = new DiscordRoleConverter();
     }
 
-    public async Task<Optional<SnowflakeObject>> ConvertAsync(InteractionConverterContext context, InteractionCreateEventArgs eventArgs)
+    public async Task<Optional<SnowflakeObject>> ConvertAsync(InteractionConverterContext context, InteractionCreatedEventArgs eventArgs)
     {
         //Checks through existing converters
         if (context.Interaction.Data.Resolved?.Roles is not null && await this.discordRoleSlashArgumentConverter.ConvertAsync(context, eventArgs) is Optional<DiscordRole> role && role.HasValue)
@@ -45,7 +45,7 @@ public async Task<Optional<SnowflakeObject>> ConvertAsync(InteractionConverterCo
     }
 
     // Duplicated logic for overload resolving
-    public async Task<Optional<SnowflakeObject>> ConvertAsync(TextConverterContext context, MessageCreateEventArgs eventArgs)
+    public async Task<Optional<SnowflakeObject>> ConvertAsync(TextConverterContext context, MessageCreatedEventArgs eventArgs)
     {
         //Checks through existing converters
         if (context.Guild?.Roles is not null && await this.discordRoleSlashArgumentConverter.ConvertAsync(context, eventArgs) is Optional<DiscordRole> role && role.HasValue)

diff --git a/DSharpPlus.Commands/Converters/DiscordThreadChannelConverter.cs b/DSharpPlus.Commands/Converters/DiscordThreadChannelConverter.cs
@@ -19,7 +19,7 @@ public partial class DiscordThreadChannelConverter : ISlashArgumentConverter<Dis
     public string ReadableName => "Discord Thread";
     public bool RequiresText => true;
 
-    public Task<Optional<DiscordThreadChannel>> ConvertAsync(TextConverterContext context, MessageCreateEventArgs eventArgs)
+    public Task<Optional<DiscordThreadChannel>> ConvertAsync(TextConverterContext context, MessageCreatedEventArgs eventArgs)
     {
         if (context.Guild is null)
         {
@@ -43,7 +43,7 @@ public Task<Optional<DiscordThreadChannel>> ConvertAsync(TextConverterContext co
             : Task.FromResult(Optional.FromNoValue<DiscordThreadChannel>());
     }
 
-    public Task<Optional<DiscordThreadChannel>> ConvertAsync(InteractionConverterContext context, InteractionCreateEventArgs eventArgs) => context.Interaction.Data.Resolved is null
+    public Task<Optional<DiscordThreadChannel>> ConvertAsync(InteractionConverterContext context, InteractionCreatedEventArgs eventArgs) => context.Interaction.Data.Resolved is null
         || !ulong.TryParse(context.Argument.RawValue, CultureInfo.InvariantCulture, out ulong channelId)
         || !context.Interaction.Data.Resolved.Channels.TryGetValue(channelId, out DiscordChannel? channel)
             ? Task.FromResult(Optional.FromNoValue<DiscordThreadChannel>())