diff --git a/commands/8ball.js b/commands/8ball.js index 13893ec..c514b2e 100644 --- a/commands/8ball.js +++ b/commands/8ball.js @@ -32,7 +32,7 @@ module.exports = { } else { await message.channel.send({embed: { "title": ":8ball: Anitrox 8 Ball", - "description": "Your question: **" + question + "**", + "description": `Your question: **${question}**`, "color": 9442302, "footer": { "icon_url": message.author.displayAvatarURL(), diff --git a/commands/avatar.js b/commands/avatar.js index a4a02ff..5db6668 100644 --- a/commands/avatar.js +++ b/commands/avatar.js @@ -7,7 +7,7 @@ module.exports = { const user = message.mentions.users.first() || client.users.cache.get(args[0]) || message.author; await message.channel.send({embed: { - "title": ":frame_photo: " + user.username + "'s Beautiful Avatar!", + "title": `:frame_photo: ${user.username}'s Beautiful Avatar!`, "color": 9442302, "footer": { "icon_url": message.author.displayAvatarURL(), diff --git a/commands/bonk.js b/commands/bonk.js index fa6ee22..ab0a7c4 100644 --- a/commands/bonk.js +++ b/commands/bonk.js @@ -10,7 +10,7 @@ module.exports = { } else { await message.channel.send({embed: { "title": " Bonk", - "description": "<@" + taggedUser + ">" + " You have been bonked by <@" + message.author + ">!", + "description": `${taggedUser} You have been bonked by ${message.author}!`, "color": 9442302, "footer": { "icon_url": message.author.displayAvatarURL(), diff --git a/commands/cheese.js b/commands/cheese.js index 533eb41..ff3da46 100644 --- a/commands/cheese.js +++ b/commands/cheese.js @@ -8,7 +8,7 @@ module.exports = { } else { await message.channel.send({embed: { "title": ":cheese: Cheesed", - "description": "<@" + taggedUser + ">" + " You got cheesed by " + "<@" + message.author + ">!", + "description": `${taggedUser} You have been cheesed by ${message.author}!`, "color": 16312092, "footer": { "icon_url": message.author.displayAvatarURL(), diff --git a/commands/cuddle.js b/commands/cuddle.js index d7d017a..35f0183 100644 --- a/commands/cuddle.js +++ b/commands/cuddle.js @@ -20,7 +20,7 @@ module.exports = { } else { await message.channel.send({embed: { "title": ":heart: Cuddle", - "description": "<@" + taggedUser + ">" + " You have been cuddled by " + "<@" + message.author + ">!", + "description": `${taggedUser} You have been cuddled by ${message.author}!`, "color": 9442302, "footer": { "icon_url": message.author.displayAvatarURL(), diff --git a/commands/help.js b/commands/help.js index 6939ba5..1a622fa 100644 --- a/commands/help.js +++ b/commands/help.js @@ -11,7 +11,7 @@ module.exports = { "color": 9442302, "footer": { "icon_url": message.author.displayAvatarURL(), - "text": footerTxt + " | No mother it's just the northern lights" + "text": `${footerTxt} | No mother it's just the northern lights` }, "fields": [ { diff --git a/commands/hug.js b/commands/hug.js index 3e1730f..1d95374 100644 --- a/commands/hug.js +++ b/commands/hug.js @@ -19,7 +19,7 @@ module.exports = { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; await message.channel.send({embed: { "title": " Hug", - "description": "<@" + taggedUser + ">" + " You have been hugged by " + "<@" + message.author + ">!", + "description": `${taggedUser} You have been hugged by ${message.author}!`, "color": 8311585, "footer": { "icon_url": message.author.displayAvatarURL(), diff --git a/commands/info.js b/commands/info.js index 0ef4fd2..a58b9d5 100644 --- a/commands/info.js +++ b/commands/info.js @@ -58,7 +58,7 @@ module.exports = { }, { "name": "<:memory:793536677737136178> Bot Memory Usage", - "value": (Math.round(process.memoryUsage().heapUsed / 1024 / 1024 * 100) / 100) + " MiB", + "value": `${(process.memoryUsage().heapUsed / 1024 / 1024).toFixed(2)} MiB`, "inline": true }, { @@ -68,7 +68,7 @@ module.exports = { }, { "name": "Bot ID", - "value": "``" + client.user.id + "``", + "value": `\`${client.user.id}\``, "inline": true }, { @@ -81,12 +81,12 @@ module.exports = { }, { "name": "<:cpu:793672442056802354> CPU Type", - "value": process.arch + ", " + cpu.model() + "value": `${process.arch}, ${cpu.model()}` }, { "name": "<:hostos:793866961675223090> OS Type", - "value": process.platform + " / " + os.version() + "value": `${process.platform} / ${os.version()}` }, { "name": "<:node:793537507018145813> Node.JS Version", @@ -94,7 +94,7 @@ module.exports = { }, { "name": "<:hostinfo:793529505263517747> Bot Ping", - "value": Math.round(client.ws.ping) + " ms", + "value": `${Math.round(client.ws.ping)} ms`, "inline": true }, { diff --git a/commands/kiss.js b/commands/kiss.js index f8cd102..10e76ec 100644 --- a/commands/kiss.js +++ b/commands/kiss.js @@ -19,7 +19,7 @@ module.exports = { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; await message.channel.send({embed: { "title": ":heart: Kiss", - "description": "<@" + taggedUser + ">" + ", You have been kissed by <@" + message.author + ">!", + "description": `${taggedUser} You have been kissed by ${message.author}!`, "color": 9442302, "footer": { "icon_url": message.author.displayAvatarURL(), diff --git a/commands/leskiss.js b/commands/leskiss.js index 45192f7..703ef79 100644 --- a/commands/leskiss.js +++ b/commands/leskiss.js @@ -29,7 +29,7 @@ module.exports = { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; await message.channel.send({embed: { "title": ":heart: <:lesbian:803831629428686849> Kiss", - "description": "<@" + taggedUser + ">" + " You have been kissed by <@" + message.author + ">! <:lesbian:803831629428686849>", + "description": `${taggedUser} You have been kissed by ${message.author}!`, "color": 8311585, "footer": { "icon_url": message.author.displayAvatarURL(), diff --git a/commands/lick.js b/commands/lick.js index b7a4748..3764f95 100644 --- a/commands/lick.js +++ b/commands/lick.js @@ -18,7 +18,7 @@ module.exports = { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; await message.channel.send({embed: { "title": " Lick", - "description": "<@" + taggedUser + "> You have been licked by <@" + message.author + ">!", + "description": `${taggedUser} You have been licked by ${message.author}!`, "color": 8311585, "footer": { "icon_url": message.author.displayAvatarURL(), diff --git a/commands/nom.js b/commands/nom.js index ebb5ce4..73684b7 100644 --- a/commands/nom.js +++ b/commands/nom.js @@ -18,7 +18,7 @@ module.exports = { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; await message.channel.send({embed: { "title": "<:BlobNomBlob:801241117919805510> Nom", - "description": "<@" + taggedUser + "> You have been nommed by <@" + message.author + ">!", + "description": `${taggedUser} You have been nommed by ${message.author}!`, "color": 8311585, "footer": { "icon_url": message.author.displayAvatarURL(), diff --git a/commands/pat.js b/commands/pat.js index af031b5..b943223 100644 --- a/commands/pat.js +++ b/commands/pat.js @@ -17,7 +17,7 @@ module.exports = { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; await message.channel.send({embed: { "title": "<:pats:801238281286713355> Pat", - "description": "<@" + taggedUser + "> You have been patted by <@" + message.author + ">!", + "description": `${taggedUser} You have been patted by ${message.author}!`, "color": 8311585, "footer": { "icon_url": message.author.displayAvatarURL(), diff --git a/commands/ping.js b/commands/ping.js index ef253d2..32c097a 100644 --- a/commands/ping.js +++ b/commands/ping.js @@ -9,7 +9,7 @@ module.exports = { await message.channel.send({embed:{ "title": ":ping_pong: Ping", - "description": "**Pong!** We pinged **" + pingLocation + "** and got " + client.ws.ping + " ms.", + "description": `**Pong!** We pinged **${pingLocation}** and got ${client.ws.ping} ms.`, "color": 9442302, "footer": { "icon_url": message.author.displayAvatarURL(), diff --git a/commands/poke.js b/commands/poke.js index 9334db8..2e77288 100644 --- a/commands/poke.js +++ b/commands/poke.js @@ -17,7 +17,7 @@ module.exports = { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; await message.channel.send({embed: { "title": "👉 Poke!", - "description": "<@" + taggedUser + "> You have been poked by <@" + message.author + ">!", + "description": `${taggedUser} You have been poked by ${message.author}!`, "color": 8311585, "footer": { "icon_url": message.author.displayAvatarURL(), diff --git a/commands/slap.js b/commands/slap.js index 0f1564b..4fc6e9c 100644 --- a/commands/slap.js +++ b/commands/slap.js @@ -10,7 +10,7 @@ module.exports = { } else { await message.channel.send({embed: { "title": ":anger: Slap", - "description": "<@" + taggedUser + "> You have been slapped by <@" + message.author + ">!", + "description": `${taggedUser} You have been slapped by ${message.author}!`, "color": 9442302, "footer": { "icon_url": message.author.displayAvatarURL(), diff --git a/commands/snuggle.js b/commands/snuggle.js index b90a0cb..6d6285b 100644 --- a/commands/snuggle.js +++ b/commands/snuggle.js @@ -18,7 +18,7 @@ module.exports = { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; await message.channel.send({embed: { "title": "<:BlobSnuggleCat:806759753450782731> Snuggle", - "description": "<@" + taggedUser + ">" + " You have been snuggled by " + "<@" + message.author + ">!", + "description": `${taggedUser} You have been snuggled by ${message.author}!`, "color": 9442302, "footer": { "icon_url": message.author.displayAvatarURL(), diff --git a/commands/uinfo.js b/commands/uinfo.js index 138c8a7..527e3fd 100644 --- a/commands/uinfo.js +++ b/commands/uinfo.js @@ -5,7 +5,7 @@ module.exports = { async execute(client, message, args, footerTxt) { const user = message.mentions.users.first() || client.users.cache.get(args[0]) || message.author await message.channel.send({embed: { - "title": "Everything you've ever wanted to know about " + user.username + "!", + "title": `Everything you've ever wanted to know about ${user.username}!`, "color": 9442302, "footer": { "icon_url": message.author.displayAvatarURL(), @@ -41,7 +41,7 @@ module.exports = { }, { "name": "User ID", - "value": "``" + user.id + "``" + "value": `\`${user.id}\`` }, { "name": "User Joined Discord", diff --git a/start.js b/start.js index e823731..117f0c0 100755 --- a/start.js +++ b/start.js @@ -30,16 +30,16 @@ client.generateErrorMessage = (errorMsg, messageAuthorURL) => ({embed: { ] }}) -client.on("error", (e) => console.log("[ERROR]" + error(e))); -client.on("warn", (e) => ("[WARN]" + warn(e))); +client.on("error", (e) => console.log(`[ERROR] ${error(e)}`)); +client.on("warn", (e) => (`[WARN] ${warn(e)}`)); client.once('ready', () => { console.clear() console.log(' ___ _ __ '); console.log(' / | ____ (_) /__________ _ __'); - console.log(' / /| | / __ \/ / __/ ___/ __ \| |/_/'); + console.log(' / /| | / __ \\/ / __/ ___/ __ \\| |/_/'); console.log(' / ___ |/ / / / / /_/ / / /_/ /> < '); - console.log('/_/ |_/_/ /_/_/\__/_/ \____/_/|_| ') - console.log(release + ", " + build) + console.log('/_/ |_/_/ /_/_/\\__/_/ \\____/_/|_| '); + console.log(`${release}, ${build}`); console.log("All Systems Go. | Anitrox by IDeletedSystem64 | ALL MY CODE KEEPS BLOWING UP!"); });