diff --git a/src/class/Util.ts b/src/class/Util.ts index 61accda..0459d73 100644 --- a/src/class/Util.ts +++ b/src/class/Util.ts @@ -64,12 +64,11 @@ export default class Util { } else if (resolvedCommand.subcommands.has(args[0])) { parentLabel += `${resolvedCommand.name} `; resolvedCommand = resolvedCommand.subcommands.get(args[0]); args.shift(); - parentLabel += `${resolvedCommand.name} `; } else { const subcommandArray = resolvedCommand.subcommands.toArray(); for (const subCmd of subcommandArray) { if (subCmd.aliases.includes(args[0])) { - parentLabel += `${resolvedCommand.name} `; resolvedCommand = subCmd; parentLabel += `${resolvedCommand.name} `; args.shift(); break; + parentLabel += `${resolvedCommand.name} `; resolvedCommand = subCmd; args.shift(); break; } if (subcommandArray.findIndex((v) => v === subCmd) === subcommandArray.length - 1) { hasSubCommands = false; break; diff --git a/src/commands/help.ts b/src/commands/help.ts index 99804fb..7d42cb1 100644 --- a/src/commands/help.ts +++ b/src/commands/help.ts @@ -53,10 +53,10 @@ export default class Help extends Command { if (allowedUsers) { allowedUsers = `**Users:** ${allowedUsers}`; perms.push(allowedUsers); } const displayedPerms = perms.length ? `\n**Permissions:**\n${perms.join('\n')}` : ''; const aliases = cmd.aliases.length ? `\n**Aliases:** ${cmd.aliases.map((alias) => `${this.client.config.prefix}${cmd.parentName}${alias}`).join(', ')}` : ''; - const subcommands = cmd.subcommands.size ? `\n**Subcommands:** ${cmd.subcommands.map((s) => s.parentName || `${cmd.name} ${s.name}`).join(', ')}` : ''; + const subcommands = cmd.subcommands.size ? `\n**Subcommands:** ${cmd.subcommands.map((s) => `${cmd.name} ${s.name}`).join(', ')}` : ''; const embed = new RichEmbed(); embed.setTimestamp(); embed.setFooter(`Requested by ${message.author.username}#${message.author.discriminator}`, message.author.avatarURL); - embed.setTitle(`${this.client.config.prefix}${cmd.parentName}${cmd.name}`); embed.setAuthor(`${this.client.user.username}#${this.client.user.discriminator}`, this.client.user.avatarURL); + embed.setTitle(`${this.client.config.prefix}${cmd.parentName || cmd.name}`); embed.setAuthor(`${this.client.user.username}#${this.client.user.discriminator}`, this.client.user.avatarURL); const description = `**Description**: ${cmd.description}\n**Usage:** ${cmd.usage}${aliases}${displayedPerms}${subcommands}`; embed.setDescription(description); // @ts-ignore