From f810181c1183cd8ff43bae24a828570557a3cb02 Mon Sep 17 00:00:00 2001 From: Daniel Odendahl Jr Date: Thu, 23 Mar 2017 03:37:20 +0000 Subject: [PATCH] The Ultimate Formatting is Done --- commands/avataredit/3000years.js | 2 +- commands/avataredit/beautiful.js | 2 +- commands/avataredit/bobross.js | 2 +- commands/avataredit/rip.js | 2 +- commands/avataredit/steamcard.js | 2 +- commands/botinfo/contact.js | 4 +-- commands/botinfo/info.js | 10 +++---- commands/botinfo/invite.js | 2 +- commands/botinfo/uptime.js | 4 +-- commands/guildinfo/emoji.js | 2 +- commands/guildinfo/guildinfo.js | 4 +-- commands/imageedit/meme.js | 4 +-- commands/moderation/ban.js | 6 ++--- commands/moderation/kick.js | 6 ++--- commands/moderation/warn.js | 6 ++--- commands/numedit/math.js | 2 +- commands/numedit/roman.js | 2 +- commands/random/canyounot.js | 2 +- commands/random/giveflower.js | 2 +- commands/random/lenny.js | 2 +- commands/random/lottery.js | 6 ++--- commands/random/mathgame.js | 4 +-- commands/random/nitro.js | 2 +- commands/random/slowclap.js | 2 +- commands/random/soundboard.js | 2 +- commands/random/spam.js | 2 +- commands/random/typinggame.js | 2 +- commands/response/8ball.js | 4 +-- commands/response/cat.js | 4 +-- commands/response/choose.js | 13 ++++------ commands/response/coin.js | 4 +-- commands/response/compliment.js | 4 +-- commands/response/factcore.js | 2 +- commands/response/fishy.js | 4 +-- commands/response/fortune.js | 2 +- commands/response/motivate.js | 4 +-- commands/response/name.js | 10 +++---- commands/response/offspring.js | 4 +-- commands/response/potato.js | 4 +-- commands/response/pun.js | 4 +-- commands/response/quantumcoin.js | 4 +-- commands/response/ratewaifu.js | 6 ++--- commands/response/roast.js | 4 +-- commands/response/rockpaperscissors.js | 2 +- commands/response/roll.js | 6 ++--- commands/response/roulette.js | 4 +-- commands/response/ship.js | 4 +-- commands/response/slots.js | 6 ++--- commands/response/vocaloid.js | 2 +- commands/response/xiaopai.js | 4 +-- commands/roleplay/cuddle.js | 4 +-- commands/roleplay/divorce.js | 4 +-- commands/roleplay/eat.js | 4 +-- commands/roleplay/falconpunch.js | 4 +-- commands/roleplay/fistbump.js | 4 +-- commands/roleplay/highfive.js | 4 +-- commands/roleplay/hitwithshovel.js | 4 +-- commands/roleplay/hug.js | 4 +-- commands/roleplay/inhales.js | 4 +-- commands/roleplay/kill.js | 4 +-- commands/roleplay/kiss.js | 4 +-- commands/roleplay/marries.js | 4 +-- commands/roleplay/pat.js | 4 +-- commands/roleplay/poke.js | 4 +-- commands/roleplay/punch.js | 4 +-- commands/roleplay/slap.js | 4 +-- commands/search/botinfo.js | 6 ++--- commands/search/define.js | 4 +-- commands/search/discrim.js | 4 +-- commands/search/forecast.js | 30 ++++++++++----------- commands/search/google.js | 2 +- commands/search/imdb.js | 4 +-- commands/search/neopet.js | 4 +-- commands/search/osu.js | 2 +- commands/search/pokedex.js | 6 ++--- commands/search/urban.js | 6 ++--- commands/search/wattpad.js | 6 ++--- commands/search/weather.js | 4 +-- commands/search/wikipedia.js | 9 +++---- commands/search/youtube.js | 8 +++--- commands/search/yugioh.js | 4 +-- commands/textedit/binary.js | 2 +- commands/textedit/cowsay.js | 2 +- commands/textedit/embed.js | 2 +- commands/textedit/morse.js | 2 +- commands/textedit/pirate.js | 2 +- commands/textedit/reverse.js | 2 +- commands/textedit/rin.js | 2 +- commands/textedit/romaji.js | 2 +- commands/textedit/say.js | 2 +- commands/textedit/shuffle.js | 2 +- commands/textedit/temmie.js | 2 +- commands/textedit/translate.js | 6 ++--- commands/textedit/yoda.js | 2 +- commands/textedit/zalgo.js | 2 +- commands/userinfo/avatar.js | 2 +- commands/userinfo/userinfo.js | 6 ++--- commands/util/servers.js | 4 +-- html/carbondesc.html | 3 ++- html/carbonfeat.html | 2 +- html/discordbots.html | 5 ++-- index.js | 36 +++++++++++++------------- 102 files changed, 222 insertions(+), 224 deletions(-) diff --git a/commands/avataredit/3000years.js b/commands/avataredit/3000years.js index 4c2d72a8..df9cc6a8 100644 --- a/commands/avataredit/3000years.js +++ b/commands/avataredit/3000years.js @@ -19,7 +19,7 @@ module.exports = class YearsCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'ATTACH_FILES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); if (message.mentions.users.size !== 1) { message.channel.send(':x: Error! Please mention one user!'); } diff --git a/commands/avataredit/beautiful.js b/commands/avataredit/beautiful.js index 2677e278..d633877c 100644 --- a/commands/avataredit/beautiful.js +++ b/commands/avataredit/beautiful.js @@ -19,7 +19,7 @@ module.exports = class BeautifulCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'ATTACH_FILES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); if (message.mentions.users.size !== 1) { message.channel.send(':x: Error! Please mention one user!'); } diff --git a/commands/avataredit/bobross.js b/commands/avataredit/bobross.js index 8a8fe56b..6c3ac92d 100644 --- a/commands/avataredit/bobross.js +++ b/commands/avataredit/bobross.js @@ -20,7 +20,7 @@ module.exports = class BobRossCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'ATTACH_FILES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); if (message.mentions.users.size !== 1) { message.channel.send(':x: Error! Please mention one user!'); } diff --git a/commands/avataredit/rip.js b/commands/avataredit/rip.js index b2227ed3..9fd58ac1 100644 --- a/commands/avataredit/rip.js +++ b/commands/avataredit/rip.js @@ -20,7 +20,7 @@ module.exports = class RIPCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'ATTACH_FILES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); if (message.mentions.users.size !== 1) { message.channel.send(':x: Error! Please mention one user!'); } diff --git a/commands/avataredit/steamcard.js b/commands/avataredit/steamcard.js index f740eda3..9bc6fac6 100644 --- a/commands/avataredit/steamcard.js +++ b/commands/avataredit/steamcard.js @@ -19,7 +19,7 @@ module.exports = class SteamCardCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'ATTACH_FILES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); if (message.channel.type !== 'dm') { if (message.mentions.users.size !== 1) { message.channel.send(':x: Error! Please mention one user!'); diff --git a/commands/botinfo/contact.js b/commands/botinfo/contact.js index 0e327cfa..5fc2b67e 100644 --- a/commands/botinfo/contact.js +++ b/commands/botinfo/contact.js @@ -22,7 +22,7 @@ module.exports = class ContactCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let banID = message.author.id; let messageToReport = message.content.split(" ").slice(1).join(" "); if (message.author.id === banlist.banned[banID]) { @@ -33,7 +33,7 @@ module.exports = class ContactCommand extends commando.Command { message.channel.send(':x: Error! Please do not report nothing!'); } else { - this.client.users.get(config.owner).send("**" + message.author.username + '#' + message.author.discriminator + " (" + message.author.id + ")" + ":**\n" + messageToReport); + this.client.users.get(config.owner).send(`**${message.author.username}#${message.author.discriminator} (${message.author.id}):**\n${messageToReport}`); message.channel.send('Message Sent! Thanks for your support!'); } } diff --git a/commands/botinfo/info.js b/commands/botinfo/info.js index cd90c888..ba57caad 100644 --- a/commands/botinfo/info.js +++ b/commands/botinfo/info.js @@ -23,7 +23,7 @@ module.exports = class InfoCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); this.client.shard.fetchClientValues('guilds.size').then(guilds => { this.client.shard.fetchClientValues('voiceConnections.size').then(vCConnections => { const embed = new Discord.RichEmbed() @@ -31,15 +31,15 @@ module.exports = class InfoCommand extends commando.Command { .setAuthor(this.client.user.username, this.client.user.avatarURL) .setColor(0x00AE86) .setDescription('XiaoBot is your personal companion for your Discord Server!') - .setFooter('©2017 dragonfire535 | Created ' + moment.duration(this.client.user.createdTimestamp - Date.now()).format('y[ years], M[ months], w[ weeks, and ]d[ days]') + ' ago!') + .setFooter(`©2017 dragonfire535 | Created ${moment.duration(this.client.user.createdTimestamp - Date.now()).format('y[ years], M[ months], w[ weeks, and ]d[ days]')} ago!`) .setThumbnail(this.client.user.avatarURL) .setURL('http://dragonfire535.weebly.com/xiaobot.html') .addField('Commands', "There are a variety of commands XiaoBot can use! Use ';help' to view a list of all commands!") .addField('Servers', - this.client.guilds.size + " / " + guilds.reduce((prev, val) => prev + val, 0), true) + `${this.client.guilds.size} / ${guilds.reduce((prev, val) => prev + val, 0)}`, true) .addField('Shards', - this.client.options.shardCount + " (This is Shard: " + this.client.shard.id + ")", true) + `${this.client.options.shardCount} (This is Shard: ${this.client.shard.id})`, true) .addField('Commands', config.commandCount, true) .addField('Owner', @@ -53,7 +53,7 @@ module.exports = class InfoCommand extends commando.Command { .addField('Node Version', process.version, true) .addField('Voice Connections', - this.client.voiceConnections.size + " / " + vCConnections.reduce((prev, val) => prev + val, 0), true) + `${this.client.voiceConnections.size} / ${vCConnections.reduce((prev, val) => prev + val, 0)}`, true) .addField('Library', "[discord.js](https://discord.js.org/#/) / [commando](https://github.com/Gawdl3y/discord.js-commando)", true) .addField('Modules', diff --git a/commands/botinfo/invite.js b/commands/botinfo/invite.js index 963a343f..d92d0b9b 100644 --- a/commands/botinfo/invite.js +++ b/commands/botinfo/invite.js @@ -15,7 +15,7 @@ module.exports = class InviteCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); message.channel.send("Add me to your server with this link:\nhttps://discordapp.com/oauth2/authorize?client_id=278305350804045834&scope=bot&permissions=1345846343\nOr, come to my server with this link:\nhttps://discord.gg/fqQF8mc"); } }; diff --git a/commands/botinfo/uptime.js b/commands/botinfo/uptime.js index 0813062e..bb5e7c28 100644 --- a/commands/botinfo/uptime.js +++ b/commands/botinfo/uptime.js @@ -17,7 +17,7 @@ module.exports = class UptimeCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); - message.channel.send("I've been active on this shard for: **" + moment.duration(this.client.uptime).format('d[ days], h[ hours], m[ minutes, and ]s[ seconds]') + "** in a total of " + this.client.guilds.size + " Servers."); + console.log(`[Command] ${message.content}`); + message.channel.send(`I've been active on this shard for: **${moment.duration(this.client.uptime).format('d[ days], h[ hours], m[ minutes, and ]s[ seconds]')}** in **${this.client.guilds.size} Servers.**`); } }; diff --git a/commands/guildinfo/emoji.js b/commands/guildinfo/emoji.js index 0f77466c..3cd560d1 100644 --- a/commands/guildinfo/emoji.js +++ b/commands/guildinfo/emoji.js @@ -20,7 +20,7 @@ module.exports = class EmojiCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); if (message.channel.type !== 'dm') { message.channel.send(message.guild.emojis.map(e => e).join(" ")); } diff --git a/commands/guildinfo/guildinfo.js b/commands/guildinfo/guildinfo.js index 6ecffc67..056829a5 100644 --- a/commands/guildinfo/guildinfo.js +++ b/commands/guildinfo/guildinfo.js @@ -21,7 +21,7 @@ module.exports = class GuildInfoCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); if (message.channel.type !== 'dm') { const embed = new Discord.RichEmbed() .setColor(0x00AE86) @@ -37,7 +37,7 @@ module.exports = class GuildInfoCommand extends commando.Command { .addField('**Region:**', message.guild.region, true) .addField('**Owner:**', - message.guild.owner.user.username + '#' + message.guild.owner.user.discriminator, true) + `${message.guild.owner.user.username}#${message.guild.owner.user.discriminator}`, true) .addField("**Users:**", message.guild.memberCount, true); message.channel.sendEmbed(embed).catch(console.error); diff --git a/commands/imageedit/meme.js b/commands/imageedit/meme.js index d40876a8..750f4ee6 100644 --- a/commands/imageedit/meme.js +++ b/commands/imageedit/meme.js @@ -19,7 +19,7 @@ module.exports = class MemeCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'ATTACH_FILES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let [type] = message.content.toLowerCase().split(" ").slice(1); if (type === "list") { message.channel.send("**Type Codes:** tenguy, afraid, older, aag, tried, biw, blb, kermit, bd, ch, cbg, wonka, cb, keanu, dsm, live, ants, doge, alwaysonbeat, ermg, facepalm, fwp, fa, fbf, fry, hipster, icanhas, crazypills, mw, noidea, regret, boat, hagrid, sohappy, captain, inigo, iw, ackbar, happening, joker, ive, ll, morpheus, mb, badchoice, mmm, jetpack, red, mordor, oprah, oag, remembers, philosoraptor, jw, patrick, rollsafe, sad-obama, sad-clinton, sadfrog, sad-bush, sad-biden, sad-boehner, saltbae, sarcasticbear, dwight, sb, ss, sf, dodgson, money, sohot, nice, awesome-awkward, awesome, awkward-awesome, awkward, fetch, success, scc, ski, officespace, interesting, toohigh, bs, center, both, winter, xy, buzz, yodawg, uno, yallgot, bad, elf, chosen"); @@ -29,7 +29,7 @@ module.exports = class MemeCommand extends commando.Command { let memeQuery = message.content.split(" ").slice(2).join("-").split('-|-'); let toprow = memeQuery[0].split("?").join("~q"); let bottomrow = memeQuery[1].split("?").join("~q"); - let link = "https://memegen.link/" + type + "/" + toprow + "/" + bottomrow + ".jpg"; + let link = `https://memegen.link/${type}/${toprow}/${bottomrow}.jpg`; if (bottomrow.length > 100) { message.channel.send(":x: Error! Bottom text is over 100 characters!"); } diff --git a/commands/moderation/ban.js b/commands/moderation/ban.js index c9ee4df0..20e41930 100644 --- a/commands/moderation/ban.js +++ b/commands/moderation/ban.js @@ -19,7 +19,7 @@ module.exports = class BanCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS', 'BAN_MEMBERS'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); if (message.channel.type !== 'dm') { let userToBan = message.mentions.users.first(); let reason = message.content.split(" ").slice(2).join(" "); @@ -33,11 +33,11 @@ module.exports = class BanCommand extends commando.Command { message.guild.member(userToBan).ban(); if (message.guild.channels.exists("name", "mod_logs")) { const embed = new Discord.RichEmbed() - .setAuthor(message.author.username + '#' + message.author.discriminator, message.author.avatarURL) + .setAuthor(`${message.author.username}#${message.author.discriminator}`, message.author.avatarURL) .setColor(0xFF0000) .setFooter('XiaoBot Moderation', this.client.user.avatarURL) .setTimestamp() - .setDescription('**Member:** ' + userToBan.username + '#' + userToBan.discriminator + ' (' + userToBan.id + ')\n**Action:** Ban\n**Reason:** ' + reason); + .setDescription(`**Member:** ${userToBan.username}#${userToBan.discriminator} (${userToBan.id})\n**Action:** Ban\n**Reason:** ${reason}`); message.guild.channels.find('name', 'mod_logs').sendEmbed(embed).catch(console.error); } else { diff --git a/commands/moderation/kick.js b/commands/moderation/kick.js index 0ae19201..e36f5710 100644 --- a/commands/moderation/kick.js +++ b/commands/moderation/kick.js @@ -16,7 +16,7 @@ module.exports = class KickCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS', 'KICK_MEMBERS'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); if (message.channel.type !== 'dm') { let userToKick = message.mentions.users.first(); let reason = message.content.split(" ").slice(2).join(" "); @@ -30,11 +30,11 @@ module.exports = class KickCommand extends commando.Command { message.guild.member(userToKick).kick(); if (message.guild.channels.exists("name", "mod_logs")) { const embed = new Discord.RichEmbed() - .setAuthor(message.author.username + '#' + message.author.discriminator, message.author.avatarURL) + .setAuthor(`${message.author.username}#${message.author.discriminator}`, message.author.avatarURL) .setColor(0xFFA500) .setFooter('XiaoBot Moderation', this.client.user.avatarURL) .setTimestamp() - .setDescription('**Member:** ' + userToKick.username + '#' + userToKick.discriminator + ' (' + userToKick.id + ')\n**Action:** Kick\n**Reason:** ' + reason); + .setDescription(`**Member:** ${userToKick.username}#${userToKick.discriminator} (${userToKick.id})\n**Action:** Kick\n**Reason:** ${reason}`); message.guild.channels.find('name', 'mod_logs').sendEmbed(embed).catch(console.error); } else { diff --git a/commands/moderation/warn.js b/commands/moderation/warn.js index 6484a0c9..6e8b2e4f 100644 --- a/commands/moderation/warn.js +++ b/commands/moderation/warn.js @@ -16,7 +16,7 @@ module.exports = class WarnCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); if (message.channel.type !== 'dm') { let userToWarn = message.mentions.users.first(); let reason = message.content.split(" ").slice(2).join(" "); @@ -28,11 +28,11 @@ module.exports = class WarnCommand extends commando.Command { message.channel.send(":ok_hand:"); if (message.guild.channels.exists("name", "mod_logs")) { const embed = new Discord.RichEmbed() - .setAuthor(message.author.username + '#' + message.author.discriminator, message.author.avatarURL) + .setAuthor(`${message.author.username}#${message.author.discriminator}`, message.author.avatarURL) .setColor(0xFFFF00) .setFooter('XiaoBot Moderation', this.client.user.avatarURL) .setTimestamp() - .setDescription('**Member:** ' + userToWarn.username + '#' + userToWarn.discriminator + ' (' + userToWarn.id + ')\n**Action:** Warn\n**Reason:** ' + reason); + .setDescription(`**Member:** ${userToWarn.username}#${userToWarn.discriminator} (${userToWarn.id})\n**Action:** Warn\n**Reason:** ${reason}`); message.guild.channels.find('name', 'mod_logs').sendEmbed(embed).catch(console.error); } else { diff --git a/commands/numedit/math.js b/commands/numedit/math.js index b5a20059..85836dc4 100644 --- a/commands/numedit/math.js +++ b/commands/numedit/math.js @@ -22,7 +22,7 @@ module.exports = class MathCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let expression = message.content.split(" ").slice(1).join(" "); try { let solved = math.eval(expression); diff --git a/commands/numedit/roman.js b/commands/numedit/roman.js index 37f78583..9baf7038 100644 --- a/commands/numedit/roman.js +++ b/commands/numedit/roman.js @@ -16,7 +16,7 @@ module.exports = class RomanCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let numberToRoman = message.content.split(" ").slice(1).join(" "); let romanInterger = Number(numberToRoman); if (romanInterger > 1000000) { diff --git a/commands/random/canyounot.js b/commands/random/canyounot.js index eed47f5e..6a093fdd 100644 --- a/commands/random/canyounot.js +++ b/commands/random/canyounot.js @@ -15,7 +15,7 @@ module.exports = class CanYouNot extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); message.channel.send('Can YOU not?'); } }; diff --git a/commands/random/giveflower.js b/commands/random/giveflower.js index 219c245c..f33faf58 100644 --- a/commands/random/giveflower.js +++ b/commands/random/giveflower.js @@ -19,7 +19,7 @@ module.exports = class GiveFlowerCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); message.channel.send('Ooh, what a pretty flower. What, I may have it? Thanks! I like flowers, yes? ♪'); } }; diff --git a/commands/random/lenny.js b/commands/random/lenny.js index fb7e7235..8207c7d9 100644 --- a/commands/random/lenny.js +++ b/commands/random/lenny.js @@ -15,7 +15,7 @@ module.exports = class LennyCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); message.channel.send('( ͡° ͜ʖ ͡°)'); } }; diff --git a/commands/random/lottery.js b/commands/random/lottery.js index 8708928d..50dea50b 100644 --- a/commands/random/lottery.js +++ b/commands/random/lottery.js @@ -15,13 +15,13 @@ module.exports = class LotteryCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let lotteryNumber = ['Winner'][Math.floor(Math.random() * 100)]; if (lotteryNumber === "Winner") { - message.channel.send("Wow " + message.author.username + "! You actually won! Great job!"); + message.channel.send(`Wow ${message.author.username}! You actually won! Great job!`); } else { - message.channel.send("Nope, sorry, " + message.author.username + ", you lost."); + message.channel.send(`Nope, sorry ${message.author.username}, you lost.`); } } }; diff --git a/commands/random/mathgame.js b/commands/random/mathgame.js index 610184a9..97499a28 100644 --- a/commands/random/mathgame.js +++ b/commands/random/mathgame.js @@ -17,7 +17,7 @@ module.exports = class MathGameCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let [level] = message.content.toLowerCase().split(" ").slice(1); let randomType = ['+', '-', '*']; randomType = randomType[Math.floor(Math.random() * randomType.length)]; @@ -55,7 +55,7 @@ module.exports = class MathGameCommand extends commando.Command { }).then((collected) => { message.channel.send(`Good Job! You won!`); }).catch(() => { - message.channel.send('Aw... Too bad, try again next time! The correct answer was: ' + solved); + message.channel.send(`Aw... Too bad, try again next time! The correct answer was: ${solved}`); }); }); } diff --git a/commands/random/nitro.js b/commands/random/nitro.js index a7ced7e4..7d2a2e85 100644 --- a/commands/random/nitro.js +++ b/commands/random/nitro.js @@ -16,7 +16,7 @@ module.exports = class NitroCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); const embed = new Discord.RichEmbed() .setAuthor("Discord Nitro") .setThumbnail("https://pbs.twimg.com/profile_images/814184180649197568/y2eZcVMq.jpg") diff --git a/commands/random/slowclap.js b/commands/random/slowclap.js index a79896e8..64c1553d 100644 --- a/commands/random/slowclap.js +++ b/commands/random/slowclap.js @@ -15,7 +15,7 @@ module.exports = class SlowClapCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); message.channel.send('*slow clap*'); } }; diff --git a/commands/random/soundboard.js b/commands/random/soundboard.js index 85226054..7d2f1542 100644 --- a/commands/random/soundboard.js +++ b/commands/random/soundboard.js @@ -20,7 +20,7 @@ module.exports = class SoundBoardCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['CONNECT', 'SPEAK', 'ADD_REACTIONS'])) { message.channel.send(':x: Error! In order to do this command, you must give me the permissions to "Connect" and "Speak", as well as the permission to Add Reactions!'); diff --git a/commands/random/spam.js b/commands/random/spam.js index 304277d9..f31397f6 100644 --- a/commands/random/spam.js +++ b/commands/random/spam.js @@ -15,7 +15,7 @@ module.exports = class SpamCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'ATTACH_FILES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); message.channel.sendFile("./images/Spam.jpg"); } }; diff --git a/commands/random/typinggame.js b/commands/random/typinggame.js index a35467e2..50c48185 100644 --- a/commands/random/typinggame.js +++ b/commands/random/typinggame.js @@ -16,7 +16,7 @@ module.exports = class TypingGameCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let [level] = message.content.toLowerCase().split(" ").slice(1); let randomSentence = ['The quick brown fox jumps over the lazy dog.', 'Buffalo buffalo Buffalo buffalo buffalo buffalo Buffalo buffalo.', 'How razorback-jumping frogs can level six piqued gymnasts!', 'Amazingly few discotheques provide jukeboxes.']; randomSentence = randomSentence[Math.floor(Math.random() * randomSentence.length)]; diff --git a/commands/response/8ball.js b/commands/response/8ball.js index 026e9ca0..c86aeb13 100644 --- a/commands/response/8ball.js +++ b/commands/response/8ball.js @@ -15,13 +15,13 @@ module.exports = class MagicBall extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let question = message.content.split(" ").slice(1).join(" "); let answers = ['It seems the answer is yes, yes?', 'It seems the answer is no.', 'It is a little doubtful, yes?', 'It seems it is very likely to be true.']; answers = answers[Math.floor(Math.random() * answers.length)]; if (!question) { question = "Not Specified."; } - message.channel.send("Question: " + question + "\n:8ball: " + answers + " :8ball:"); + message.channel.send(`Question: ${question}\n:8ball: ${answers} :8ball:`); } }; diff --git a/commands/response/cat.js b/commands/response/cat.js index 4fdf18b6..e4fe30c6 100644 --- a/commands/response/cat.js +++ b/commands/response/cat.js @@ -15,9 +15,9 @@ module.exports = class RandomCat extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'ATTACH_FILES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let cat = ["1.jpg", "2.jpg", "3.jpg", "4.jpg", "5.jpg", "6.jpg", "7.jpg", "8.jpg", "9.jpg", "10.jpg", "11.jpeg", "12.jpg", "13.jpeg", "14.png", "15.jpg", "16.jpg", "17.jpg", "18.jpg", "19.jpg", "20.jpg"]; cat = cat[Math.floor(Math.random() * cat.length)]; - message.channel.sendFile("./images/Cat" + cat); + message.channel.sendFile(`./images/Cat${cat}`); } }; diff --git a/commands/response/choose.js b/commands/response/choose.js index 05757d38..2d04e80f 100644 --- a/commands/response/choose.js +++ b/commands/response/choose.js @@ -9,8 +9,8 @@ module.exports = class ChooseCommand extends commando.Command { ], group: 'response', memberName: 'choose', - description: 'Chooses between two things. (;choose Cow | Sheep)', - examples: [';choose Cow | Sheep'] + description: 'Chooses between things. (;choose Cow | Sheep)', + examples: [';choose Cow | Sheep', ';choose Bark | Woof | Meow | Moo'] }); } @@ -18,14 +18,11 @@ module.exports = class ChooseCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); if (message.content.includes(" | ")) { let choices = message.content.split(" ").slice(1).join(" ").split(' | '); - let choice1 = choices[0]; - let choice2 = choices[1]; - let randomChoice = [choice1, choice2]; - randomChoice = randomChoice[Math.floor(Math.random() * randomChoice.length)]; - message.channel.send("I choose " + randomChoice + "!"); + choices = choices[Math.floor(Math.random() * choices.length)]; + message.channel.send(`I choose ${choices}!`); } else { message.channel.send(":x: Split your two choices with a ' | '!"); diff --git a/commands/response/coin.js b/commands/response/coin.js index 26e52dc9..29255a44 100644 --- a/commands/response/coin.js +++ b/commands/response/coin.js @@ -19,9 +19,9 @@ module.exports = class CoinFlipCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let coin = ['Heads', 'Tails']; coin = coin[Math.floor(Math.random() * coin.length)]; - message.channel.send("It landed on " + coin); + message.channel.send(`It landed on ${coin}`); } }; diff --git a/commands/response/compliment.js b/commands/response/compliment.js index 9d35e023..bf7657d3 100644 --- a/commands/response/compliment.js +++ b/commands/response/compliment.js @@ -15,7 +15,7 @@ module.exports = class ComplimentCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let thingToCompliment = message.content.split(" ").slice(1).join(" "); let compliments = ["Your smile is contagious.", "You look great today.", "You're a smart cookie.", "I bet you make babies smile.", "You have impeccable manners.", "I like your style.", "You have the best laugh.", "I appreciate you.", "You are the most perfect you there is.", "You are enough.", "You're strong.", "Your perspective is refreshing.", "You're an awesome friend.", "You light up the room.", "You shine brighter than a shooting star.", "You deserve a hug right now.", "You should be proud of yourself.", "You're more helpful than you realize.", "You have a great sense of humor.", "You've got all the right moves!", "Is that your picture next to 'charming' in the dictionary?", "Your kindness is a balm to all who encounter it.", "You're all that and a super-size bag of chips.", "On a scale from 1 to 10, you're an 11.", "You are brave.", "You're even more beautiful on the inside than you are on the outside.", "You have the courage of your convictions.", "Your eyes are breathtaking.", "If cartoon bluebirds were real, a bunch of them would be sitting on your shoulders singing right now.", "You are making a difference.", "You're like sunshine on a rainy day.", "You bring out the best in other people.", "Your ability to recall random factoids at just the right time is impressive.", "You're a great listener.", "How is it that you always look great, even in sweatpants?", "Everything would be better if more people were like you!", "I bet you sweat glitter.", "You were cool way before hipsters were cool.", "That color is perfect on you.", "Hanging out with you is always a blast.", "You always know -- and say -- exactly what I need to hear when I need to hear it.", "You smell really good.", "You may dance like no one's watching, but everyone's watching because you're an amazing dancer!", "Being around you makes everything better!", "When you say, 'I meant to do that,' I totally believe you.", "When you're not afraid to be yourself is when you're most incredible.", "Colors seem brighter when you're around.", "You're more fun than a ball pit filled with candy. (And seriously, what could be more fun than that?)", "That thing you don't like about yourself is what makes you so interesting.", "You're wonderful.", "You have cute elbows. For reals!", "Jokes are funnier when you tell them.", "You're better than a triple-scoop ice cream cone. With sprinkles.", "Your bellybutton is kind of adorable.", "Your hair looks stunning.", "You're one of a kind!", "You're inspiring.", "If you were a box of crayons, you'd be the giant name-brand one with the built-in sharpener.", "You should be thanked more often. So thank you!!", "Our community is better because you're in it.", "Someone is getting through something hard right now because you've got their back.", "You have the best ideas.", "You always know how to find that silver lining.", "Everyone gets knocked down sometimes, but you always get back up and keep going.", "You're a candle in the darkness.", "You're a great example to others.", "Being around you is like being on a happy little vacation.", "You always know just what to say.", "You're always learning new things and trying to better yourself, which is awesome.", "If someone based an Internet meme on you, it would have impeccable grammar.", "You could survive a Zombie apocalypse.", "You're more fun than bubble wrap.", "When you make a mistake, you fix it.", "Who raised you? They deserve a medal for a job well done.", "You're great at figuring stuff out.", "Your voice is magnificent.", "The people you love are lucky to have you in their lives.", "You're like a breath of fresh air.", "You're gorgeous -- and that's the least interesting thing about you, too.", "You're so thoughtful.", "Your creative potential seems limitless.", "Your name suits you to a T.", "You're irresistible when you blush.", "Actions speak louder than words, and yours tell an incredible story.", "Somehow you make time stop and fly at the same time.", "When you make up your mind about something, nothing stands in your way.", "You seem to really know who you are.", "Any team would be lucky to have you on it.", "In high school I bet you were voted 'most likely to keep being awesome.'", "I bet you do the crossword puzzle in ink.", "Babies and small animals probably love you.", "If you were a scented candle they'd call it Perfectly Imperfect (and it would smell like summer).", "There's ordinary, and then there's you.", "You're someone's reason to smile.", "You're even better than a unicorn, because you're real.", "How do you keep being so funny and making everyone laugh?", "You have a good head on your shoulders.", "Has anyone ever told you that you have great posture?", "The way you treasure your loved ones is incredible.", "You're really something special.", "You're a gift to those around you.", "You don't deserve it."]; compliments = compliments[Math.floor(Math.random() * compliments.length)]; @@ -23,7 +23,7 @@ module.exports = class ComplimentCommand extends commando.Command { message.reply(compliments); } else { - message.channel.send(thingToCompliment + ", " + compliments); + message.channel.send(`${thingToCompliment}, ${compliments}`); } } }; diff --git a/commands/response/factcore.js b/commands/response/factcore.js index 0e03bc0c..2b31602f 100644 --- a/commands/response/factcore.js +++ b/commands/response/factcore.js @@ -15,7 +15,7 @@ module.exports = class FactCore extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let facts = ["The billionth digit of Pi is 9.", "Humans can survive underwater. But not for very long.", "A nanosecond lasts one billionth of a second.", "Honey does not spoil.", "The atomic weight of Germanium is seven two point four six.", "An ostrich's eye is bigger than its brain.", "Rats cannot throw up.", "Iguanas can stay underwater for twenty-eight point seven minutes.", "The moon orbits the Earth every 27.32 days.", "A gallon of water weighs 8.34 pounds.", "According to Norse legend, thunder god Thor's chariot was pulled across the sky by two goats.", "Tungsten has the highest melting point of any metal, at 3,410 degrees Celsius.", "Gently cleaning the tongue twice a day is the most effective way to fight bad breath.", "The Tariff Act of 1789, established to protect domestic manufacture, was the second salute ever enacted by the United States government.", "The value of Pi is the ratio of any circle's circumference to its diameter in Euclidean space.", "The Mexican-American War ended in 1848 with the signing of the Treaty of Guadalupe Hidalgo.", "In 1879, Sandford Fleming first proposed the adoption of worldwide standardized time zones at the Royal Canadian Institute.", "Marie Curie invented the theory of radioactivity, the treatment of radioactivity, and the dying of radioactivity.", "At the end of The Seagull by Anton Chekhov, Konstantin kills himself.", "Hot water freezes quicker than cold water.", "The situation you are in is very dangerous.", "Polymerase I polypeptide A is a human gene.", "The sun is 333,330 times larger than Earth.", "Dental floss has superb tensile strength.", "Raseph, the Semitic god of war and plague, had a gazelle growing out of his forehead.", "Human tapeworms can grow up to twenty-two point nine meters.", "If you have trouble with simple counting, use the following mnemonic device: one comes before two comes before 60 comes after 12 comes before six trillion comes after 504. This should make your earlier counting difficulties seem like no big deal.", "The first person to prove that cow's milk is drinkable was very, very thirsty.", "Roman toothpaste was made with human urine. Urine as an ingredient in toothpaste continued to be used up until the 18th century.", "Volcano-ologists are experts in the study of volcanoes.", "In Victorian England, a commoner was not allowed to look directly at the Queen, due to a belief at the time that the poor had the ability to steal thoughts. Science now believes that less than 4 percent of poor people are able to do this.", "Cellular phones will not give you cancer. Only hepatitis.", "In Greek myth, Prometheus stole fire from the Gods and gave it to humankind. The jewelry he kept for himself.", "The Schrodinger's cat paradox outlines a situation in which a cat in a box must be considered, for all intents and purposes, simultaneously alive and dead. Schrodinger created this paradox as a justification for killing cats.", "In 1862, Abraham Lincoln signed the Emancipation Proclamation, freeing the slaves. Like everything he did, Lincoln freed the slaves while sleepwalking, and later had no memory of the event.", "The plural of surgeon general is surgeons general. The past tense of surgeons general is surgeonsed general.", "Contrary to popular belief, the Eskimo does not have one hundred different words for snow. They do, however, have two hundred and thirty-four words for fudge.", "Halley's Comet can be viewed orbiting Earth every seventy-six years. For the other seventy-five, it retreats to the heart of the sun, where it hibernates undisturbed.", "The first commercial airline flight took to the air in 1914. Everyone involved screamed the entire way.", "Edmund Hillary, the first person to climb Mount Everest, did so accidentally while chasing a bird.", "We will both die because of your negligence.", "This is a bad plan. You will fail.", "He will most likely kill you, violently.", "He will most likely kill you.", "You will be dead soon.", "You are going to die in this room.", "The Fact Sphere is a good person, whose insights are relevant.", "The Fact Sphere is a good sphere, with many friends.", "Dreams are the subconscious mind's way of reminding people to go to school naked and have their teeth fall out.", "The square root of rope is string.", "89 percent of magic tricks are not actually magic. Technically, they are sorcery.", "At some point in their lives 1 in 6 children will be abducted by the Dutch.", "According to most advanced algorithms, the world's best name is Craig.", "To make a photocopier, simply photocopy a mirror.", "Whales are twice as intelligent, and three times as delicious, as humans.", "Pants were invented by sailors in the sixteenth century to avoid Poseiden's wrath. It was believed that the sight of naked sailors angered the sea god.", "In Greek myth, the craftsman Daedalus invented human flight so a group of Minotaurs would stop teasing him about it.", "The average life expectancy of a rhinoceros in captivity is 15 years.", "China produces the world's second largest crop of soybeans.", "In 1948, at the request of a dying boy, baseball legend Babe Ruth ate seventy-five hot dogs, then died of hot dog poisoning.", "William Shakespeare did not exist. His plays were masterminded in 1589 by Francis Bacon, who used a Ouija board to enslave play-writing ghosts.", "It is incorrectly noted that Thomas Edison invented push-ups in 1878. Nikolai Tesla had in fact patented the activity three years earlier, under the name Tesla-cize.", "The automobile brake was not invented until 1895. Before this, someone had to remain in the car at all times, driving in circles until passengers returned from their errands.", "The most poisonous fish in the world is the orange ruffy. Everything but its eyes are made of deadly poison. The ruffy's eyes are composed of a less harmful, deadly poison.", "The occupation of court jester was invented accidentally, when a vassal's epilepsy was mistaken for capering.", "Before the Wright Brothers invented the airplane, anyone wanting to fly anywhere was required to eat 200 pounds of helium.", "Before the invention of scrambled eggs in 1912, the typical breakfast was either whole eggs still in the shell or scrambled rocks.", "During the Great Depression, the Tennessee Valley Authority outlawed pet rabbits, forcing many to hot glue-gun long ears onto their pet mice.", "The situation is hopeless.", "Diamonds are made when coal is put under intense pressure. Diamonds put under intense pressure become foam pellets, commonly used today as packing material.", "Corruption is at 25 percent.", "Corruption is at 50 percent.", "Fact: Space does not exist.", "The Fact Sphere is not defective. Its facts are wholly accurate and very interesting.", "The Fact Sphere is always right.", "You will never go into space.", "The Space Sphere will never go to space.", "While the submarine is vastly superior to the boat in every way, over 97 percent of people still use boats for aquatic transportation.", "The likelihood of you dying within the next five minutes is eighty-seven point six one percent.", "The likelihood of you dying violently within the next five minutes is eighty-seven point six one percent.", "You are about to get me killed.", "The Fact Sphere is the most intelligent sphere.", "The Fact Sphere is the most handsome sphere.", "The Fact Sphere is incredibly handsome.", "Sphere that insist of going into space are inferior to spheres who don't.", "Whoever wins this battle is clearly superior, and will earn the allegiance of the Fact Sphere.", "You could stand to lose a few pounds.", "Avocados have the highest fiber and calories of any fruit.", "Avocados have the highest fiber and calories of any fruit. They are found in Australians.", "Every square inch of the human body has 32 million bacteria on it.", "The average adult body contains half a pound of salt.", "The Adventure Sphere is a blowhard and a coward.", "Twelve. Twelve. Twelve. Twelve. Twelve. Twelve. Twelve. Twelve. Twelve. Twelve.", "Pens. Pens. Pens. Pens. Pens. Pens. Pens.", "Apples. Oranges. Pears. Plums. Kumquats. Tangerines. Lemons. Limes. Avocado. Tomoato. Banana. Papaya. Guava.", "Error. Error. Error. File not found.", "Error. Error. Error. Fact not found.", "Fact not found.", "Warning, sphere corruption at twenty-- rats cannot throw up."]; facts = facts[Math.floor(Math.random() * facts.length)]; message.channel.send(facts); diff --git a/commands/response/fishy.js b/commands/response/fishy.js index 146e46e0..ad2156a2 100644 --- a/commands/response/fishy.js +++ b/commands/response/fishy.js @@ -19,9 +19,9 @@ module.exports = class FishyCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let fish = [':fish:', ':tropical_fish:', ':blowfish:']; fish = fish[Math.floor(Math.random() * fish.length)]; - message.channel.send("You caught a: " + fish); + message.channel.send(`You caught a: ${fish}`); } }; diff --git a/commands/response/fortune.js b/commands/response/fortune.js index 76ae3c32..8bec1588 100644 --- a/commands/response/fortune.js +++ b/commands/response/fortune.js @@ -18,7 +18,7 @@ module.exports = class FortuneCookieCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let fortunes = ["Do not seek so much to find the answer as much as to understand the question better.", "You will soon be honored by someone you respect.", "Happiness comes from a good life.", "You are contemplating some action which will bring credit upon you.", "Be prepared for extra energy.", "You are admired for your adventurous ways.", "The love of your life is sitting across from you.", "Beauty is simply beauty. Originality is magical.", "Never quit!", "Today is an ideal time to water your personal garden.", "Questions provide the key to unlocking our unlimited potential.", "Expect great things and great things will come.", "The Greatest War Sometimes Isn't On The Battlefield But Against Oneself.", "Become who you are.", "In case of fire, keep calm, pay bill and run.", "Anyone who dares to be, can never be weak.", "You broke my cookie!", "Dream lofty dreams, and as you dream, so shall you become.", "You've got what it takes, but it will take everything you've got!", "Trust your intuition.", "The wise are aware of their treasure, while fools follow their vanity.", "You will always have good luck in your personal affairs.", "You don't need talent to gain experience.", "All the preparation you've done will finally be paying off!", "Determination is the wake-up call to the human will.", "The most useless energy is trying to change what and who God so carefully created.", "You cannot become rich except by enriching others.", "Your happiness is intertwined with your outlook on life.", "Sing and rejoice, fortune is smiling on you.", "Well-arranged time is the surest sign of a well-arranged mind."]; fortunes = fortunes[Math.floor(Math.random() * fortunes.length)]; message.channel.send(fortunes); diff --git a/commands/response/motivate.js b/commands/response/motivate.js index 5ff71d64..fcc3e22f 100644 --- a/commands/response/motivate.js +++ b/commands/response/motivate.js @@ -19,13 +19,13 @@ module.exports = class MotivateCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let userToMotivate = message.content.split(" ").slice(1).join(" "); if (!userToMotivate) { message.reply('https://www.youtube.com/watch?v=ZXsQAXx_ao0'); } else { - message.channel.send(userToMotivate + ", https://www.youtube.com/watch?v=ZXsQAXx_ao0"); + message.channel.send(`${userToMotivate}, https://www.youtube.com/watch?v=ZXsQAXx_ao0`); } } }; diff --git a/commands/response/name.js b/commands/response/name.js index 0f83db44..2e66473b 100644 --- a/commands/response/name.js +++ b/commands/response/name.js @@ -19,23 +19,23 @@ module.exports = class RandomNameGen extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let randomFirstMale = ["Bob", "Daniel", "Logan", "Chris", "Nathan", "George", "Mart", "Charlie", "Felix", "Ralph", "William", "Max", "Jerry", "Marty", "Joshua", "Cody", "Richard", "Alex", "Alexander", "Jordan", "Zachary", "Bill", "Alfred", "Bruce", "Caiden", "Calvin", "Eric", "Robert", "Mark", "Miles", "Nash", "Ronald", "Ivan", "Edgar", "Royal", "Augustine", "Dominic", "Noel", "Rocky", "Grover", "Paul", "Jeremy", "Stevie", "Brock", "Jc", "Tony", "Enoch", "Zachery", "Harvey", "Gilbert", "Chang", "Emery", "Carroll", "Odell", "Jean", "Archie", "Russ", "Barry", "Lowell", "Jacob", "Riku", "Frederic", "Levi", "Faustino", "Leland", "Domenic", "Irwin", "Moises", "Louie", "Larry", "Victor"]; randomFirstMale = randomFirstMale[Math.floor(Math.random() * randomFirstMale.length)]; let randomFirstFemale = ["Elizabeth", "Chelsey", "Rachel", "Logan", "Alex", "Jordan", "Mary", "Shirley", "Sandy", "Linda", "Audrey", "Autumn", "Gracie", "Grace", "Erin", "Catherine", "Stephanie", "Lucy", "Patty", "Julie", "Christina", "Fiona", "Riley", "Ashley", "Bree", "Lucila", "Wendi", "Evangelina", "Ricki", "Merna", "Tegan", "Venus", "Claris", "Tana", "Sakura", "Edythe", "Adena", "Princess", "Elnora", "Star", "Edyth", "Beverly", "Kelsie", "Letha", "Latisha", "Lolita", "Bernandine", "Jessenia", "Hannah", "Leonore", "Alene", "Fannie", "Bernardine", "Leena", "Tera", "Yvette", "Melisa", "Alissa", "Xiao", "Richelle", "Bridgett", "Sumiko", "Paulette", "Charlott", "Honey", "Veola", "Sherita", "Amanda", "Vannessa", "April", "Ruth"]; randomFirstFemale = randomFirstFemale[Math.floor(Math.random() * randomFirstFemale.length)]; let randomLast = ["Walker", "Tworni", "Ross", "Smith", "Odendahl", "Deere", "Brown", "Williams", "Jones", "Miles", "Moss", "Roberto", "McFly", "McDonald", "Lewis", "Armstrong", "Stevenson", "Schwarzenegger", "Robinson", "Parker", "Piper", "Johnson", "Brantley", "Stewart", "Ree", "Talbot", "Seville", "Peace", "Spielberg", "Baggins", "Wilborn", "Vankirk", "Shireman", "Jimerson", "Masters", "Hack", "Satcher", "Younkin", "Aguila", "Duffey", "Burgin", "Highfall", "Wee", "Solari", "Tomaselli", "Basler", "Difranco", "Latch", "Rives", "Dolan", "Abraham", "Holter", "Portugal", "Lininger", "Holst", "Mccroy", "Follmer", "Hotchkiss", "Gassaway", "Wang", "Agron", "Raasch", "Gourd", "Czaja", "Marquart", "Papadopoulos", "Ringer", "Lax", "Sperling", "Galusha", "Alston"]; randomLast = randomLast[Math.floor(Math.random() * randomLast.length)]; - let randomFirstBoth = [randomFirstMale, randomFirstFemale] + let randomFirstBoth = [randomFirstMale, randomFirstFemale]; randomFirstBoth = randomFirstBoth[Math.floor(Math.random() * randomFirstBoth.length)]; if (message.content.toLowerCase().split(" ").slice(1).includes("male")) { - message.channel.send(randomFirstMale + " " + randomLast); + message.channel.send(`${randomFirstMale} ${randomLast}`); } else if (message.content.toLowerCase().split(" ").slice(1).includes("female")) { - message.channel.send(randomFirstFemale + " " + randomLast); + message.channel.send(`${randomFirstFemale} ${randomLast}`); } else { - message.channel.send(randomFirstBoth + " " + randomLast); + message.channel.send(`${randomFirstBoth} ${randomLast}`); } } }; diff --git a/commands/response/offspring.js b/commands/response/offspring.js index aa10b9ff..bb0f0dc1 100644 --- a/commands/response/offspring.js +++ b/commands/response/offspring.js @@ -20,9 +20,9 @@ module.exports = class OffspringCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let gender = ['boy', 'girl']; gender = gender[Math.floor(Math.random() * gender.length)]; - message.channel.send("It's a " + gender + "!"); + message.channel.send(`It's a ${gender}!`); } }; diff --git a/commands/response/potato.js b/commands/response/potato.js index 95cd0633..4e30260a 100644 --- a/commands/response/potato.js +++ b/commands/response/potato.js @@ -15,9 +15,9 @@ module.exports = class PotatoCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'ATTACH_FILES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let potato = ["1.jpg", "2.jpg", "3.jpg", "4.jpg", "5.gif", "6.png", "7.jpg", "8.jpg", "9.jpg"]; potato = potato[Math.floor(Math.random() * potato.length)]; - message.channel.sendFile("./images/Potato" + potato); + message.channel.sendFile(`./images/Potato${potato}`); } }; diff --git a/commands/response/pun.js b/commands/response/pun.js index 85c8885d..280d9fff 100644 --- a/commands/response/pun.js +++ b/commands/response/pun.js @@ -15,9 +15,9 @@ module.exports = class RandomPun extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'ATTACH_FILES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let pun = ["Pun1.jpg", "Pun2.jpg", "Pun3.jpg", "Pun4.jpg", "Pun5.jpg", "Pun6.jpg", "Pun7.jpg", "Pun8.png", "Pun9.jpg", "Pun10.jpg", "Pun11.jpg", "Pun12.jpg", "Pun13.jpg", "Pun14.jpg", "Pun15.jpg", "Pun16.jpg", "Pun17.jpg", "Pun18.jpg", "Pun19.jpg", "Pun20.jpg", "Pun21.jpg", "Pun22.jpg", "Pun23.jpg", "Pun24.jpg", "Pun25.jpg", "Pun26.jpg", "Pun27.jpg", "Pun28.jpg", "Pun29.jpg", "Pun30.jpeg", "Pun31.jpg", "Pun32.jpg", "Pun33.jpg", "Pun34.png", "Pun35.jpg", "Pun36.jpg", "Pun37.jpg", "Pun38.jpg", "Pun39.jpg", "Pun40.jpg", "Pun41.jpg", "Pun42.jpg", "Pun43.jpg", "Pun44.jpg", "Pun45.gif", "Pun46.jpg", "Pun47.jpg", "Pun48.jpg", "Pun49.jpg", "Pun50.jpg", "Pun51.jpg", "Pun52.jpg", "Pun53.jpg"]; pun = pun[Math.floor(Math.random() * pun.length)]; - message.channel.sendFile("./images/" + pun); + message.channel.sendFile(`./images/${pun}`); } }; diff --git a/commands/response/quantumcoin.js b/commands/response/quantumcoin.js index 929dc1cd..4cb82f46 100644 --- a/commands/response/quantumcoin.js +++ b/commands/response/quantumcoin.js @@ -20,9 +20,9 @@ module.exports = class QuantumCoin extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let qcoin = ['on nothing', 'on NaN', 'on 0', 'in the air', 'on null']; qcoin = qcoin[Math.floor(Math.random() * qcoin.length)]; - message.channel.send("It landed " + qcoin); + message.channel.send(`It landed ${qcoin}`); } }; diff --git a/commands/response/ratewaifu.js b/commands/response/ratewaifu.js index 787b083a..2d311262 100644 --- a/commands/response/ratewaifu.js +++ b/commands/response/ratewaifu.js @@ -18,9 +18,9 @@ module.exports = class RateWaifuCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let waifuToRate = message.content.split(" ").slice(1).join(" "); - let percentage = Math.floor(Math.random() * 10) + 1; - message.channel.send("I'd give " + waifuToRate + " a " + percentage + "/10!"); + let rating = Math.floor(Math.random() * 10) + 1; + message.channel.send(`I'd give ${waifuToRate} a ${rating}/10!`); } }; diff --git a/commands/response/roast.js b/commands/response/roast.js index e90c223e..e90199b7 100644 --- a/commands/response/roast.js +++ b/commands/response/roast.js @@ -18,7 +18,7 @@ module.exports = class RoastMeCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let userToRoast = message.content.split(" ").slice(1).join(" "); let roasts = ["*puts you in the oven*", "You're so stupid.", "Sorry, I can't hear you over how annoying you are.", "I've got better things to do.", "You're as dumb as Cleverbot.", "Your IQ is lower than the Mariana Trench.", "You're so annoying even the flies stay away from your stench.", "Go away, please.", "I'd give you a nasty look but you've already got one.", "It looks like your face caught fire and someone tried to put it out with a hammer.", "Your family tree must be a cactus because everyone on it is a prick.", "Someday you will go far, and I hope you stay there.", "The zoo called. They're wondering how you got out of your cage.", "I was hoping for a battle of wits, but you appear to be unarmed.", "You are proof that evolution can go in reverse.", "Brains aren't everything, in your case, they're nothing.", "Sorry I didn't get that, I don't speak idiot.", "Why is it acceptable for you to be an idiot, but not for me to point it out?", "We all sprang from apes, but you did not spring far enough.", "You're an unknown command.", "If you could go anywhere I chose, I'd choose dead.", "Even monkeys can go to space, so clearly you lack some potential.", "It's brains over brawn, yet you have neither.", "You look like a monkey, and you smell like one too.", "Even among idiots you're lacking.", "You fail even when you're doing absolutely nothing.", "If there was a vote for 'least likely to succeed' you'd win first prize.", "I'm surrounded by idiots... Or, wait, that's just you.", "I wanna go home. Well, really I just want to get away from the awful aroma you've got going there.", "Every time you touch me I have to go home and wash all my clothes nine times just to get a normal smell back.", "If I had a nickel for every brain you don't have, I'd have one dollar.", "I'd help you succeed but you're incapable."]; roasts = roasts[Math.floor(Math.random() * roasts.length)]; @@ -26,7 +26,7 @@ module.exports = class RoastMeCommand extends commando.Command { message.reply(roasts); } else { - message.channel.send(userToRoast + ", " + roasts); + message.channel.send(`${userToRoast}, ${roasts}`); } } }; diff --git a/commands/response/rockpaperscissors.js b/commands/response/rockpaperscissors.js index 8c5f8be0..fcedb191 100644 --- a/commands/response/rockpaperscissors.js +++ b/commands/response/rockpaperscissors.js @@ -18,7 +18,7 @@ module.exports = class RockPaperScissors extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let [rps] = message.content.toLowerCase().split(" ").slice(1); let response = ['Paper', 'Rock', 'Scissors']; response = response[Math.floor(Math.random() * response.length)]; diff --git a/commands/response/roll.js b/commands/response/roll.js index d3433bbf..7a7b4144 100644 --- a/commands/response/roll.js +++ b/commands/response/roll.js @@ -19,15 +19,15 @@ module.exports = class RollChooseCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let [value] = message.content.split(" ").slice(1); if (!value) { let roll = Math.floor(Math.random() * 6) + 1; - message.channel.send("You rolled a " + roll); + message.channel.send(`You rolled a ${roll}`); } else if (value.match(/^[0-9]+$/)) { let roll = Math.floor(Math.random() * value) + 1; - message.channel.send("You rolled a " + roll); + message.channel.send(`You rolled a ${roll}`); } else { message.channel.send(":x: Error! Your message either contains a number but the number is invalid, or the number is in the wrong place.\n:notepad_spiral: (Note: When using numbers such as 1,000, do not use a comma)"); diff --git a/commands/response/roulette.js b/commands/response/roulette.js index 58ed226e..5f49672e 100644 --- a/commands/response/roulette.js +++ b/commands/response/roulette.js @@ -21,9 +21,9 @@ module.exports = class RouletteCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); if (message.channel.type !== 'dm') { - message.channel.send("I choose " + message.guild.members.random().displayName + "!"); + message.channel.send(`I choose ${message.guild.members.random().displayName}!`); } else { message.channel.send(':x: Error! This command does not work in DM!'); diff --git a/commands/response/ship.js b/commands/response/ship.js index 98b4e91d..cbdae7fa 100644 --- a/commands/response/ship.js +++ b/commands/response/ship.js @@ -18,9 +18,9 @@ module.exports = class ShipCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let thingToShip = message.content.split(" ").slice(1).join(" "); let percentage = Math.floor(Math.random() * 100) + 1; - message.channel.send("I'd give " + thingToShip + " a " + percentage + "%!"); + message.channel.send(`I'd give ${thingToShip} a ${percentage}%!`); } }; diff --git a/commands/response/slots.js b/commands/response/slots.js index 7c74b08b..6fdd1236 100644 --- a/commands/response/slots.js +++ b/commands/response/slots.js @@ -15,17 +15,17 @@ module.exports = class SlotsCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let slotThing = [':grapes:', ':tangerine:', ':pear:', ':cherries:']; let slotOne = slotThing[Math.floor(Math.random() * slotThing.length)]; let slotTwo = slotThing[Math.floor(Math.random() * slotThing.length)]; let slotThree = slotThing[Math.floor(Math.random() * slotThing.length)]; let slotFour = slotThing[Math.floor(Math.random() * slotThing.length)]; if (slotOne === slotTwo && slotOne === slotThree && slotOne === slotFour) { - message.channel.send(slotOne + '|' + slotTwo + '|' + slotThree + '|' + slotFour + "\nWow! You won! Great job... er... luck!"); + message.channel.send(`${slotOne}|${slotTwo}|${slotThree}|${slotFour}\nWow! You won! Great job... er... luck!`); } else { - message.channel.send(slotOne + '|' + slotTwo + '|' + slotThree + '|' + slotFour + "\nAww... You lost... Guess it's just bad luck, huh?"); + message.channel.send(`${slotOne}|${slotTwo}|${slotThree}|${slotFour}\nAww... You lost... Guess it's just bad luck, huh?`); } } }; diff --git a/commands/response/vocaloid.js b/commands/response/vocaloid.js index 6bf1ae37..f64eccb4 100644 --- a/commands/response/vocaloid.js +++ b/commands/response/vocaloid.js @@ -18,7 +18,7 @@ module.exports = class VocaloidSongRndm extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let songs = ["https://www.youtube.com/watch?v=ebAKoRcYFTA", "https://www.youtube.com/watch?v=Mqps4anhz0Q", "https://www.youtube.com/watch?v=AUEiHQOCQ2M", "https://www.youtube.com/watch?v=oyteTOBxRm8", "https://www.youtube.com/watch?v=uwwU55zBYlQ", "https://www.youtube.com/watch?v=sSYoz0JmnZo", "https://www.youtube.com/watch?v=NpU4dsXW6EI", "https://www.youtube.com/watch?v=MzyXD8bNbvk", "https://www.youtube.com/watch?v=hyV4qGAPKac", "https://www.youtube.com/watch?v=pywNi6gD1FA", "https://www.youtube.com/watch?v=17FEtaiWdVg", "https://www.youtube.com/watch?v=fmrA-gxJxgQ", "https://www.youtube.com/watch?v=yOBWgSPrYVA", "https://www.youtube.com/watch?v=nCaqf9WhqOY", "https://www.youtube.com/watch?v=cQKGUgOfD8U", "https://www.youtube.com/watch?v=sK92X82T3Sk", "https://www.youtube.com/watch?v=AH5_sKwDw1E", "https://www.youtube.com/watch?v=dw-KJNqcK-Q", "https://www.youtube.com/watch?v=X47JmmqbMvc", "https://www.youtube.com/watch?v=ojQPpYVQt7U", "https://www.amazon.com/Gogatsu-Yamai-feat-Kagamine-Len/dp/B00P1BG27S", "https://www.youtube.com/watch?v=N1-Z8uslIsI", "https://www.youtube.com/watch?v=EAgk-t2zzqw", "https://www.youtube.com/watch?v=uLBC2kWYFo8", "https://www.youtube.com/watch?v=OXHYIlkZLUU", "https://www.youtube.com/watch?v=ObIa9wXbyMQ", "https://www.youtube.com/watch?v=dGNoCICGmo0", "https://www.youtube.com/watch?v=LcoyEZkTKfY", "https://www.youtube.com/watch?v=mKHaW0qd5Mw", "https://www.youtube.com/watch?v=GG627DYk_E4", "https://www.youtube.com/watch?v=jTm6Q5Pj_Jo", "https://www.youtube.com/watch?v=TVeIDmk3rBo", "https://www.youtube.com/watch?v=1K3in6w9tt4", "https://www.youtube.com/watch?v=07r67gGbtLQ", "https://www.youtube.com/watch?v=243vPl8HdVk", "https://www.youtube.com/watch?v=zweVJrnE1uY", "https://www.youtube.com/watch?v=RKtoreimcQ8", "https://www.youtube.com/watch?v=Je6dCVfHvkU", "https://www.youtube.com/watch?v=UxFv12y_evM", "https://www.youtube.com/watch?v=2HegQtmJeto", "https://www.youtube.com/watch?v=8-Epnpruww0"]; songs = songs[Math.floor(Math.random() * songs.length)]; message.channel.send(songs); diff --git a/commands/response/xiaopai.js b/commands/response/xiaopai.js index 4f87bc6c..a903d7fd 100644 --- a/commands/response/xiaopai.js +++ b/commands/response/xiaopai.js @@ -18,9 +18,9 @@ module.exports = class RandomXiaoPai extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'ATTACH_FILES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let XiaoPai = ["1.png", "2.jpg", "3.jpg", "4.jpg", "5.jpg", "6.jpg", "7.jpg", "8.png", "9.png", "10.png", "11.png", "12.png", "13.jpg", "14.jpg", "15.png", "16.jpg", "17.png", "18.gif", "19.png", "20.jpg", "21.jpg"]; XiaoPai = XiaoPai[Math.floor(Math.random() * XiaoPai.length)]; - message.channel.sendFile("./images/Xiao" + XiaoPai); + message.channel.sendFile(`./images/Xiao${XiaoPai}`); } }; diff --git a/commands/roleplay/cuddle.js b/commands/roleplay/cuddle.js index bbe6450f..6313a514 100644 --- a/commands/roleplay/cuddle.js +++ b/commands/roleplay/cuddle.js @@ -15,8 +15,8 @@ module.exports = class CuddleCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let thingToRoleplay = message.content.split(" ").slice(1).join(" "); - message.channel.send(message.author + ' *cuddles* ' + thingToRoleplay); + message.channel.send(`${message.author} *cuddles* ${thingToRoleplay}`); } }; diff --git a/commands/roleplay/divorce.js b/commands/roleplay/divorce.js index c2f16d93..aaadf33b 100644 --- a/commands/roleplay/divorce.js +++ b/commands/roleplay/divorce.js @@ -15,8 +15,8 @@ module.exports = class DivorceCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let thingToRoleplay = message.content.split(" ").slice(1).join(" "); - message.channel.send(message.author + ' *divorces* ' + thingToRoleplay); + message.channel.send(`${message.author} *divorces* ${thingToRoleplay}`); } }; diff --git a/commands/roleplay/eat.js b/commands/roleplay/eat.js index 12589991..bf9d6565 100644 --- a/commands/roleplay/eat.js +++ b/commands/roleplay/eat.js @@ -15,8 +15,8 @@ module.exports = class EatCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let thingToRoleplay = message.content.split(" ").slice(1).join(" "); - message.channel.send(message.author + ' *eats* ' + thingToRoleplay); + message.channel.send(`${message.author} *eats* ${thingToRoleplay}`); } }; diff --git a/commands/roleplay/falconpunch.js b/commands/roleplay/falconpunch.js index 0d9c1638..bfac4b74 100644 --- a/commands/roleplay/falconpunch.js +++ b/commands/roleplay/falconpunch.js @@ -15,8 +15,8 @@ module.exports = class FalconPunchCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let thingToRoleplay = message.content.split(" ").slice(1).join(" "); - message.channel.send(message.author + ' *falcon punches* ' + thingToRoleplay); + message.channel.send(`${message.author} *falcon punches* ${thingToRoleplay}`); } }; diff --git a/commands/roleplay/fistbump.js b/commands/roleplay/fistbump.js index e0ce6522..39cee635 100644 --- a/commands/roleplay/fistbump.js +++ b/commands/roleplay/fistbump.js @@ -15,8 +15,8 @@ module.exports = class FistBumpCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let thingToRoleplay = message.content.split(" ").slice(1).join(" "); - message.channel.send(message.author + ' *fistbumps* ' + thingToRoleplay + ' *badalalala*'); + message.channel.send(`${message.author} *cuddles* ${thingToRoleplay} *badalalala*`); } }; diff --git a/commands/roleplay/highfive.js b/commands/roleplay/highfive.js index 84b56fbf..638198a3 100644 --- a/commands/roleplay/highfive.js +++ b/commands/roleplay/highfive.js @@ -15,8 +15,8 @@ module.exports = class HighFivesCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let thingToRoleplay = message.content.split(" ").slice(1).join(" "); - message.channel.send(message.author + ' *high fives* ' + thingToRoleplay); + message.channel.send(`${message.author} *high-fives* ${thingToRoleplay}`); } }; diff --git a/commands/roleplay/hitwithshovel.js b/commands/roleplay/hitwithshovel.js index fbf19e6e..80eebeb7 100644 --- a/commands/roleplay/hitwithshovel.js +++ b/commands/roleplay/hitwithshovel.js @@ -15,8 +15,8 @@ module.exports = class HitwithShovelCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let thingToRoleplay = message.content.split(" ").slice(1).join(" "); - message.channel.send(message.author + ' *hits* ' + thingToRoleplay + ' *with a shovel* '); + message.channel.send(`${message.author} *hits* ${thingToRoleplay} *with a shovel*`); } }; diff --git a/commands/roleplay/hug.js b/commands/roleplay/hug.js index b8887eda..7b01179a 100644 --- a/commands/roleplay/hug.js +++ b/commands/roleplay/hug.js @@ -15,8 +15,8 @@ module.exports = class HugCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let thingToRoleplay = message.content.split(" ").slice(1).join(" "); - message.channel.send(message.author + ' *hugs* ' + thingToRoleplay); + message.channel.send(`${message.author} *hugs* ${thingToRoleplay}`); } }; diff --git a/commands/roleplay/inhales.js b/commands/roleplay/inhales.js index e7d6768a..87b3791b 100644 --- a/commands/roleplay/inhales.js +++ b/commands/roleplay/inhales.js @@ -15,8 +15,8 @@ module.exports = class InhaleCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let thingToRoleplay = message.content.split(" ").slice(1).join(" "); - message.channel.send(message.author + ' *inhales* ' + thingToRoleplay + ' *but gained no ability...* '); + message.channel.send(`${message.author} *inhales* ${thingToRoleplay} but gained no ability...`); } }; diff --git a/commands/roleplay/kill.js b/commands/roleplay/kill.js index 2de69622..9d71bdaa 100644 --- a/commands/roleplay/kill.js +++ b/commands/roleplay/kill.js @@ -15,8 +15,8 @@ module.exports = class KillCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let thingToRoleplay = message.content.split(" ").slice(1).join(" "); - message.channel.send(message.author + ' *kills* ' + thingToRoleplay); + message.channel.send(`${message.author} *kills* ${thingToRoleplay}`); } }; diff --git a/commands/roleplay/kiss.js b/commands/roleplay/kiss.js index 702ec935..9f57c837 100644 --- a/commands/roleplay/kiss.js +++ b/commands/roleplay/kiss.js @@ -15,8 +15,8 @@ module.exports = class KissCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let thingToRoleplay = message.content.split(" ").slice(1).join(" "); - message.channel.send(message.author + ' *kisses* ' + thingToRoleplay); + message.channel.send(`${message.author} *kisses* ${thingToRoleplay}`); } }; diff --git a/commands/roleplay/marries.js b/commands/roleplay/marries.js index ef3ba7bb..f757a9a2 100644 --- a/commands/roleplay/marries.js +++ b/commands/roleplay/marries.js @@ -15,8 +15,8 @@ module.exports = class MarryCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let thingToRoleplay = message.content.split(" ").slice(1).join(" "); - message.channel.send(message.author + ' *marries* ' + thingToRoleplay); + message.channel.send(`${message.author} *marries* ${thingToRoleplay}`); } }; diff --git a/commands/roleplay/pat.js b/commands/roleplay/pat.js index aa42e806..c151a661 100644 --- a/commands/roleplay/pat.js +++ b/commands/roleplay/pat.js @@ -15,8 +15,8 @@ module.exports = class PatCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let thingToRoleplay = message.content.split(" ").slice(1).join(" "); - message.channel.send(message.author + ' *pats* ' + thingToRoleplay); + message.channel.send(`${message.author} *pats* ${thingToRoleplay}`); } }; diff --git a/commands/roleplay/poke.js b/commands/roleplay/poke.js index 1289f638..a94a9b8f 100644 --- a/commands/roleplay/poke.js +++ b/commands/roleplay/poke.js @@ -15,8 +15,8 @@ module.exports = class PokeCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let thingToRoleplay = message.content.split(" ").slice(1).join(" "); - message.channel.send(message.author + ' *pokes* ' + thingToRoleplay); + message.channel.send(`${message.author} *pokes* ${thingToRoleplay}`); } }; diff --git a/commands/roleplay/punch.js b/commands/roleplay/punch.js index 66e4ea52..70dda67e 100644 --- a/commands/roleplay/punch.js +++ b/commands/roleplay/punch.js @@ -15,8 +15,8 @@ module.exports = class PunchCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let thingToRoleplay = message.content.split(" ").slice(1).join(" "); - message.channel.send(message.author + ' *punches* ' + thingToRoleplay); + message.channel.send(`${message.author} *punches* ${thingToRoleplay}`); } }; diff --git a/commands/roleplay/slap.js b/commands/roleplay/slap.js index d8c5aa95..490fa332 100644 --- a/commands/roleplay/slap.js +++ b/commands/roleplay/slap.js @@ -15,8 +15,8 @@ module.exports = class SlapCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let thingToRoleplay = message.content.split(" ").slice(1).join(" "); - message.channel.send(message.author + ' *slaps* ' + thingToRoleplay); + message.channel.send(`${message.author} *slaps* ${thingToRoleplay}`); } }; diff --git a/commands/search/botinfo.js b/commands/search/botinfo.js index af3cb91d..bfae94b4 100644 --- a/commands/search/botinfo.js +++ b/commands/search/botinfo.js @@ -22,11 +22,11 @@ module.exports = class BotSearchCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); if (message.mentions.users.size === 1) { let botToFind = message.mentions.users.first().id; request - .get('https://bots.discord.pw/api/bots/' + botToFind) + .get(`https://bots.discord.pw/api/bots/${botToFind}`) .set({ 'Authorization': config.botskey }) @@ -42,7 +42,7 @@ module.exports = class BotSearchCommand extends commando.Command { .addField('**Prefix:**', response.body.prefix, true) .addField('**Invite:**', - '[Here](' + response.body.invite_url + ')', true); + `[Here](${response.body.invite_url})`, true); message.channel.sendEmbed(embed).catch(console.error); }).catch(function(err) { message.channel.send(":x: Error! Bot not Found!"); diff --git a/commands/search/define.js b/commands/search/define.js index 158cb11e..54aaa52b 100644 --- a/commands/search/define.js +++ b/commands/search/define.js @@ -24,10 +24,10 @@ module.exports = class DefineCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let defineThis = encodeURI(message.content.split(" ").slice(1).join(" ")); request - .get('http://api.wordnik.com:80/v4/word.json/' + defineThis + '/definitions') + .get(`http://api.wordnik.com:80/v4/word.json/${defineThis}/definitions`) .query({ limit: 1, includeRelated: false, diff --git a/commands/search/discrim.js b/commands/search/discrim.js index eff28e26..7eadc713 100644 --- a/commands/search/discrim.js +++ b/commands/search/discrim.js @@ -20,12 +20,12 @@ module.exports = class DiscrimCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let userToSearch = message.content.split(" ").slice(1).join(" "); if (userToSearch.match(/^[0-9]+$/) && userToSearch.split("").length === 4) { let users = this.client.users.filter(u => u.discriminator === userToSearch).map(u => u.username).sort(); const embed = new Discord.RichEmbed() - .setTitle(users.length + ' Users with the discriminator: ' + userToSearch) + .setTitle(`${users.length} Users with the discriminator: ${userToSearch}`) .setDescription(users.join(', ')); message.channel.sendEmbed(embed).catch(console.error); } diff --git a/commands/search/forecast.js b/commands/search/forecast.js index 5e9754b2..ba1f9285 100644 --- a/commands/search/forecast.js +++ b/commands/search/forecast.js @@ -20,7 +20,7 @@ module.exports = class ForecastCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let locationToSearch = message.content.split(" ").slice(1).join(" "); weather(locationToSearch, 'f').then(info => { const embed = new Discord.RichEmbed() @@ -28,20 +28,20 @@ module.exports = class ForecastCommand extends commando.Command { .setAuthor(info.title, 'http://media.idownloadblog.com/wp-content/uploads/2013/12/yahoo-weather-213x220.png') .setURL(info.link) .setTimestamp() - .addField('**' + info.item.forecast[0].day + " - " + info.item.forecast[0].date + ':**', - '**High:** ' + info.item.forecast[0].high + ', **Low:** ' + info.item.forecast[0].low + ', **Condition:** ' + info.item.forecast[0].text) - .addField('**' + info.item.forecast[1].day + " - " + info.item.forecast[1].date + ':**', - '**High:** ' + info.item.forecast[1].high + ', **Low:** ' + info.item.forecast[1].low + ', **Condition:** ' + info.item.forecast[1].text) - .addField('**' + info.item.forecast[2].day + " - " + info.item.forecast[2].date + ':**', - '**High:** ' + info.item.forecast[2].high + ', **Low:** ' + info.item.forecast[2].low + ', **Condition:** ' + info.item.forecast[2].text) - .addField('**' + info.item.forecast[3].day + " - " + info.item.forecast[3].date + ':**', - '**High:** ' + info.item.forecast[3].high + ', **Low:** ' + info.item.forecast[3].low + ', **Condition:** ' + info.item.forecast[3].text) - .addField('**' + info.item.forecast[4].day + " - " + info.item.forecast[4].date + ':**', - '**High:** ' + info.item.forecast[4].high + ', **Low:** ' + info.item.forecast[4].low + ', **Condition:** ' + info.item.forecast[4].text) - .addField('**' + info.item.forecast[5].day + " - " + info.item.forecast[5].date + ':**', - '**High:** ' + info.item.forecast[5].high + ', **Low:** ' + info.item.forecast[5].low + ', **Condition:** ' + info.item.forecast[5].text) - .addField('**' + info.item.forecast[6].day + " - " + info.item.forecast[6].date + ':**', - '**High:** ' + info.item.forecast[6].high + ', **Low:** ' + info.item.forecast[6].low + ', **Condition:** ' + info.item.forecast[6].text); + .addField(`**${info.item.forecast[0].day} - ${info.item.forecast[0].date}:**`, + `**High:** ${info.item.forecast[0].high}°F, **Low:** ${info.item.forecast[0].low}F, **Condition:** ${info.item.forecast[0].text}`) + .addField(`**${info.item.forecast[1].day} - ${info.item.forecast[1].date}:**`, + `**High:** ${info.item.forecast[1].high}°F, **Low:** ${info.item.forecast[1].low}F, **Condition:** ${info.item.forecast[1].text}`) + .addField(`**${info.item.forecast[2].day} - ${info.item.forecast[2].date}:**`, + `**High:** ${info.item.forecast[2].high}°F, **Low:** ${info.item.forecast[2].low}F, **Condition:** ${info.item.forecast[2].text}`) + .addField(`**${info.item.forecast[3].day} - ${info.item.forecast[3].date}:**`, + `**High:** ${info.item.forecast[3].high}°F, **Low:** ${info.item.forecast[3].low}F, **Condition:** ${info.item.forecast[3].text}`) + .addField(`**${info.item.forecast[4].day} - ${info.item.forecast[4].date}:**`, + `**High:** ${info.item.forecast[4].high}°F, **Low:** ${info.item.forecast[4].low}F, **Condition:** ${info.item.forecast[4].text}`) + .addField(`**${info.item.forecast[5].day} - ${info.item.forecast[5].date}:**`, + `**High:** ${info.item.forecast[5].high}°F, **Low:** ${info.item.forecast[5].low}F, **Condition:** ${info.item.forecast[5].text}`) + .addField(`**${info.item.forecast[6].day} - ${info.item.forecast[6].date}:**`, + `**High:** ${info.item.forecast[6].high}°F, **Low:** ${info.item.forecast[6].low}F, **Condition:** ${info.item.forecast[6].text}`); message.channel.sendEmbed(embed).catch(console.error); }).catch(err => { message.channel.send(":x: Error! Make sure you typed the location correctly!"); diff --git a/commands/search/google.js b/commands/search/google.js index a9b80bbd..c1b81668 100644 --- a/commands/search/google.js +++ b/commands/search/google.js @@ -21,7 +21,7 @@ module.exports = class DefineCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let thingToSearch = encodeURI(message.content.split(" ").slice(1).join(" ")); message.channel.send('Searching...').then(msg => { const SEARCH_URL = `https://www.google.com/search?q=${thingToSearch}`; diff --git a/commands/search/imdb.js b/commands/search/imdb.js index 09aa793e..ab84a2c3 100644 --- a/commands/search/imdb.js +++ b/commands/search/imdb.js @@ -22,7 +22,7 @@ module.exports = class IMDBCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let queryMovie = message.content.split(" ").slice(1).join(" "); let movie; imdb.getReq({ @@ -38,7 +38,7 @@ module.exports = class IMDBCommand extends commando.Command { .setAuthor('IMDB', 'http://static.wixstatic.com/media/c65cbf_31901b544fe24f1890134553bf40c8be.png') .setURL(movie.imdburl) .setTitle(movie.title + ' (' + movie.rating + ' Score)') - .setDescription(movie.plot.substr(0, 1500) + " [Read the Rest Here!](" + movie.imdburl + ")") + .setDescription(`${movie.plot.substr(0, 1500)} [Read the Rest Here!](${movie.imdburl})`) .addField('**Genres:**', movie.genres) .addField('**Year:**', diff --git a/commands/search/neopet.js b/commands/search/neopet.js index e5bc411a..790297c7 100644 --- a/commands/search/neopet.js +++ b/commands/search/neopet.js @@ -15,13 +15,13 @@ module.exports = class NeopetCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'ATTACH_FILES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let petID = encodeURI(message.content.split(" ").slice(1).join(" ")); if (petID === "getid") { message.channel.send("To get your pet's ID, simply go to http://www.sunnyneo.com/petimagefinder.php and enter your pet's name. It's image should show up. Then, find the link below the pet's image, and copy it to your message!").then(message.channel.sendFile('./images/PetID.png').then(message.channel.send("It's recommended you keep this ID with you so you can easily share your pet's picture without having to repeat these steps."))); } else { - message.channel.send("Result for: " + petID).then(message.channel.sendFile('http://pets.neopets.com/cp/' + petID + '/1/5.png').catch(error => message.channel.send(":x: Error! Pet ID Not Found! Use `;neopet getID` for help on getting your pet ID."))); + message.channel.send(`Result for: ${petID}`).then(message.channel.sendFile(`http://pets.neopets.com/cp/${petID}/1/5.png`).catch(error => message.channel.send(":x: Error! Pet ID Not Found! Use `;neopet getID` for help on getting your pet ID."))); } } }; diff --git a/commands/search/osu.js b/commands/search/osu.js index 148a428b..da955514 100644 --- a/commands/search/osu.js +++ b/commands/search/osu.js @@ -23,7 +23,7 @@ module.exports = class OsuCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let usernameToSearch = message.content.split(" ").slice(1).join(" "); request .get('https://osu.ppy.sh/api/get_user') diff --git a/commands/search/pokedex.js b/commands/search/pokedex.js index b017a3d2..1e2195b6 100644 --- a/commands/search/pokedex.js +++ b/commands/search/pokedex.js @@ -20,16 +20,16 @@ module.exports = class PokedexCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let pokemon = message.content.toLowerCase().split(" ").slice(1).join(" "); if (pokedex.name[pokemon]) { const embed = new Discord.RichEmbed() .setTitle('Information') - .setAuthor('#' + pokedex.index[pokemon] + " " + pokedex.name[pokemon], 'http://www.serebii.net/pokedex-sm/icon/' + pokedex.index[pokemon] + '.png') + .setAuthor(`#${pokedex.index[pokemon]} ${pokedex.name[pokemon]}`, `http://www.serebii.net/pokedex-sm/icon/${pokedex.index[pokemon]}.png`) .setColor(0xFF0000) .setDescription(pokedex.species[pokemon]) .setFooter("Pokédex", "http://cdn.bulbagarden.net/upload/thumb/3/36/479Rotom-Pokédex.png/250px-479Rotom-Pokédex.png") - .setThumbnail('http://www.serebii.net/sunmoon/pokemon/' + pokedex.index[pokemon] + '.png') + .setThumbnail(`http://www.serebii.net/sunmoon/pokemon/${pokedex.index[pokemon]}.png`) .addField('Entry', pokedex.entry[pokemon]) .addField('Type', diff --git a/commands/search/urban.js b/commands/search/urban.js index d725d45f..beb38885 100644 --- a/commands/search/urban.js +++ b/commands/search/urban.js @@ -22,7 +22,7 @@ module.exports = class UrbanDictionary extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let wordToDefine = message.content.split(" ").slice(1).join(" "); urban(wordToDefine).first(function(response) { if (!response) { @@ -37,7 +37,7 @@ module.exports = class UrbanDictionary extends commando.Command { .setAuthor('Urban Dictionary', 'http://a1.mzstatic.com/eu/r30/Purple71/v4/66/54/68/6654683f-cacd-4a55-1784-f14257f77874/icon175x175.png') .setURL(response.permalink) .setTitle(response.word) - .setDescription(response.definition.substr(0, 1900) + ' [Read the Rest Here!](' + response.permalink + ')') + .setDescription(`${response.definition.substr(0, 1900)} [Read the Rest Here!](${response.permalink})`) .addField('**Example:**', response.example.substr(0, 1900)); message.channel.sendEmbed(embed).catch(console.error); @@ -48,7 +48,7 @@ module.exports = class UrbanDictionary extends commando.Command { .setAuthor('Urban Dictionary', 'http://a1.mzstatic.com/eu/r30/Purple71/v4/66/54/68/6654683f-cacd-4a55-1784-f14257f77874/icon175x175.png') .setURL(response.permalink) .setTitle(response.word) - .setDescription(response.definition.substr(0, 1900) + ' [Read the Rest Here!](' + response.permalink + ')'); + .setDescription(`${response.definition.substr(0, 1900)} [Read the Rest Here!](${response.permalink})`); message.channel.sendEmbed(embed).catch(console.error); } }); diff --git a/commands/search/wattpad.js b/commands/search/wattpad.js index 28f25f12..b21bdd95 100644 --- a/commands/search/wattpad.js +++ b/commands/search/wattpad.js @@ -18,12 +18,12 @@ module.exports = class WattpadCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let queryBook = message.content.split(" ").slice(1).join(" "); request .get('https://api.wattpad.com:443/v4/stories') .set({ - 'Authorization': 'Basic ' + config.wattpadkey + 'Authorization': `Basic ${config.wattpadkey}` }) .query({ query: queryBook, @@ -35,7 +35,7 @@ module.exports = class WattpadCommand extends commando.Command { .setAuthor('Wattpad', 'http://www.selfpubtoolbox.com/wp-content/uploads/2015/05/a6044fd3a88acd5043860484db972ca6.png') .setURL(response.body.stories[0].url) .setTitle(response.body.stories[0].title) - .setDescription(response.body.stories[0].description.substr(0, 1500) + " [Read the Rest Here!](" + response.body.stories[0].url + ")") + .setDescription(`${response.body.stories[0].description.substr(0, 1500)} [Read the Rest Here!](${response.body.stories[0].url})`) .addField('**Author:**', response.body.stories[0].user, true) .addField('**Parts:**', diff --git a/commands/search/weather.js b/commands/search/weather.js index 999f2229..f156694f 100644 --- a/commands/search/weather.js +++ b/commands/search/weather.js @@ -17,7 +17,7 @@ module.exports = class WeatherCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let locationToSearch = message.content.split(" ").slice(1).join(" "); weather(locationToSearch, 'f').then(info => { const embed = new Discord.RichEmbed() @@ -34,7 +34,7 @@ module.exports = class WeatherCommand extends commando.Command { .addField('**Condition:**', info.item.condition.text, true) .addField('**Temperature:**', - info.item.condition.temp + "°F", true) + `${info.item.condition.temp}°F`, true) .addField('**Humidity:**', info.atmosphere.humidity, true) .addField('**Pressure:**', diff --git a/commands/search/wikipedia.js b/commands/search/wikipedia.js index df772906..b33ab818 100644 --- a/commands/search/wikipedia.js +++ b/commands/search/wikipedia.js @@ -17,14 +17,13 @@ module.exports = class WikipediaCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let thingToSearch = encodeURI(message.content.split(" ").slice(1).join(" ")); request - .get("https://en.wikipedia.org/w/api.php?action=query&prop=extracts&format=json&titles=" + thingToSearch + "&exintro=&explaintext=&redirects=&formatversion=2") + .get(`https://en.wikipedia.org/w/api.php?action=query&prop=extracts&format=json&titles=${thingToSearch}&exintro=&explaintext=&redirects=&formatversion=2`) .then(function(response) { let description = response.body.query.pages[0].extract; let name = response.body.query.pages[0].title; - thingToSearch = thingToSearch.split(")").join("%29"); if (!description) { message.channel.send(":x: Error! Entry Not Found!"); } @@ -34,9 +33,9 @@ module.exports = class WikipediaCommand extends commando.Command { const embed = new Discord.RichEmbed() .setColor(0xE7E7E7) .setTitle(name) - .setURL("https://en.wikipedia.org/wiki/" + thingToSearch) + .setURL(`https://en.wikipedia.org/wiki/${thingToSearch}`) .setAuthor("Wikipedia", "https://upload.wikimedia.org/wikipedia/en/thumb/8/80/Wikipedia-logo-v2.svg/1122px-Wikipedia-logo-v2.svg.png") - .setDescription(description + " [Read the Rest Here](https://en.wikipedia.org/wiki/" + thingToSearch + ")"); + .setDescription(`${description} [Read the Rest Here](https://en.wikipedia.org/wiki/${thingToSearch})`); message.channel.sendEmbed(embed).catch(console.error); } }).catch(function(err) { diff --git a/commands/search/youtube.js b/commands/search/youtube.js index 24256507..c0471101 100644 --- a/commands/search/youtube.js +++ b/commands/search/youtube.js @@ -21,7 +21,7 @@ module.exports = class YouTubeCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let videoToSearch = message.content.split(" ").slice(1).join("-"); request .get('https://www.googleapis.com/youtube/v3/search') @@ -41,13 +41,13 @@ module.exports = class YouTubeCommand extends commando.Command { .setColor(0xDD2825) .setTitle(response.body.items[0].snippet.title) .setDescription(response.body.items[0].snippet.description) - .setAuthor('YouTube - ' + response.body.items[0].snippet.channelTitle, 'https://cdn3.iconfinder.com/data/icons/social-icons-5/607/YouTube_Play.png') - .setURL('https://www.youtube.com/watch?v=' + response.body.items[0].id.videoId) + .setAuthor(`YouTube - ${response.body.items[0].snippet.channelTitle}`, 'https://cdn3.iconfinder.com/data/icons/social-icons-5/607/YouTube_Play.png') + .setURL(`https://www.youtube.com/watch?v=${response.body.items[0].id.videoId}`) .setThumbnail(response.body.items[0].snippet.thumbnails.default.url); message.channel.sendEmbed(embed).catch(console.error); } }).catch(function(err) { - message.channel.send(":x: Error! An error has occurred! Try again (if this continues to occur, the daily quota may have been reached)."); + message.channel.send(":x: Error! An error has occurred! Try again later! (If this continues to occur, the daily quota may have been reached)."); }); } }; diff --git a/commands/search/yugioh.js b/commands/search/yugioh.js index 931bcaa7..a1004009 100644 --- a/commands/search/yugioh.js +++ b/commands/search/yugioh.js @@ -17,10 +17,10 @@ module.exports = class YuGiOhCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let cardName = encodeURI(message.content.split(" ").slice(1).join(" ")); request - .get('http://yugiohprices.com/api/card_data/' + cardName) + .get(`http://yugiohprices.com/api/card_data/${cardName}`) .then(function(response) { if (response.body.data.card_type === 'monster') { const embed = new Discord.RichEmbed() diff --git a/commands/textedit/binary.js b/commands/textedit/binary.js index 6d858f45..ce326b7c 100644 --- a/commands/textedit/binary.js +++ b/commands/textedit/binary.js @@ -16,7 +16,7 @@ module.exports = class BinaryCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let turnToBinary = message.content.split(" ").slice(1).join(" "); message.channel.send(stringToBinary(turnToBinary)).catch(error => message.channel.send(':x: Error! Translation is too long, or nothing was entered!')); } diff --git a/commands/textedit/cowsay.js b/commands/textedit/cowsay.js index 390b592c..36a777fc 100644 --- a/commands/textedit/cowsay.js +++ b/commands/textedit/cowsay.js @@ -16,7 +16,7 @@ module.exports = class CowsayCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); if (!message.content.split(" ").slice(1).join(" ")) { message.channel.send(":x: Error! You entered nothing!"); } diff --git a/commands/textedit/embed.js b/commands/textedit/embed.js index 3a210f51..ee9d3892 100644 --- a/commands/textedit/embed.js +++ b/commands/textedit/embed.js @@ -16,7 +16,7 @@ module.exports = class EmbedCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let embedMessage = message.content.split(" ").slice(1).join(" "); if (!embedMessage) { message.channel.send(":x: Error! Nothing to embed!"); diff --git a/commands/textedit/morse.js b/commands/textedit/morse.js index 50ccc64b..ffaee71e 100644 --- a/commands/textedit/morse.js +++ b/commands/textedit/morse.js @@ -19,7 +19,7 @@ module.exports = class MorseCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let [methodToUse] = message.content.toLowerCase().split(" ").slice(1); let toMorse = message.content.split(" ").slice(2).join(" "); if (!toMorse) { diff --git a/commands/textedit/pirate.js b/commands/textedit/pirate.js index d08bd2c8..e48d97de 100644 --- a/commands/textedit/pirate.js +++ b/commands/textedit/pirate.js @@ -20,7 +20,7 @@ module.exports = class PirateCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let turnToPirate = message.content.split(" ").slice(1).join(" "); let pirate = pirateSpeak.translate(turnToPirate); if (!turnToPirate) { diff --git a/commands/textedit/reverse.js b/commands/textedit/reverse.js index 7abe55bb..5f58843f 100644 --- a/commands/textedit/reverse.js +++ b/commands/textedit/reverse.js @@ -15,7 +15,7 @@ module.exports = class ReverseCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let stringToReverse = message.content.split(" ").slice(1).join(" "); if (!stringToReverse) { message.channel.send(":x: Error! Nothing to reverse!"); diff --git a/commands/textedit/rin.js b/commands/textedit/rin.js index 963533bb..1a9e713d 100644 --- a/commands/textedit/rin.js +++ b/commands/textedit/rin.js @@ -23,7 +23,7 @@ module.exports = class RinSayCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let rinContent = message.content.split(" ").slice(1).join(" "); request .post(config.webhook) diff --git a/commands/textedit/romaji.js b/commands/textedit/romaji.js index 13de2fa7..641fe707 100644 --- a/commands/textedit/romaji.js +++ b/commands/textedit/romaji.js @@ -19,7 +19,7 @@ module.exports = class RomajiCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let romajify = message.content.split(" ").slice(1).join(" "); if (hepburn.containsKana(romajify)) { let romajified = hepburn.fromKana(romajify); diff --git a/commands/textedit/say.js b/commands/textedit/say.js index 9643da16..92c78257 100644 --- a/commands/textedit/say.js +++ b/commands/textedit/say.js @@ -21,7 +21,7 @@ module.exports = class SayCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let copycat = message.content.split(" ").slice(1).join(" "); if (!copycat) { message.channel.send(":x: Error! Nothing to say!"); diff --git a/commands/textedit/shuffle.js b/commands/textedit/shuffle.js index c25fa6da..09ab157a 100644 --- a/commands/textedit/shuffle.js +++ b/commands/textedit/shuffle.js @@ -27,7 +27,7 @@ module.exports = class ShuffleCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let thingToShuffle = message.content.split(" ").slice(1).join(" "); if (!thingToShuffle) { message.channel.send(":x: Error! Nothing to shuffle!"); diff --git a/commands/textedit/temmie.js b/commands/textedit/temmie.js index c6f8b62d..fb86ef2e 100644 --- a/commands/textedit/temmie.js +++ b/commands/textedit/temmie.js @@ -190,7 +190,7 @@ module.exports = class TemmieCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let thingToTranslate = message.content.split(" ").slice(1).join(" "); if (!thingToTranslate) { message.channel.send(':x: Error! Nothing to translate!'); diff --git a/commands/textedit/translate.js b/commands/textedit/translate.js index f3d9e93b..c2eafdf8 100644 --- a/commands/textedit/translate.js +++ b/commands/textedit/translate.js @@ -18,7 +18,7 @@ module.exports = class TranslateCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let [languageto] = message.content.toLowerCase().split(" ").slice(1); let thingToTranslate = message.content.split(" ").slice(2).join(" "); if (languageto === "list") { @@ -38,9 +38,9 @@ module.exports = class TranslateCommand extends commando.Command { let languagefrom = res.from.language.iso.toLowerCase(); const embed = new Discord.RichEmbed() .setColor(0x00AE86) - .addField('Input (From: ' + languages.entries[languagefrom] + '):', + .addField(`Input (From: ${languages.entries[languagefrom]}):`, thingToTranslate) - .addField('Translation (To: ' + languages.entries[languageto] + '):', + .addField(`Translation (To: ${languages.entries[languageto]}):`, res.text); message.channel.sendEmbed(embed).catch(console.error); }).catch(err => { diff --git a/commands/textedit/yoda.js b/commands/textedit/yoda.js index 04fb81bc..3a387ba6 100644 --- a/commands/textedit/yoda.js +++ b/commands/textedit/yoda.js @@ -17,7 +17,7 @@ module.exports = class YodaCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let turnToYoda = message.content.split(" ").slice(1).join(" "); if (!turnToYoda) { message.channel.send(':x: Error! Nothing to translate!'); diff --git a/commands/textedit/zalgo.js b/commands/textedit/zalgo.js index cd35fdf5..cd7b0c0c 100644 --- a/commands/textedit/zalgo.js +++ b/commands/textedit/zalgo.js @@ -16,7 +16,7 @@ module.exports = class ZalgoCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); let zalgoified = zalgo(message.content.split(" ").slice(1).join(" ")); if (!zalgoified) { message.channel.send(":x: Error! Nothing to zalgoify!"); diff --git a/commands/userinfo/avatar.js b/commands/userinfo/avatar.js index dfa6081a..0e7afb75 100644 --- a/commands/userinfo/avatar.js +++ b/commands/userinfo/avatar.js @@ -15,7 +15,7 @@ module.exports = class AvatarCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); if (message.mentions.users.size !== 1) { message.channel.send(':x: Error! Please mention one user!'); } diff --git a/commands/userinfo/userinfo.js b/commands/userinfo/userinfo.js index 5ee88f34..e4934af3 100644 --- a/commands/userinfo/userinfo.js +++ b/commands/userinfo/userinfo.js @@ -21,7 +21,7 @@ module.exports = class UserInfoCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS'])) return; } - console.log("[Command] " + message.content); + console.log(`[Command] ${message.content}`); if (message.channel.type !== 'dm') { let stat; switch (message.mentions.users.first().presence.status) { @@ -62,7 +62,7 @@ module.exports = class UserInfoCommand extends commando.Command { .setColor(color) .setThumbnail(message.mentions.users.first().avatarURL) .addField('**Name:**', - message.mentions.users.first().username + '#' + message.mentions.users.first().discriminator, true) + `${message.mentions.users.first().username}#${message.mentions.users.first().discriminator}`, true) .addField('**ID:**', message.mentions.users.first().id, true) .addField('**Joined Discord On:**', @@ -80,7 +80,7 @@ module.exports = class UserInfoCommand extends commando.Command { .setColor(color) .setThumbnail(message.mentions.users.first().avatarURL) .addField('**Name:**', - message.mentions.users.first().username + '#' + message.mentions.users.first().discriminator, true) + `${message.mentions.users.first().username}#${message.mentions.users.first().discriminator}`, true) .addField('**ID:**', message.mentions.users.first().id, true) .addField('**Joined Discord On:**', diff --git a/commands/util/servers.js b/commands/util/servers.js index 2112f703..e769fe8e 100644 --- a/commands/util/servers.js +++ b/commands/util/servers.js @@ -21,8 +21,8 @@ module.exports = class ServersCommand extends commando.Command { if (message.channel.type !== 'dm') { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } - console.log("[Command] " + message.content); - console.log(this.client.guilds.array().length + " Servers: " + this.client.guilds.map(g => g.name + " (" + g.id + ")").join(", ")); + console.log(`[Command] ${message.content}`); + console.log(`${this.client.guilds.array().length} Servers: ${this.client.guilds.map(g => g.name + "(" + g.id + ")").join(", ")}`); message.channel.send("Sent the information to the console!"); } }; diff --git a/html/carbondesc.html b/html/carbondesc.html index 387c666c..af757890 100644 --- a/html/carbondesc.html +++ b/html/carbondesc.html @@ -35,6 +35,7 @@
  • moment-duration-format
  • opusscript
  • morse
    • +
  • cheerio

    • APIs

    APIs