diff options
| -rw-r--r-- | .vscode/settings.json | 2 | ||||
| -rw-r--r-- | src/commands/config/settings.ts | 21 | ||||
| -rw-r--r-- | src/commands/info/avatar.ts | 5 | ||||
| -rw-r--r-- | yarn.lock | 10 |
4 files changed, 26 insertions, 12 deletions
diff --git a/.vscode/settings.json b/.vscode/settings.json index 105375b..7a28c7c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -30,7 +30,7 @@ "prettier.withNodeModules": true, "prettier.useEditorConfig": false, "eslint.nodePath": ".yarn/sdks", - "typescript.tsdk": ".yarn/sdks/typescript/lib", + "typescript.tsdk": "node_modules\\typescript\\lib", "typescript.enablePromptUseWorkspaceTsdk": true, "better-comments.highlightPlainText": true, "better-comments.multilineComments": true, diff --git a/src/commands/config/settings.ts b/src/commands/config/settings.ts index c28b4dd..a8070e2 100644 --- a/src/commands/config/settings.ts +++ b/src/commands/config/settings.ts @@ -23,11 +23,16 @@ export default class SettingsCommand extends BushCommand { slashOptions: settingsArr.map((setting) => { return { name: util.camelToSnakeCase(setting), - description: `Set the server's ${guildSettingsObj[setting].name.toLowerCase()}`, - type: /* guildSettingsObj[setting].type.includes('-array') ? */ 'SUB_COMMAND_GROUP' /* : 'SUB_COMMAND' */, + description: `Manage the server's ${guildSettingsObj[setting].name.toLowerCase()}`, + type: 'SUB_COMMAND_GROUP', options: guildSettingsObj[setting].type.includes('-array') ? [ { + name: 'view', + description: `View the server's ${guildSettingsObj[setting].name.toLowerCase()}.`, + type: 'SUB_COMMAND' + }, + { name: 'add', description: `Add a value to the server's ${guildSettingsObj[setting].name.toLowerCase()}.`, type: 'SUB_COMMAND', @@ -60,6 +65,11 @@ export default class SettingsCommand extends BushCommand { ] : [ { + name: 'view', + description: `View the server's ${guildSettingsObj[setting].name.toLowerCase()}.`, + type: 'SUB_COMMAND' + }, + { name: 'set', description: `Set the server's ${guildSettingsObj[setting].name.toLowerCase()}.`, type: 'SUB_COMMAND', @@ -77,7 +87,7 @@ export default class SettingsCommand extends BushCommand { ] }; }), - slashGuilds: ['516977525906341928'], + slashGuilds: ['516977525906341928', '812400566235430912'], channel: 'guild', clientPermissions: ['SEND_MESSAGES'], userPermissions: ['SEND_MESSAGES', 'MANAGE_GUILD'], @@ -87,8 +97,9 @@ export default class SettingsCommand extends BushCommand { // *args(): any {} - public override async exec(message: BushMessage | BushSlashMessage): Promise<unknown> { - client.console.debug(message.interaction, 6); + public override async exec(message: BushMessage | BushSlashMessage, args: unknown): Promise<unknown> { + client.console.debugRaw(message.interaction); + client.console.debugRaw(args); if (!message.guild) return await message.util.reply(`${util.emojis.error} This command can only be used in servers.`); const messageOptions = await this.generateMessageOptions(message); const msg = (await message.util.reply(messageOptions)) as Message; diff --git a/src/commands/info/avatar.ts b/src/commands/info/avatar.ts index 7654d2f..33393b8 100644 --- a/src/commands/info/avatar.ts +++ b/src/commands/info/avatar.ts @@ -1,4 +1,4 @@ -import { MessageEmbed, User } from 'discord.js'; +import { CommandInteraction, MessageEmbed, User } from 'discord.js'; import { BushCommand, BushMessage, BushSlashMessage } from '../../lib'; export default class AvatarCommand extends BushCommand { @@ -36,6 +36,9 @@ export default class AvatarCommand extends BushCommand { } override async exec(message: BushMessage | BushSlashMessage, args: { user: User }): Promise<void> { + client.console.debugRaw(args); + client.console.debugRaw(message.interaction); + client.console.debugRaw((message.interaction as CommandInteraction).options.getUser('user')); const user = args.user ?? message.author; const embed = new MessageEmbed() @@ -359,9 +359,9 @@ __metadata: linkType: hard "@types/node@npm:*": - version: 16.7.3 - resolution: "@types/node@npm:16.7.3" - checksum: 615d65c40131c7b987d9728d42835a35873117bc5840090bca9d3665ef4a32fd11522681c5a5babc6e2ed1ba27b7d57eb268d0a8a2125e3a4e926bf5f992aa69 + version: 16.7.4 + resolution: "@types/node@npm:16.7.4" + checksum: da7813e6c37e7813645a9d40de6d9f803fbadb2975748d307ec31d8e4f9baabccf49b667a39e4b1288d477ec7d34a339e8a41d8703a1d7ab0ec8eb2516073f27 languageName: node linkType: hard @@ -1116,12 +1116,12 @@ discord-akairo-message-util@NotEnoughUpdates/discord-akairo-message-util: discord-akairo@NotEnoughUpdates/discord-akairo: version: 8.2.2 - resolution: "discord-akairo@https://github.com/NotEnoughUpdates/discord-akairo.git#commit=8f3c450769fe2358784beb571a999b2b72596f86" + resolution: "discord-akairo@https://github.com/NotEnoughUpdates/discord-akairo.git#commit=0091ae5534d7eefbb401009a15aa7d6fd013f9b4" dependencies: discord-akairo-message-util: NotEnoughUpdates/discord-akairo-message-util lodash: ^4.17.21 source-map-support: ^0.5.19 - checksum: a30900abce1173413ba4882f1c52fd9f0c63cc9a2485ac2a9158d18046dc90b303d2bd03b610e3028be679aac8a04b683e5e862e47bf152aee8e9f64fb1c58b4 + checksum: 1fcd67033576768a5b8bed52e15473795242860e5661d5f2a781acb0579e334d09fdf5f824e6eedcd7050fa5df88beadda309d19be503c7c3c5554917ccdbd4a languageName: node linkType: hard |