diff --git a/package.json b/package.json index af1909f..ff6662c 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "packageManager": "yarn@4.1.1", "type": "module", "dependencies": { - "@navy.gif/commandparser": "^1.7.3", + "@navy.gif/commandparser": "^1.7.4", "@navy.gif/logger": "^2.5.4", "@types/node": "^20.11.30", "bufferutil": "^4.0.8", diff --git a/src/client/components/observers/CommandHandler.ts b/src/client/components/observers/CommandHandler.ts index b7464a2..081834d 100644 --- a/src/client/components/observers/CommandHandler.ts +++ b/src/client/components/observers/CommandHandler.ts @@ -227,12 +227,16 @@ class CommandHandler extends Observer async #executeCommand (message: Message, params: ParseResult) { - const { command, ...rest } = params; + const { command, subCommand, subCommandGroup, ...rest } = params; let response: string | APIEmbed | null | unknown = null; try { const start = Date.now(); - response = await command.execute(message, rest); + response = await command.execute(message, { + ...rest, + subCommand: subCommand?.name ?? null, + subCommandGroup: subCommandGroup?.name ?? null + }); const end = Date.now(); this.logger.info(`${message.author.username} (${message.author.id}) executed command ${command.name}, took ${end - start}ms`); } diff --git a/yarn.lock b/yarn.lock index 87ef03c..5cf49c9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1586,10 +1586,10 @@ __metadata: languageName: node linkType: hard -"@navy.gif/commandparser@npm:^1.7.3": - version: 1.7.3 - resolution: "@navy.gif/commandparser@npm:1.7.3" - checksum: 10/da0449bed024bcace1ca080c5996f733640738242fb12f586354bceec2d2480fa2e5623468b3f341ae378ddfe8ee5924d3285fa539f901151a5dc304b1e3395a +"@navy.gif/commandparser@npm:^1.7.4": + version: 1.7.4 + resolution: "@navy.gif/commandparser@npm:1.7.4" + checksum: 10/6ae3abaa0f85dd46885b3af74c09798efdf6a25ac2507bf2b778020546ef8d98a9cc6c5f79ef56bfb5af29338c74714e47f289bba7c033acd436f86ef94fa0de languageName: node linkType: hard @@ -2044,7 +2044,7 @@ __metadata: "@babel/core": "npm:^7.24.3" "@babel/preset-env": "npm:^7.24.3" "@babel/preset-typescript": "npm:^7.24.1" - "@navy.gif/commandparser": "npm:^1.7.3" + "@navy.gif/commandparser": "npm:^1.7.4" "@navy.gif/logger": "npm:^2.5.4" "@types/common-tags": "npm:^1" "@types/node": "npm:^20.11.30"