Merge branch 'dev' into main

Color-Chan · Feb 22, 2022 · 75157f2 · 75157f2
2 parents 7947723 + 7ba1bd8
commit 75157f2
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/Color-Chan.Discord.Commands/Services/Implementations/DiscordSlashCommandHandler.cs b/src/Color-Chan.Discord.Commands/Services/Implementations/DiscordSlashCommandHandler.cs
@@ -97,7 +97,7 @@ public async Task<InternalInteractionResponse> HandleSlashCommandAsync(IDiscordI
             IEnumerable<IDiscordInteractionOption>? options = null;
 
             // Get the command name and the options.
-            if (interaction.Data.Options is null)
+            if (interaction.Data.Options is null || !ContainsSubCommand(interaction))
             {
                 options = interaction.Data.Options;
                 context.SlashCommandName = new[] { interaction.Data.Name };
@@ -211,5 +211,14 @@ async Task<Result<IDiscordInteractionResponse>> Handler()
 
             throw new SlashCommandResultException($"Command request {interaction.Id} returned unsuccessfully, {result.ErrorResult?.ErrorMessage}");
         }
+
+        private static bool ContainsSubCommand(IDiscordInteraction interaction)
+        {
+            if (interaction.Data?.Options is null) 
+                return false;
+
+            return interaction.Data.Options.Select(x => x.Type).Contains(DiscordApplicationCommandOptionType.SubCommand) ||
+                   interaction.Data.Options.Select(x => x.Type).Contains(DiscordApplicationCommandOptionType.SubCommandGroup);
+        }
     }
 }