From b29eefd570c5fe4d4c0c5435e23a9a983c58577f Mon Sep 17 00:00:00 2001
From: Shadow <shadow@buape.com>
Date: Wed, 18 Sep 2024 12:00:53 -0500
Subject: [PATCH] fix: correctly get options of subcommands and
 subcommandgroups (#126)

---
 .changeset/slow-seas-fix.md                   |  5 +++++
 .../src/internals/AutocompleteInteraction.ts  |  4 +---
 .../src/internals/CommandInteraction.ts       |  4 +---
 .../carbon/src/internals/OptionsHandler.ts    | 22 +++++++++++++++++--
 4 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/slow-seas-fix.md

diff --git a/.changeset/slow-seas-fix.md b/.changeset/slow-seas-fix.md
new file mode 100644
index 00000000..5a64c18d
--- /dev/null
+++ b/.changeset/slow-seas-fix.md
@@ -0,0 +1,5 @@
+---
+"@buape/carbon": patch
+---
+
+fix: correctly get options of subcommands and subcommandgroups
diff --git a/packages/carbon/src/internals/AutocompleteInteraction.ts b/packages/carbon/src/internals/AutocompleteInteraction.ts
index 32cf93e1..84d1d9e5 100644
--- a/packages/carbon/src/internals/AutocompleteInteraction.ts
+++ b/packages/carbon/src/internals/AutocompleteInteraction.ts
@@ -1,6 +1,5 @@
 import {
 	type APIApplicationCommandAutocompleteInteraction,
-	type APIApplicationCommandInteractionDataBasicOption,
 	ApplicationCommandOptionType,
 	ApplicationCommandType,
 	InteractionResponseType,
@@ -34,8 +33,7 @@ export class AutocompleteInteraction extends BaseInteraction<APIApplicationComma
 
 		this.options = new AutocompleteOptionsHandler(
 			client,
-			(data.data.options ??
-				[]) as APIApplicationCommandInteractionDataBasicOption[]
+			data.data.options ?? []
 		)
 	}
 
diff --git a/packages/carbon/src/internals/CommandInteraction.ts b/packages/carbon/src/internals/CommandInteraction.ts
index 9f200b37..521dfe96 100644
--- a/packages/carbon/src/internals/CommandInteraction.ts
+++ b/packages/carbon/src/internals/CommandInteraction.ts
@@ -1,6 +1,5 @@
 import {
 	type APIApplicationCommandInteraction,
-	type APIApplicationCommandInteractionDataBasicOption,
 	ApplicationCommandType,
 	InteractionType
 } from "discord-api-types/v10"
@@ -32,8 +31,7 @@ export class CommandInteraction extends BaseInteraction<APIApplicationCommandInt
 		this.options = new OptionsHandler(
 			client,
 			data.data.type === ApplicationCommandType.ChatInput
-				? ((data.data.options ??
-						[]) as APIApplicationCommandInteractionDataBasicOption[])
+				? (data.data.options ?? [])
 				: []
 		)
 	}
diff --git a/packages/carbon/src/internals/OptionsHandler.ts b/packages/carbon/src/internals/OptionsHandler.ts
index 67ef660f..c1b8008d 100644
--- a/packages/carbon/src/internals/OptionsHandler.ts
+++ b/packages/carbon/src/internals/OptionsHandler.ts
@@ -1,5 +1,6 @@
 import {
 	type APIApplicationCommandInteractionDataBasicOption,
+	type APIApplicationCommandInteractionDataOption,
 	type APIChannel,
 	ApplicationCommandOptionType,
 	Routes
@@ -25,10 +26,27 @@ export class OptionsHandler extends Base {
 
 	constructor(
 		client: Client,
-		options: APIApplicationCommandInteractionDataBasicOption[]
+		options: APIApplicationCommandInteractionDataOption[]
 	) {
 		super(client)
-		this.raw = options
+		this.raw = []
+		for (const option of options) {
+			if (option.type === ApplicationCommandOptionType.Subcommand) {
+				for (const subOption of option.options ?? []) {
+					this.raw.push(subOption)
+				}
+			} else if (option.type === ApplicationCommandOptionType.SubcommandGroup) {
+				for (const subOption of option.options ?? []) {
+					if (subOption.options) {
+						for (const subSubOption of subOption.options ?? []) {
+							this.raw.push(subSubOption)
+						}
+					}
+				}
+			} else {
+				this.raw.push(option)
+			}
+		}
 	}
 
 	/**