From 01515377b4d463ff107746200f4c3bc08dd2a0d4 Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Thu, 21 Apr 2022 09:25:14 -0500 Subject: [PATCH 1/7] Fix displayAvatarURL --- commands/8ball.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/8ball.js b/commands/8ball.js index 2748458..f645e01 100644 --- a/commands/8ball.js +++ b/commands/8ball.js @@ -10,7 +10,7 @@ module.exports = { const question = args.slice(0).join(" ") if (!question) { - await message.channel.send(client.generateErrorMessage("You need to ask a question!", message.author.displayAvatarURL)); + await message.channel.send(client.generateErrorMessage("You need to ask a question!", message.author.displayAvatarURL())); } else { await message.channel.send({embed: { "title": ":8ball: 8Ball", From 2bd2c95e399b3606b851702c58d00dc437f5ea1e Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Thu, 21 Apr 2022 10:04:03 -0500 Subject: [PATCH 2/7] Remove displayAvatarURL, This has been moved to the error generator. --- commands/8ball.js | 2 +- commands/bonk.js | 2 +- commands/cuddle.js | 2 +- commands/hug.js | 2 +- commands/kiss.js | 2 +- commands/leskiss.js | 2 +- commands/lick.js | 2 +- commands/nom.js | 2 +- commands/pat.js | 2 +- commands/poke.js | 2 +- commands/setnick.js | 2 +- commands/slap.js | 2 +- commands/snuggle.js | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/commands/8ball.js b/commands/8ball.js index f645e01..0a43ce1 100644 --- a/commands/8ball.js +++ b/commands/8ball.js @@ -10,7 +10,7 @@ module.exports = { const question = args.slice(0).join(" ") if (!question) { - await message.channel.send(client.generateErrorMessage("You need to ask a question!", message.author.displayAvatarURL())); + await message.channel.send(client.generateErrorMessage("You need to ask a question!")); } else { await message.channel.send({embed: { "title": ":8ball: 8Ball", diff --git a/commands/bonk.js b/commands/bonk.js index 87dc359..764fc42 100644 --- a/commands/bonk.js +++ b/commands/bonk.js @@ -7,7 +7,7 @@ module.exports = { const taggedUser = message.mentions.users.first(); if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!", message.author.displayAvatarURL())); + await message.channel.send(client.generateErrorMessage("You need to @mention a user!")); } else { await message.channel.send({embed: { "title": " Bonk", diff --git a/commands/cuddle.js b/commands/cuddle.js index 5825a73..165b3af 100644 --- a/commands/cuddle.js +++ b/commands/cuddle.js @@ -16,7 +16,7 @@ module.exports = { const gif = (gifchoices[index]); if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!", message.author.displayAvatarURL())); + await message.channel.send(client.generateErrorMessage("You need to @mention a user!")); } else { await message.channel.send({embed: { "title": ":heart: Cuddle", diff --git a/commands/hug.js b/commands/hug.js index c294752..c2eb6c3 100644 --- a/commands/hug.js +++ b/commands/hug.js @@ -15,7 +15,7 @@ module.exports = { const taggedUser = message.mentions.users.first(); if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!", message.author.displayAvatarURL())); + await message.channel.send(client.generateErrorMessage("You need to @mention a user!")); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; await message.channel.send({embed: { diff --git a/commands/kiss.js b/commands/kiss.js index 921deb8..da73e95 100644 --- a/commands/kiss.js +++ b/commands/kiss.js @@ -15,7 +15,7 @@ module.exports = { const taggedUser = message.mentions.users.first(); if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!", message.author.displayAvatarURL())); + await message.channel.send(client.generateErrorMessage("You need to @mention a user!")); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; await message.channel.send({embed: { diff --git a/commands/leskiss.js b/commands/leskiss.js index 85b3d79..e5003b7 100644 --- a/commands/leskiss.js +++ b/commands/leskiss.js @@ -25,7 +25,7 @@ module.exports = { const taggedUser = message.mentions.users.first(); if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!", message.author.displayAvatarURL())); + await message.channel.send(client.generateErrorMessage("You need to @mention a user!")); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; await message.channel.send({embed: { diff --git a/commands/lick.js b/commands/lick.js index 92e3ec8..cb22eb0 100644 --- a/commands/lick.js +++ b/commands/lick.js @@ -14,7 +14,7 @@ module.exports = { const taggedUser = message.mentions.users.first(); if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!", message.author.displayAvatarURL())); + await message.channel.send(client.generateErrorMessage("You need to @mention a user!")); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; await message.channel.send({embed: { diff --git a/commands/nom.js b/commands/nom.js index 314dce4..049a1cf 100644 --- a/commands/nom.js +++ b/commands/nom.js @@ -14,7 +14,7 @@ module.exports = { const taggedUser = message.mentions.users.first(); if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!", message.author.displayAvatarURL())); + await message.channel.send(client.generateErrorMessage("You need to @mention a user!")); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; await message.channel.send({embed: { diff --git a/commands/pat.js b/commands/pat.js index 27a7db1..6c7a072 100644 --- a/commands/pat.js +++ b/commands/pat.js @@ -13,7 +13,7 @@ module.exports = { const taggedUser = message.mentions.users.first(); if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!", message.author.displayAvatarURL())); + await message.channel.send(client.generateErrorMessage("You need to @mention a user!")); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; await message.channel.send({embed: { diff --git a/commands/poke.js b/commands/poke.js index 346ab47..92cf989 100644 --- a/commands/poke.js +++ b/commands/poke.js @@ -13,7 +13,7 @@ module.exports = { const taggedUser = message.mentions.users.first(); if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!", message.author.displayAvatarURL())); + await message.channel.send(client.generateErrorMessage("You need to @mention a user!")); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; await message.channel.send({embed: { diff --git a/commands/setnick.js b/commands/setnick.js index a097ed1..a402423 100644 --- a/commands/setnick.js +++ b/commands/setnick.js @@ -18,7 +18,7 @@ module.exports = { "fields": [ { "name": "Changed nickname successfully!", - "value": "You need to have permission ``CHANGE_NICKNAME`` to change your nick!" + "value": `New Nickname: ${newnick}` }, { "name": "New Nickname", diff --git a/commands/slap.js b/commands/slap.js index f390d06..6ace9f1 100644 --- a/commands/slap.js +++ b/commands/slap.js @@ -7,7 +7,7 @@ module.exports = { const taggedUser = message.mentions.users.first(); if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!", message.author.displayAvatarURL())); + await message.channel.send(client.generateErrorMessage("You need to @mention a user!")); } else { await message.channel.send({embed: { "title": ":anger: Slap", diff --git a/commands/snuggle.js b/commands/snuggle.js index e94afb9..8a42b8a 100644 --- a/commands/snuggle.js +++ b/commands/snuggle.js @@ -14,7 +14,7 @@ module.exports = { const taggedUser = message.mentions.users.first(); if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!", message.author.displayAvatarURL())); + await message.channel.send(client.generateErrorMessage("You need to @mention a user!")); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; await message.channel.send({embed: { From 9388496662509c1f64a18741d1d9cd7f0119e875 Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Thu, 21 Apr 2022 10:04:43 -0500 Subject: [PATCH 3/7] Remove displayAvatarURL, This has been moved to the error generator. --- commands/contributors.js | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 commands/contributors.js diff --git a/commands/contributors.js b/commands/contributors.js new file mode 100644 index 0000000..3b9dc16 --- /dev/null +++ b/commands/contributors.js @@ -0,0 +1,34 @@ +module.exports = { + + name: require('path').parse(__filename).name, + description: 'Attributions to open source components used by Anitrox', + + async execute(_0, message, _1, config){ + await message.channel.send({embed: { + "title": "Component Attribution", + "description": "Some parts of Anitrox are using open source code, and their attributions are avaliable here!", + "color": 52508, + "footer": { + "icon_url": message.author.displayAvatarURL(), + "text": config.footerTxt + }, + "thumbnail": { + "url": "https://cdn.discordapp.com/attachments/803658122299572255/838854256471703602/793885335498522685.png" + }, + "fields": [ + { + "name": "Discord.JS", + "value": "[Check out the Discord.JS project on GitHub](https://github.com/discordjs/discord.js/)" + }, + { + "name": "The Anitrox Project", + "value": "[Check out Anitrox on GitHub](https://github.com/IDeletedSystem64/anitrox)" + }, + { + "name": "You", + "value": "Using and supporting the Anitrox Project, thank you! ❤" + } + ] + }}); + } +} \ No newline at end of file From 9276975a459755fb4c85e5b38dd05347d77df428 Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Thu, 21 Apr 2022 10:05:07 -0500 Subject: [PATCH 4/7] Have error generator get user avatar instead of setting it in the command. --- start.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start.js b/start.js index 483f924..effc033 100755 --- a/start.js +++ b/start.js @@ -18,7 +18,7 @@ client.generateErrorMessage = (errorMsg, messageAuthorURL) => ({embed: { "title": "<:AnitroxError:809651936563429416> Error", "color": 13632027, "footer": { - "icon_url": messageAuthorURL, + "icon_url": message.author.displayAvatarURL(), "text": config.footerTxt }, "fields": [ From f07fad7951e58358801e7a4843e901ba05127d1b Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Thu, 21 Apr 2022 10:52:16 -0500 Subject: [PATCH 5/7] Credit our awesome contributors! --- commands/contributors.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/commands/contributors.js b/commands/contributors.js index 3b9dc16..44d6deb 100644 --- a/commands/contributors.js +++ b/commands/contributors.js @@ -5,28 +5,28 @@ module.exports = { async execute(_0, message, _1, config){ await message.channel.send({embed: { - "title": "Component Attribution", - "description": "Some parts of Anitrox are using open source code, and their attributions are avaliable here!", + "title": "Contributors", + "description": "Links to check out our contributors!", "color": 52508, "footer": { "icon_url": message.author.displayAvatarURL(), "text": config.footerTxt }, "thumbnail": { - "url": "https://cdn.discordapp.com/attachments/803658122299572255/838854256471703602/793885335498522685.png" + "url": "https://cdn.discordapp.com/emojis/809651812323164192.webp?size=128&quality=lossless" }, "fields": [ { - "name": "Discord.JS", - "value": "[Check out the Discord.JS project on GitHub](https://github.com/discordjs/discord.js/)" + "name": "chuu_shi", + "value": "Thanks to Chuu for letting me use some of his resources to host Anitrox!\n <:GitHub:778165439477841981> [Check out his code!](https://github.com/chuushi)" }, { - "name": "The Anitrox Project", - "value": "[Check out Anitrox on GitHub](https://github.com/IDeletedSystem64/anitrox)" + "name": "OfficialTCGMatt", + "value": "Matt has helped quite a bit with Anitrox, especially in the early days of Anitrox's development! He even has his own bot!\n <:GitHub:778165439477841981> [Check out his code!](https://github.com/OfficialTCGMatt)\n :robot: [Check out TheCodingBot!](https://github.com/TMC-Software/TheCodingBot)" }, { - "name": "You", - "value": "Using and supporting the Anitrox Project, thank you! ❤" + "name": "Foxinatel", + "value": "Foxi has made massive improvements to Anitrox, such as improving error handling, and much more!\n<:GitHub:778165439477841981> [Check out his code!](https://github.com/foxinatel)" } ] }}); From b8bdeb5278192ad8a414f80f61f93a435566cf22 Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Thu, 21 Apr 2022 10:52:44 -0500 Subject: [PATCH 6/7] I forgot to remove the displayAvatarURL, lol --- commands/choose.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/choose.js b/commands/choose.js index 99e3aaf..bcba262 100644 --- a/commands/choose.js +++ b/commands/choose.js @@ -9,7 +9,7 @@ module.exports = { if (head) options.push(head); if (!options.length) { - await message.channel.send(client.generateErrorMessage("You need to provide some input!", message.author.displayAvatarURL())); + await message.channel.send(client.generateErrorMessage("You need to provide some input!")); } else { const answer = options[Math.floor(Math.random() * options.length)]; await message.channel.send({embed: { From 9182daacb8001cff8989fe7f2fea33f4500ca3f7 Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Thu, 21 Apr 2022 10:53:07 -0500 Subject: [PATCH 7/7] Remove opensource.js --- commands/opensource.js | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 commands/opensource.js diff --git a/commands/opensource.js b/commands/opensource.js deleted file mode 100644 index 3b9dc16..0000000 --- a/commands/opensource.js +++ /dev/null @@ -1,34 +0,0 @@ -module.exports = { - - name: require('path').parse(__filename).name, - description: 'Attributions to open source components used by Anitrox', - - async execute(_0, message, _1, config){ - await message.channel.send({embed: { - "title": "Component Attribution", - "description": "Some parts of Anitrox are using open source code, and their attributions are avaliable here!", - "color": 52508, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": config.footerTxt - }, - "thumbnail": { - "url": "https://cdn.discordapp.com/attachments/803658122299572255/838854256471703602/793885335498522685.png" - }, - "fields": [ - { - "name": "Discord.JS", - "value": "[Check out the Discord.JS project on GitHub](https://github.com/discordjs/discord.js/)" - }, - { - "name": "The Anitrox Project", - "value": "[Check out Anitrox on GitHub](https://github.com/IDeletedSystem64/anitrox)" - }, - { - "name": "You", - "value": "Using and supporting the Anitrox Project, thank you! ❤" - } - ] - }}); - } -} \ No newline at end of file