diff --git a/commands/games/battle.js b/commands/games/battle.js index cbc4325b..8518fe68 100644 --- a/commands/games/battle.js +++ b/commands/games/battle.js @@ -109,8 +109,8 @@ module.exports = class BattleCommand extends Command { this.fighting.delete(msg.channel.id); return msg.say(stripIndents` The match is over! - **Winner:** ${userHP > oppoHP ? `${msg.author} (${userHP}HP)` : `${opponent} (${oppoHP}HP)`} - **Loser:** ${userHP > oppoHP ? `${opponent} (${oppoHP}HP)` : `${msg.author} (${userHP}HP)`} + **Winner**: ${userHP > oppoHP ? `${msg.author} (${userHP}HP)` : `${opponent} (${oppoHP}HP)`} + **Loser**: ${userHP > oppoHP ? `${opponent} (${oppoHP}HP)` : `${msg.author} (${userHP}HP)`} `); } catch (err) { this.fighting.delete(msg.channel.id); diff --git a/commands/games/emoji-emoji-revolution.js b/commands/games/emoji-emoji-revolution.js index fc8f99b1..2903a150 100644 --- a/commands/games/emoji-emoji-revolution.js +++ b/commands/games/emoji-emoji-revolution.js @@ -59,8 +59,8 @@ module.exports = class EmojiEmojiRevolutionCommand extends Command { else ++oPts; await msg.say(stripIndents` ${winner} won this round! - **${msg.author.username}:** ${aPts} - **${opponent.username}:** ${oPts} + **${msg.author.username}**: ${aPts} + **${opponent.username}**: ${oPts} `); } this.playing.delete(msg.channel.id); diff --git a/commands/moderation/ban.js b/commands/moderation/ban.js index a4eecc5c..eba78cee 100644 --- a/commands/moderation/ban.js +++ b/commands/moderation/ban.js @@ -47,7 +47,7 @@ module.exports = class BanCommand extends Command { try { await member.send(stripIndents` You were banned from ${msg.guild.name} by ${msg.author.tag}! - **Reason:** ${reason} + **Reason**: ${reason} `); } catch (err) { await msg.say('Failed to send DM.'); diff --git a/commands/moderation/kick.js b/commands/moderation/kick.js index 4c539f95..e33ac2f0 100644 --- a/commands/moderation/kick.js +++ b/commands/moderation/kick.js @@ -47,7 +47,7 @@ module.exports = class KickCommand extends Command { try { await member.send(stripIndents` You were kicked from ${msg.guild.name} by ${msg.author.tag}! - **Reason:** ${reason} + **Reason**: ${reason} `); } catch (err) { await msg.say('Failed to send DM.'); diff --git a/commands/moderation/softban.js b/commands/moderation/softban.js index 334d0600..4058223a 100644 --- a/commands/moderation/softban.js +++ b/commands/moderation/softban.js @@ -47,7 +47,7 @@ module.exports = class SoftbanCommand extends Command { try { await member.send(stripIndents` You were softbanned from ${msg.guild.name} by ${msg.author.tag}! - **Reason:** ${reason} + **Reason**: ${reason} `); } catch (err) { await msg.say('Failed to send DM.'); diff --git a/commands/num-edit/currency.js b/commands/num-edit/currency.js index dd524629..d2816f2e 100644 --- a/commands/num-edit/currency.js +++ b/commands/num-edit/currency.js @@ -11,7 +11,7 @@ module.exports = class CurrencyCommand extends Command { group: 'num-edit', memberName: 'currency', description: 'Converts a number from one currency to another.', - details: `**Codes:** ${codes.join(', ')}`, + details: `**Codes**: ${codes.join(', ')}`, args: [ { key: 'base', diff --git a/commands/other/horoscope.js b/commands/other/horoscope.js index b3e7e498..a586a9c9 100644 --- a/commands/other/horoscope.js +++ b/commands/other/horoscope.js @@ -11,7 +11,7 @@ module.exports = class HoroscopeCommand extends Command { group: 'other', memberName: 'horoscope', description: 'Responds with today\'s horoscope for a particular sign.', - details: `**Signs:** ${signs.join(', ')}`, + details: `**Signs**: ${signs.join(', ')}`, clientPermissions: ['EMBED_LINKS'], args: [ { diff --git a/commands/other/soundboard.js b/commands/other/soundboard.js index 9d8dc1ce..a7a4cac6 100644 --- a/commands/other/soundboard.js +++ b/commands/other/soundboard.js @@ -11,7 +11,7 @@ module.exports = class SoundboardCommand extends Command { group: 'other', memberName: 'soundboard', description: 'Plays a sound in your voice channel.', - details: `**Sounds:** ${sounds.join(', ')}`, + details: `**Sounds**: ${sounds.join(', ')}`, guildOnly: true, throttling: { usages: 1, diff --git a/commands/search/recipe.js b/commands/search/recipe.js index 06e9a1e9..6dd032dc 100644 --- a/commands/search/recipe.js +++ b/commands/search/recipe.js @@ -34,7 +34,7 @@ module.exports = class RecipeCommand extends Command { .setColor(0xC20000) .setURL(recipe.href) .setTitle(recipe.title) - .setDescription(`**Ingredients:** ${recipe.ingredients}`) + .setDescription(`**Ingredients**: ${recipe.ingredients}`) .setThumbnail(recipe.thumbnail); return msg.embed(embed); } catch (err) { diff --git a/commands/text-edit/translate.js b/commands/text-edit/translate.js index 0089f2b6..b94f5796 100644 --- a/commands/text-edit/translate.js +++ b/commands/text-edit/translate.js @@ -13,7 +13,7 @@ module.exports = class TranslateCommand extends Command { group: 'text-edit', memberName: 'translate', description: 'Translates text to a specified language.', - details: `**Codes:** ${Object.keys(codes).join(', ')}`, + details: `**Codes**: ${Object.keys(codes).join(', ')}`, clientPermissions: ['EMBED_LINKS'], args: [ { diff --git a/commands/util/help.js b/commands/util/help.js index 10f7bcaf..1007aed0 100644 --- a/commands/util/help.js +++ b/commands/util/help.js @@ -27,20 +27,16 @@ module.exports = class HelpCommand extends Command { const commands = this.client.registry.findCommands(command, false, msg); if (command) { if (commands.length === 1) { - const embed = new MessageEmbed() - .setTitle(`Command ${commands[0].name}`) - .setDescription(stripIndents` - ${commands[0].description} - ${commands[0].details || ''} - `) - .setColor(0x00AE86) - .addField('❯ Format', - msg.anyUsage(`${commands[0].name} ${commands[0].format ? commands[0].format : ''}`)) - .addField('❯ Aliases', - commands[0].aliases.join(', ') || 'None') - .addField('❯ Group', - commands[0].group.name); - return msg.embed(embed); + const data = commands[0]; + return msg.say(stripIndents` + __**Command ${data.name}**__ + ${data.description} + _${data.details}_ + + **Format**: ${msg.anyUsage(data.name, data.format || '')} + **Aliases**: ${data.aliases.join(', ') || 'None'} + **Group**: ${data.group.name} + `); } else if (commands.length > 1) { return msg.say(`Multiple commands found: ${commands.map(c => c.name).join(', ')}`); } diff --git a/commands/util/info.js b/commands/util/info.js index cec177f9..22ad8781 100644 --- a/commands/util/info.js +++ b/commands/util/info.js @@ -18,21 +18,20 @@ module.exports = class InfoCommand extends Command { async run(msg) { const guilds = await this.client.shard.fetchClientValues('guilds.size'); - const users = await this.client.shard.fetchClientValues('users.size'); - const memory = await this.client.shard.broadcastEval('process.memoryUsage().heapUsed'); + const invite = await this.client.generateInvite('1345846343'); const embed = new MessageEmbed() .setColor(0x00AE86) .setFooter('©2017 dragonfire535#8081') .addField('❯ Servers', guilds.reduce((prev, val) => prev + val, 0), true) - .addField('❯ Users', - users.reduce((prev, val) => prev + val, 0), true) + .addField('❯ Home Server', + `[Here](https://${this.client.options.invite})`, true) + .addField('❯ Invite', + `[Here](${invite})`, true) .addField('❯ Shards', this.client.options.shardCount, true) .addField('❯ Commands', this.client.registry.commands.size, true) - .addField('❯ Memory Usage', - `${Math.round(memory.reduce((prev, val) => prev + val, 0) / 1024 / 1024)}MB`, true) .addField('❯ Uptime', duration(this.client.uptime).format(), true) .addField('❯ Version',