From 2189417343b0c79d82cacf2652d90cbabd7fa0e2 Mon Sep 17 00:00:00 2001 From: Nathaniel Mason Date: Thu, 21 Apr 2022 17:29:04 +0100 Subject: [PATCH 01/15] Quick and dirty update to discord.js v13 --- commands/8ball.js | 4 ++-- commands/avatar.js | 4 ++-- commands/bonk.js | 4 ++-- commands/cheese.js | 4 ++-- commands/choose.js | 4 ++-- commands/cuddle.js | 4 ++-- commands/eval.js | 4 ++-- commands/help.js | 4 ++-- commands/hug.js | 4 ++-- commands/info.js | 4 ++-- commands/invite.js | 4 ++-- commands/kiss.js | 4 ++-- commands/leskiss.js | 4 ++-- commands/lick.js | 4 ++-- commands/nom.js | 4 ++-- commands/opensource.js | 4 ++-- commands/pat.js | 4 ++-- commands/ping.js | 4 ++-- commands/poke.js | 4 ++-- commands/reload.js | 4 ++-- commands/setnick.js | 4 ++-- commands/slap.js | 4 ++-- commands/snuggle.js | 4 ++-- commands/stop.js | 8 ++++---- commands/uinfo.js | 4 ++-- config-example.json | 4 ++++ package.json | 2 +- start.js | 12 ++++++------ 28 files changed, 63 insertions(+), 59 deletions(-) diff --git a/commands/8ball.js b/commands/8ball.js index 2748458..927f6d9 100644 --- a/commands/8ball.js +++ b/commands/8ball.js @@ -12,7 +12,7 @@ module.exports = { if (!question) { await message.channel.send(client.generateErrorMessage("You need to ask a question!", message.author.displayAvatarURL)); } else { - await message.channel.send({embed: { + await message.channel.send({embeds: [{ "title": ":8ball: 8Ball", "description": `Your amazing question: **${question}**`, "color": 9442302, @@ -26,7 +26,7 @@ module.exports = { "value": `${answer}` } ] - }}); + }]}); } } } \ No newline at end of file diff --git a/commands/avatar.js b/commands/avatar.js index 615ce63..2cf250b 100644 --- a/commands/avatar.js +++ b/commands/avatar.js @@ -6,7 +6,7 @@ module.exports = { async execute(client, message, args, config) { const user = message.mentions.users.first() || client.users.cache.get(args[0]) || message.author; - await message.channel.send({embed: { + await message.channel.send({embeds: [{ "title": `:frame_photo: ${user.username}'s Beautiful Avatar!`, "color": 9442302, "footer": { @@ -16,6 +16,6 @@ module.exports = { "image": { "url": user.displayAvatarURL() } - }}); + }]}); } } diff --git a/commands/bonk.js b/commands/bonk.js index 87dc359..7c4d6ca 100644 --- a/commands/bonk.js +++ b/commands/bonk.js @@ -9,7 +9,7 @@ module.exports = { if(!taggedUser) { await message.channel.send(client.generateErrorMessage("You need to @mention a user!", message.author.displayAvatarURL())); } else { - await message.channel.send({embed: { + await message.channel.send({embeds: [{ "title": " Bonk", "description": `${taggedUser} You have been bonked by ${message.author}!`, "color": 9442302, @@ -20,7 +20,7 @@ module.exports = { "image": { "url": "https://cdn.discordapp.com/attachments/793537380330111028/801194481549312060/HappyBONK.gif" } - }}); + }]}); } } } diff --git a/commands/cheese.js b/commands/cheese.js index c3b2f59..d735d41 100644 --- a/commands/cheese.js +++ b/commands/cheese.js @@ -9,7 +9,7 @@ module.exports = { if(!taggedUser) { await message.channel.send("*slams cheese on desk*\n**Cheese.** https://www.youtube.com/watch?v=Or4IE8fkpn4"); } else { - await message.channel.send({embed: { + await message.channel.send({embeds: [{ "title": ":cheese: Cheesed", "description": `${taggedUser} You have been cheesed by ${message.author}!`, "color": 16312092, @@ -20,7 +20,7 @@ module.exports = { "image": { "url": "https://cdn.discordapp.com/attachments/803658122299572255/812867714368536636/R06325af354168febcafd96b8328b7590.png" } - }}); + }]}); } } } diff --git a/commands/choose.js b/commands/choose.js index 99e3aaf..38d4f37 100644 --- a/commands/choose.js +++ b/commands/choose.js @@ -12,7 +12,7 @@ module.exports = { await message.channel.send(client.generateErrorMessage("You need to provide some input!", message.author.displayAvatarURL())); } else { const answer = options[Math.floor(Math.random() * options.length)]; - await message.channel.send({embed: { + await message.channel.send({embeds: [{ "title": "I have made my decision:", "description": answer, "color": 8311585, @@ -20,7 +20,7 @@ module.exports = { "icon_url": message.author.displayAvatarURL(), "text": config.footerTxt }, - }}); + }]}); } } } diff --git a/commands/cuddle.js b/commands/cuddle.js index 5825a73..a6c82d3 100644 --- a/commands/cuddle.js +++ b/commands/cuddle.js @@ -18,7 +18,7 @@ module.exports = { if(!taggedUser) { await message.channel.send(client.generateErrorMessage("You need to @mention a user!", message.author.displayAvatarURL())); } else { - await message.channel.send({embed: { + await message.channel.send({embeds: [{ "title": ":heart: Cuddle", "description": `${taggedUser} You have been cuddled by ${message.author}!`, "color": 9442302, @@ -29,7 +29,7 @@ module.exports = { "image": { "url": gif } - }}); + }]}); } } } diff --git a/commands/eval.js b/commands/eval.js index 86b0f18..9edab67 100644 --- a/commands/eval.js +++ b/commands/eval.js @@ -12,7 +12,7 @@ module.exports = { const evaled = inspect(eval(code)); await message.channel.send(evaled, {code:"xl"}); } catch (error) { - await message.channel.send({embed: { + await message.channel.send({embeds: [{ "title": "<:AnitroxError:809651936563429416> **Something went wrong! **", "color": 13632027, "footer": { @@ -29,7 +29,7 @@ module.exports = { "value": error.message } ] - }}); + }]}); } }; } diff --git a/commands/help.js b/commands/help.js index e2bd143..3d312f9 100644 --- a/commands/help.js +++ b/commands/help.js @@ -5,7 +5,7 @@ module.exports = { syntax: '', async execute(_0, message, _1, config) { - await message.channel.send({embed: { + await message.channel.send({embeds: [{ "title": "HELP! SEYMOUR! THE BOT IS ON FIRE!", "description": "Get help on anything from commands, to what the bot does! just not your homework..", "color": 9442302, @@ -23,6 +23,6 @@ module.exports = { "value": "Join the [support server!](https://discord.gg/grebRGsBZ3)" } ] - }}); + }]}); } } diff --git a/commands/hug.js b/commands/hug.js index c294752..ed29754 100644 --- a/commands/hug.js +++ b/commands/hug.js @@ -18,7 +18,7 @@ module.exports = { await message.channel.send(client.generateErrorMessage("You need to @mention a user!", message.author.displayAvatarURL())); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; - await message.channel.send({embed: { + await message.channel.send({embeds: [{ "title": " Hug", "description": `${taggedUser} You have been hugged by ${message.author}!`, "color": 8311585, @@ -29,7 +29,7 @@ module.exports = { "image": { "url": gif } - }}); + }]}); } } } diff --git a/commands/info.js b/commands/info.js index 41ce529..4c4f5b2 100644 --- a/commands/info.js +++ b/commands/info.js @@ -24,7 +24,7 @@ module.exports = { const osu = require('node-os-utils'); const cpu = osu.cpu; - await message.channel.send({embed: { + await message.channel.send({embeds: [{ "title": "<:AnitroxInfo:809651936831733791> Information about Anitrox", "description": "Everything you've ever wanted to know about your favorite bot, Anitrox!", "color": 9442302, @@ -102,6 +102,6 @@ module.exports = { } ] - }}); + }]}); } }; diff --git a/commands/invite.js b/commands/invite.js index a17a2c8..94e26ad 100644 --- a/commands/invite.js +++ b/commands/invite.js @@ -5,7 +5,7 @@ module.exports = { syntax: [], async execute(_0, message, _1, config) { - await message.channel.send({embed: { + await message.channel.send({embeds: [{ "title": "Add Anitrox to your Server!", "description": "Weather you want stable, or that squeaky clean fresh PTB build, we gotchu.", "color": 9442302, @@ -30,6 +30,6 @@ module.exports = { "value": "Come join the Anitrox Support Server, for support and much more!\n [Anitrox Support Server](https://discord.gg/grebRGsBZ3)" } ] - }}); + }]}); }, }; \ No newline at end of file diff --git a/commands/kiss.js b/commands/kiss.js index 921deb8..a7ac11a 100644 --- a/commands/kiss.js +++ b/commands/kiss.js @@ -18,7 +18,7 @@ module.exports = { await message.channel.send(client.generateErrorMessage("You need to @mention a user!", message.author.displayAvatarURL())); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; - await message.channel.send({embed: { + await message.channel.send({embeds: [{ "title": ":heart: Kiss", "description": `${taggedUser} You have been kissed by ${message.author}!`, "color": 9442302, @@ -29,7 +29,7 @@ module.exports = { "image": { "url": gif } - }}); + }]}); } } } diff --git a/commands/leskiss.js b/commands/leskiss.js index 85b3d79..77472b9 100644 --- a/commands/leskiss.js +++ b/commands/leskiss.js @@ -28,7 +28,7 @@ module.exports = { await message.channel.send(client.generateErrorMessage("You need to @mention a user!", message.author.displayAvatarURL())); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; - await message.channel.send({embed: { + await message.channel.send({embeds: [{ "title": ":heart: <:lesbian:803831629428686849> Kiss", "description": `${taggedUser} You have been kissed by ${message.author}!`, "color": 8311585, @@ -39,7 +39,7 @@ module.exports = { "image": { "url": gif } - }}); + }]}); } } } diff --git a/commands/lick.js b/commands/lick.js index 92e3ec8..903ea0d 100644 --- a/commands/lick.js +++ b/commands/lick.js @@ -17,7 +17,7 @@ module.exports = { await message.channel.send(client.generateErrorMessage("You need to @mention a user!", message.author.displayAvatarURL())); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; - await message.channel.send({embed: { + await message.channel.send({embeds: [{ "title": " Lick", "description": `${taggedUser} You have been licked by ${message.author}!`, "color": 8311585, @@ -28,7 +28,7 @@ module.exports = { "image": { "url": "https://cdn.discordapp.com/attachments/803658122299572255/805314244123951114/cef569820773b0f5d54ee34cfa18e1f8.gif" } - }}); + }]}); } } } diff --git a/commands/nom.js b/commands/nom.js index 314dce4..955a85f 100644 --- a/commands/nom.js +++ b/commands/nom.js @@ -17,7 +17,7 @@ module.exports = { await message.channel.send(client.generateErrorMessage("You need to @mention a user!", message.author.displayAvatarURL())); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; - await message.channel.send({embed: { + await message.channel.send({embeds: [{ "title": "<:BlobNomBlob:801241117919805510> Nom", "description": `${taggedUser} You have been nommed by ${message.author}!`, "color": 8311585, @@ -28,7 +28,7 @@ module.exports = { "image": { "url": gif } - }}); + }]}); } } } diff --git a/commands/opensource.js b/commands/opensource.js index 3b9dc16..05d5b4c 100644 --- a/commands/opensource.js +++ b/commands/opensource.js @@ -4,7 +4,7 @@ module.exports = { description: 'Attributions to open source components used by Anitrox', async execute(_0, message, _1, config){ - await message.channel.send({embed: { + await message.channel.send({embeds: [{ "title": "Component Attribution", "description": "Some parts of Anitrox are using open source code, and their attributions are avaliable here!", "color": 52508, @@ -29,6 +29,6 @@ module.exports = { "value": "Using and supporting the Anitrox Project, thank you! ❤" } ] - }}); + }]}); } } \ No newline at end of file diff --git a/commands/pat.js b/commands/pat.js index 27a7db1..454c987 100644 --- a/commands/pat.js +++ b/commands/pat.js @@ -16,7 +16,7 @@ module.exports = { await message.channel.send(client.generateErrorMessage("You need to @mention a user!", message.author.displayAvatarURL())); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; - await message.channel.send({embed: { + await message.channel.send({embeds: [{ "title": "<:pats:801238281286713355> Pat", "description": `${taggedUser} You have been patted by ${message.author}!`, "color": 8311585, @@ -27,7 +27,7 @@ module.exports = { "image": { "url": gif } - }}); + }]}); } } } diff --git a/commands/ping.js b/commands/ping.js index df10b93..0815271 100644 --- a/commands/ping.js +++ b/commands/ping.js @@ -7,7 +7,7 @@ module.exports = { const index = Math.floor(Math.random() * config.locations.length); const location = config.locations[index] - await message.channel.send({embed:{ + await message.channel.send({embeds:[{ "title": ":ping_pong: Ping", "description": `**Pong!** We pinged **${location}** and got ${client.ws.ping} ms.`, "color": 9442302, @@ -15,6 +15,6 @@ module.exports = { "icon_url": message.author.displayAvatarURL(), "text": config.footerTxt } - }}); + }]}); } }; diff --git a/commands/poke.js b/commands/poke.js index 346ab47..ea98dd9 100644 --- a/commands/poke.js +++ b/commands/poke.js @@ -16,7 +16,7 @@ module.exports = { await message.channel.send(client.generateErrorMessage("You need to @mention a user!", message.author.displayAvatarURL())); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; - await message.channel.send({embed: { + await message.channel.send({embeds: [{ "title": "👉 Poke!", "description": `${taggedUser} You have been poked by ${message.author}!`, "color": 8311585, @@ -27,7 +27,7 @@ module.exports = { "image": { "url": gif } - }}); + }]}); } } } diff --git a/commands/reload.js b/commands/reload.js index 05f048d..95ec266 100644 --- a/commands/reload.js +++ b/commands/reload.js @@ -31,7 +31,7 @@ module.exports = { }); } else { - message.channel.send({embed: { + message.channel.send({embeds: [{ "title": "<:AnitroxDenied:809651936642203668> **403 Forbidden**", "color": 13632027, "footer": { @@ -44,7 +44,7 @@ module.exports = { "value": "You don't have the appropriate permissions to run this command!" } ] - }}); + }]}); } } }; \ No newline at end of file diff --git a/commands/setnick.js b/commands/setnick.js index a097ed1..30de3e1 100644 --- a/commands/setnick.js +++ b/commands/setnick.js @@ -8,7 +8,7 @@ module.exports = { const newnick = args.slice(0).join(" ") try { await message.member.setNickname(newnick, "Nickname change requested by the server member. If you don't want users to be able to change their nickname disable 'CHANGE_NICKNAME' via Change Nickname in Roles.") - await message.channel.send({embed: { + await message.channel.send({embeds: [{ "title": "<:AnitroxSuccess:809651936819019796> Nickname Changed", "color": 9442302, "footer": { @@ -26,7 +26,7 @@ module.exports = { "inline": true } ] - }}); + }]}); } catch (error) { await message.channel.send(client.generateErrorMessage("Failed to set user nickname. Does the bot have the correct permissions?", message.author.displayAvatarURL())); }; diff --git a/commands/slap.js b/commands/slap.js index f390d06..77a2062 100644 --- a/commands/slap.js +++ b/commands/slap.js @@ -9,7 +9,7 @@ module.exports = { if(!taggedUser) { await message.channel.send(client.generateErrorMessage("You need to @mention a user!", message.author.displayAvatarURL())); } else { - await message.channel.send({embed: { + await message.channel.send({embeds: [{ "title": ":anger: Slap", "description": `${taggedUser} You have been slapped by ${message.author}!`, "color": 9442302, @@ -20,7 +20,7 @@ module.exports = { "image": { "url": "https://media1.tenor.com/images/b6d8a83eb652a30b95e87cf96a21e007/tenor.gif?itemid=10426943" } - }}); + }]}); } } } diff --git a/commands/snuggle.js b/commands/snuggle.js index e94afb9..541e991 100644 --- a/commands/snuggle.js +++ b/commands/snuggle.js @@ -17,7 +17,7 @@ module.exports = { await message.channel.send(client.generateErrorMessage("You need to @mention a user!", message.author.displayAvatarURL())); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; - await message.channel.send({embed: { + await message.channel.send({embeds: [{ "title": "<:BlobSnuggleCat:806759753450782731> Snuggle", "description": `${taggedUser} You have been snuggled by ${message.author}!`, "color": 9442302, @@ -28,7 +28,7 @@ module.exports = { "image": { "url": gif } - }}); + }]}); } } } \ No newline at end of file diff --git a/commands/stop.js b/commands/stop.js index 9e11f13..9dee70e 100644 --- a/commands/stop.js +++ b/commands/stop.js @@ -5,7 +5,7 @@ module.exports = { async execute(_0, message, _1, config) { if (message.author.id == config.ownerID) { - await message.channel.send({embed: { + await message.channel.send({embeds: [{ "title": " **Shutting Down...**", "description": "See you next time!", "color": 9442302, @@ -13,11 +13,11 @@ module.exports = { "icon_url": message.author.displayAvatarURL(), "text": config.footerTxt }, - }}); + }]}); console.log("The bot is shutting down! Bye bye!") process.exit(); } else { - await message.channel.send({embed: { + await message.channel.send({embeds: [{ "title": "<:AnitroxDenied:809651936642203668> 403 Forbidden", "description": "You need to be the bot owner to execute this command!", "color": 13632027, @@ -25,7 +25,7 @@ module.exports = { "icon_url": message.author.displayAvatarURL(), "text": config.footerTxt }, - }}); + }]}); } } } \ No newline at end of file diff --git a/commands/uinfo.js b/commands/uinfo.js index aa20282..f42125e 100644 --- a/commands/uinfo.js +++ b/commands/uinfo.js @@ -7,7 +7,7 @@ module.exports = { async execute(client, message, args, config) { const user = message.mentions.users.first() || client.users.cache.get(args[0]) || message.author - await message.channel.send({embed: { + await message.channel.send({embeds: [{ "title": `Everything you've ever wanted to know about ${user.username}!`, "color": 9442302, "footer": { @@ -52,6 +52,6 @@ module.exports = { inline: true }, ] - }}); + }]}); } } diff --git a/config-example.json b/config-example.json index 47afd8f..d61c748 100644 --- a/config-example.json +++ b/config-example.json @@ -53,5 +53,9 @@ "Go for it! :smile:", "Good idea!", "Sure" + ], + "intents": [ + "GUILDS", + "GUILD_MESSAGES" ] } \ No newline at end of file diff --git a/package.json b/package.json index 45ac005..55d9b35 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "Discord Bot Based on Discord.JS", "main": "start.js", "dependencies": { - "discord.js": "^12.5.1", + "discord.js": "^13.6.0", "node-os-utils": "^1.3.2", "require-all": "^3.0.0" }, diff --git a/start.js b/start.js index 483f924..6b20004 100755 --- a/start.js +++ b/start.js @@ -4,7 +4,7 @@ const fs = require('fs'); const Discord = require('discord.js'); const config = require('./config.json'); console.log('Starting!') -const client = new Discord.Client(); +const client = new Discord.Client({ intents: config.intents.map(intent => eval(`Discord.Intents.FLAGS.${intent}`))}); client.commands = new Discord.Collection(); const commandFiles = fs.readdirSync('./commands').filter(file => file.endsWith('.js')); @@ -14,7 +14,7 @@ for (const file of commandFiles) { client.commands.set(command.name, command); } -client.generateErrorMessage = (errorMsg, messageAuthorURL) => ({embed: { +client.generateErrorMessage = (errorMsg, messageAuthorURL) => ({embeds: [{ "title": "<:AnitroxError:809651936563429416> Error", "color": 13632027, "footer": { @@ -27,7 +27,7 @@ client.generateErrorMessage = (errorMsg, messageAuthorURL) => ({embed: { "value": errorMsg } ] -}}) +}]}) client.on("error", (e) => console.log(`[ERROR] ${error(e)}`)); client.on("warn", (e) => (`[WARN] ${warn(e)}`)); @@ -51,7 +51,7 @@ client.once('ready', () => { // Begin Command Handler -client.on('message', async (message) => { +client.on('messageCreate', async (message) => { if (!message.content.startsWith(config.prefix) || message.author.bot) return; @@ -64,7 +64,7 @@ client.on('message', async (message) => { await client.commands.get(command).execute(client, message, args, config); } catch (error) { console.stack; - message.channel.send({embed: { + message.channel.send({embeds: [{ "title": "<:AnitroxError:809651936563429416> **Something went wrong!**", "description": error.stack, "color": 13632027, @@ -72,7 +72,7 @@ client.on('message', async (message) => { "icon_url": message.author.displayAvatarURL(), "text": config.footerTxt }, - }}); + }]}); } }); From fb3f26cdd43673177ed25e8d87f046c16bedd03b Mon Sep 17 00:00:00 2001 From: Nathaniel Mason Date: Thu, 21 Apr 2022 17:36:03 +0100 Subject: [PATCH 02/15] Merge upstream changed into Foxi's dev build --- commands/8ball.js | 2 +- commands/bonk.js | 2 +- commands/choose.js | 2 +- commands/contributors.js | 34 ++++++++++++++++++++++++++++++++++ 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/opensource.js | 34 ---------------------------------- commands/pat.js | 2 +- commands/poke.js | 2 +- commands/setnick.js | 2 +- commands/slap.js | 2 +- commands/snuggle.js | 2 +- start.js | 2 +- 17 files changed, 49 insertions(+), 49 deletions(-) create mode 100644 commands/contributors.js delete mode 100644 commands/opensource.js diff --git a/commands/8ball.js b/commands/8ball.js index 927f6d9..4963e24 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({embeds: [{ "title": ":8ball: 8Ball", diff --git a/commands/bonk.js b/commands/bonk.js index 7c4d6ca..510e8b1 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({embeds: [{ "title": " Bonk", diff --git a/commands/choose.js b/commands/choose.js index 38d4f37..f2899b0 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({embeds: [{ diff --git a/commands/contributors.js b/commands/contributors.js new file mode 100644 index 0000000..6cad10d --- /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({embeds: [{ + "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/emojis/809651812323164192.webp?size=128&quality=lossless" + }, + "fields": [ + { + "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": "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": "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)" + } + ] + }]}); + } +} \ No newline at end of file diff --git a/commands/cuddle.js b/commands/cuddle.js index a6c82d3..c5b2a84 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({embeds: [{ "title": ":heart: Cuddle", diff --git a/commands/hug.js b/commands/hug.js index ed29754..12ea199 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({embeds: [{ diff --git a/commands/kiss.js b/commands/kiss.js index a7ac11a..eb42134 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({embeds: [{ diff --git a/commands/leskiss.js b/commands/leskiss.js index 77472b9..e635a2c 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({embeds: [{ diff --git a/commands/lick.js b/commands/lick.js index 903ea0d..6748348 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({embeds: [{ diff --git a/commands/nom.js b/commands/nom.js index 955a85f..9397295 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({embeds: [{ diff --git a/commands/opensource.js b/commands/opensource.js deleted file mode 100644 index 05d5b4c..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({embeds: [{ - "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 diff --git a/commands/pat.js b/commands/pat.js index 454c987..243afa1 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({embeds: [{ diff --git a/commands/poke.js b/commands/poke.js index ea98dd9..9fbcc91 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({embeds: [{ diff --git a/commands/setnick.js b/commands/setnick.js index 30de3e1..69e8ffa 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 77a2062..e39f9b1 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({embeds: [{ "title": ":anger: Slap", diff --git a/commands/snuggle.js b/commands/snuggle.js index 541e991..3d628eb 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({embeds: [{ diff --git a/start.js b/start.js index 6b20004..2f616bf 100755 --- a/start.js +++ b/start.js @@ -18,7 +18,7 @@ client.generateErrorMessage = (errorMsg, messageAuthorURL) => ({embeds: [{ "title": "<:AnitroxError:809651936563429416> Error", "color": 13632027, "footer": { - "icon_url": messageAuthorURL, + "icon_url": message.author.displayAvatarURL(), "text": config.footerTxt }, "fields": [ From 8c9c083d26b1bf73d2dff7a69b27364ca9ead77f Mon Sep 17 00:00:00 2001 From: Nathaniel Mason Date: Thu, 21 Apr 2022 18:24:12 +0100 Subject: [PATCH 03/15] Fix avatar url handling for error messages --- commands/8ball.js | 5 +++-- commands/bonk.js | 7 +++++-- commands/choose.js | 5 +++-- commands/cuddle.js | 5 +++-- commands/hug.js | 5 +++-- commands/kiss.js | 5 +++-- commands/leskiss.js | 5 +++-- commands/lick.js | 5 +++-- commands/nom.js | 7 ++++--- commands/pat.js | 5 +++-- commands/poke.js | 5 +++-- commands/reload.js | 9 +++++---- commands/setnick.js | 6 ++++-- commands/slap.js | 5 +++-- commands/snuggle.js | 5 +++-- start.js | 4 ++-- 16 files changed, 53 insertions(+), 35 deletions(-) diff --git a/commands/8ball.js b/commands/8ball.js index 4963e24..c69e97b 100644 --- a/commands/8ball.js +++ b/commands/8ball.js @@ -8,16 +8,17 @@ module.exports = { const index = Math.floor(Math.random() * config.answers.length); const answer = config.answers[index] const question = args.slice(0).join(" ") + const avatarURL = message.author.displayAvatarURL() if (!question) { - await message.channel.send(client.generateErrorMessage("You need to ask a question!")); + await message.channel.send(client.generateErrorMessage("You need to ask a question!", avatarURL)); } else { await message.channel.send({embeds: [{ "title": ":8ball: 8Ball", "description": `Your amazing question: **${question}**`, "color": 9442302, "footer": { - "icon_url": message.author.displayAvatarURL(), + "icon_url": avatarURL, "text": config.footerTxt }, "fields": [ diff --git a/commands/bonk.js b/commands/bonk.js index 510e8b1..287af71 100644 --- a/commands/bonk.js +++ b/commands/bonk.js @@ -1,3 +1,5 @@ +const avatar = require('./avatar'); + module.exports = { name: require('path').parse(__filename).name, @@ -5,16 +7,17 @@ module.exports = { async execute(client, message, _, config) { const taggedUser = message.mentions.users.first(); + const avatarURL = message.author.displayAvatarURL(); if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!")); + await message.channel.send(client.generateErrorMessage("You need to @mention a user!", avatarURL)); } else { await message.channel.send({embeds: [{ "title": " Bonk", "description": `${taggedUser} You have been bonked by ${message.author}!`, "color": 9442302, "footer": { - "icon_url": message.author.displayAvatarURL(), + "icon_url": avatarURL, "text": config.footerTxt }, "image": { diff --git a/commands/choose.js b/commands/choose.js index f2899b0..4f8f16c 100644 --- a/commands/choose.js +++ b/commands/choose.js @@ -4,12 +4,13 @@ module.exports = { description: "Give some lines of input, and get one back at random", async execute(client, message, _, config) { + const avatarURL = message.author.displayAvatarURL(); var [head, ...options] = message.content.split(/\s*\n\s*/); head = head.slice(this.name.length + config.prefix.length); if (head) options.push(head); if (!options.length) { - await message.channel.send(client.generateErrorMessage("You need to provide some input!")); + await message.channel.send(client.generateErrorMessage("You need to provide some input!", avatarURL)); } else { const answer = options[Math.floor(Math.random() * options.length)]; await message.channel.send({embeds: [{ @@ -17,7 +18,7 @@ module.exports = { "description": answer, "color": 8311585, "footer": { - "icon_url": message.author.displayAvatarURL(), + "icon_url": avatarURL, "text": config.footerTxt }, }]}); diff --git a/commands/cuddle.js b/commands/cuddle.js index c5b2a84..bd237aa 100644 --- a/commands/cuddle.js +++ b/commands/cuddle.js @@ -14,16 +14,17 @@ module.exports = { const taggedUser = message.mentions.users.first(); const index = Math.floor(Math.random() * gifchoices.length); const gif = (gifchoices[index]); + const avatarURL = message.author.displayAvatarURL(); if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!")); + await message.channel.send(client.generateErrorMessage("You need to @mention a user!", avatarURL)); } else { await message.channel.send({embeds: [{ "title": ":heart: Cuddle", "description": `${taggedUser} You have been cuddled by ${message.author}!`, "color": 9442302, "footer": { - "icon_url": message.author.displayAvatarURL(), + "icon_url": avatarURL, "text": config.footerTxt }, "image": { diff --git a/commands/hug.js b/commands/hug.js index 12ea199..9a747a5 100644 --- a/commands/hug.js +++ b/commands/hug.js @@ -13,9 +13,10 @@ module.exports = { async execute(client, message, _, config) { const taggedUser = message.mentions.users.first(); + const avatarURL = message.author.displayAvatarURL(); if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!")); + await message.channel.send(client.generateErrorMessage("You need to @mention a user!", avatarURL)); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; await message.channel.send({embeds: [{ @@ -23,7 +24,7 @@ module.exports = { "description": `${taggedUser} You have been hugged by ${message.author}!`, "color": 8311585, "footer": { - "icon_url": message.author.displayAvatarURL(), + "icon_url": avatarURL, "text": config.footerTxt }, "image": { diff --git a/commands/kiss.js b/commands/kiss.js index eb42134..1159efe 100644 --- a/commands/kiss.js +++ b/commands/kiss.js @@ -13,9 +13,10 @@ module.exports = { async execute(client, message, _, config) { const taggedUser = message.mentions.users.first(); + const avatarURL = message.author.displayAvatarURL(); if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!")); + await message.channel.send(client.generateErrorMessage("You need to @mention a user!", avatarURL)); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; await message.channel.send({embeds: [{ @@ -23,7 +24,7 @@ module.exports = { "description": `${taggedUser} You have been kissed by ${message.author}!`, "color": 9442302, "footer": { - "icon_url": message.author.displayAvatarURL(), + "icon_url": avatarURL, "text": config.footerTxt }, "image": { diff --git a/commands/leskiss.js b/commands/leskiss.js index e635a2c..dcc64d5 100644 --- a/commands/leskiss.js +++ b/commands/leskiss.js @@ -23,9 +23,10 @@ module.exports = { async execute(client, message, _, config) { const taggedUser = message.mentions.users.first(); + const avatarURL = message.author.displayAvatarURL(); if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!")); + await message.channel.send(client.generateErrorMessage("You need to @mention a user!", avatarURL)); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; await message.channel.send({embeds: [{ @@ -33,7 +34,7 @@ module.exports = { "description": `${taggedUser} You have been kissed by ${message.author}!`, "color": 8311585, "footer": { - "icon_url": message.author.displayAvatarURL(), + "icon_url": avatarURL, "text": config.footerTxt }, "image": { diff --git a/commands/lick.js b/commands/lick.js index 6748348..e3730ea 100644 --- a/commands/lick.js +++ b/commands/lick.js @@ -12,9 +12,10 @@ module.exports = { async execute(client, message, _, config) { const taggedUser = message.mentions.users.first(); + const avatarURL = message.author.displayAvatarURL(); if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!")); + await message.channel.send(client.generateErrorMessage("You need to @mention a user!", avatarURL)); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; await message.channel.send({embeds: [{ @@ -22,7 +23,7 @@ module.exports = { "description": `${taggedUser} You have been licked by ${message.author}!`, "color": 8311585, "footer": { - "icon_url": message.author.displayAvatarURL(), + "icon_url": avatarURL, "text": config.footerTxt }, "image": { diff --git a/commands/nom.js b/commands/nom.js index 9397295..8f6132e 100644 --- a/commands/nom.js +++ b/commands/nom.js @@ -11,10 +11,11 @@ module.exports = { description: "Noms an user!", async execute(client, message, _, config) { - const taggedUser = message.mentions.users.first(); + const taggedUser = message.mentions.users.first(); + const avatarURL = message.author.displayAvatarURL(); if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!")); + await message.channel.send(client.generateErrorMessage("You need to @mention a user!", avatarURL)); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; await message.channel.send({embeds: [{ @@ -22,7 +23,7 @@ module.exports = { "description": `${taggedUser} You have been nommed by ${message.author}!`, "color": 8311585, "footer": { - "icon_url": message.author.displayAvatarURL(), + "icon_url": avatarURL, "text": config.footerTxt }, "image": { diff --git a/commands/pat.js b/commands/pat.js index 243afa1..ce3d613 100644 --- a/commands/pat.js +++ b/commands/pat.js @@ -11,9 +11,10 @@ module.exports = { async execute(client, message, _, config) { const taggedUser = message.mentions.users.first(); + const avatarURL = message.author.displayAvatarURL(); if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!")); + await message.channel.send(client.generateErrorMessage("You need to @mention a user!", avatarURL)); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; await message.channel.send({embeds: [{ @@ -21,7 +22,7 @@ module.exports = { "description": `${taggedUser} You have been patted by ${message.author}!`, "color": 8311585, "footer": { - "icon_url": message.author.displayAvatarURL(), + "icon_url": avatarURL, "text": config.footerTxt }, "image": { diff --git a/commands/poke.js b/commands/poke.js index 9fbcc91..ff2aa25 100644 --- a/commands/poke.js +++ b/commands/poke.js @@ -11,9 +11,10 @@ module.exports = { async execute(client, message, _, config) { const taggedUser = message.mentions.users.first(); + const avatarURL = message.author.displayAvatarURL(); if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!")); + await message.channel.send(client.generateErrorMessage("You need to @mention a user!", avatarURL)); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; await message.channel.send({embeds: [{ @@ -21,7 +22,7 @@ module.exports = { "description": `${taggedUser} You have been poked by ${message.author}!`, "color": 8311585, "footer": { - "icon_url": message.author.displayAvatarURL(), + "icon_url": avatarURL, "text": config.footerTxt }, "image": { diff --git a/commands/reload.js b/commands/reload.js index 95ec266..3101a4c 100644 --- a/commands/reload.js +++ b/commands/reload.js @@ -4,9 +4,10 @@ module.exports = { description: 'Reloads a command', async execute(client, message, args, config) { + const avatarURL = message.author.displayAvatarURL(); if (message.author.id = config.ownerID) { if (!args.length) { - await message.channel.send(client.generateErrorMessage("You forgot to provide anything to reload, you pillock",message.author.displayAvatarURL())); + await message.channel.send(client.generateErrorMessage("You forgot to provide anything to reload, you pillock", avatarURL)); } args.forEach(async (arg) => { const commandName = arg.toLowerCase(); @@ -14,7 +15,7 @@ module.exports = { || message.client.commands.find(cmd => cmd.aliases && cmd.aliases.includes(commandName)); if (!command) { - await message.channel.send(client.generateErrorMessage(`There is no command with name or alias \`${commandName}\`, ${message.author}!`,message.author.displayAvatarURL())); + await message.channel.send(client.generateErrorMessage(`There is no command with name or alias \`${commandName}\`, ${message.author}!`, avatarURL)); } else { delete require.cache[require.resolve(`./${command.name}.js`)]; @@ -25,7 +26,7 @@ module.exports = { console.log(`User reloaded ${command.name}.`) } catch (error) { console.error(error); - await message.channel.send(client.generateErrorMessage(`There was an error while reloading \`${command.name}\`:\n\`${error.message}\``, message.author.displayAvatarURL())); + await message.channel.send(client.generateErrorMessage(`There was an error while reloading \`${command.name}\`:\n\`${error.message}\``, avatarURL)); } } }); @@ -35,7 +36,7 @@ module.exports = { "title": "<:AnitroxDenied:809651936642203668> **403 Forbidden**", "color": 13632027, "footer": { - "icon_url": message.author.displayAvatarURL(), + "icon_url": avatarURL, "text": config.footerTxt }, "fields": [ diff --git a/commands/setnick.js b/commands/setnick.js index 69e8ffa..f7e4939 100644 --- a/commands/setnick.js +++ b/commands/setnick.js @@ -4,6 +4,8 @@ module.exports = { description: 'Sets your nickname', async execute(client, message, args, config) { + const avatarURL = message.author.displayAvatarURL(); + if (message.channel.permissionsFor(message.author).has("CHANGE_NICKNAME")) { const newnick = args.slice(0).join(" ") try { @@ -28,10 +30,10 @@ module.exports = { ] }]}); } catch (error) { - await message.channel.send(client.generateErrorMessage("Failed to set user nickname. Does the bot have the correct permissions?", message.author.displayAvatarURL())); + await message.channel.send(client.generateErrorMessage("Failed to set user nickname. Does the bot have the correct permissions?", avatarURL)); }; } else { - await message.channel.send(client.generateErrorMessage("You need to have permission ``CHANGE_NICKNAME`` to change your nick!", message.author.displayAvatarURL())); + await message.channel.send(client.generateErrorMessage("You need to have permission ``CHANGE_NICKNAME`` to change your nick!", avatarURL)); } } } diff --git a/commands/slap.js b/commands/slap.js index e39f9b1..1b31afd 100644 --- a/commands/slap.js +++ b/commands/slap.js @@ -5,16 +5,17 @@ module.exports = { async execute(client, message, _, config) { const taggedUser = message.mentions.users.first(); + const avatarURL = message.author.displayAvatarURL(); if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!")); + await message.channel.send(client.generateErrorMessage("You need to @mention a user!", avatarURL)); } else { await message.channel.send({embeds: [{ "title": ":anger: Slap", "description": `${taggedUser} You have been slapped by ${message.author}!`, "color": 9442302, "footer": { - "icon_url": message.author.displayAvatarURL(), + "icon_url": avatarURL, "text": config.footerTxt }, "image": { diff --git a/commands/snuggle.js b/commands/snuggle.js index 3d628eb..0020797 100644 --- a/commands/snuggle.js +++ b/commands/snuggle.js @@ -12,9 +12,10 @@ module.exports = { async execute(client, message, _, config) { const taggedUser = message.mentions.users.first(); + const avatarURL = message.author.displayAvatarURL(); if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!")); + await message.channel.send(client.generateErrorMessage("You need to @mention a user!", avatarURL)); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; await message.channel.send({embeds: [{ @@ -22,7 +23,7 @@ module.exports = { "description": `${taggedUser} You have been snuggled by ${message.author}!`, "color": 9442302, "footer": { - "icon_url": message.author.displayAvatarURL(), + "icon_url": avatarURL, "text": config.footerTxt }, "image": { diff --git a/start.js b/start.js index 2f616bf..e9b9a65 100755 --- a/start.js +++ b/start.js @@ -14,11 +14,11 @@ for (const file of commandFiles) { client.commands.set(command.name, command); } -client.generateErrorMessage = (errorMsg, messageAuthorURL) => ({embeds: [{ +client.generateErrorMessage = (errorMsg, avatarURL) => ({embeds: [{ "title": "<:AnitroxError:809651936563429416> Error", "color": 13632027, "footer": { - "icon_url": message.author.displayAvatarURL(), + "icon_url": avatarURL, "text": config.footerTxt }, "fields": [ From 0bc4277389b138494f6405e8793a905d37181fe6 Mon Sep 17 00:00:00 2001 From: Nathaniel Mason Date: Thu, 21 Apr 2022 20:23:58 +0100 Subject: [PATCH 04/15] Fix uinfo command, discord.js v13 seems to have removed user.presence --- commands/uinfo.js | 28 +++++++++++++++------------- config-example.json | 39 ++++++++++++++++++++------------------- 2 files changed, 35 insertions(+), 32 deletions(-) diff --git a/commands/uinfo.js b/commands/uinfo.js index f42125e..8b5feea 100644 --- a/commands/uinfo.js +++ b/commands/uinfo.js @@ -4,52 +4,54 @@ module.exports = { description: "Gets info about an user, such as ID, Discord Join date and more", syntax: "", - async execute(client, message, args, config) { - const user = message.mentions.users.first() || client.users.cache.get(args[0]) || message.author + async execute(_0, message, _1, config) { + const user = message.mentions.users.first() || message.member; await message.channel.send({embeds: [{ - "title": `Everything you've ever wanted to know about ${user.username}!`, + "title": `Everything you've ever wanted to know about ${user.user}!`, "color": 9442302, "footer": { "icon_url": message.author.displayAvatarURL(), "text": config.footerTxt }, "thumbnail": { - "url": user.displayAvatarURL() + "url": user.user.displayAvatarURL() }, "fields": [ - { "name": "Username", - "value": user.username, + "value": user.user.username, "inline": true }, { "name": "Discriminator", - "value": user.discriminator, + "value": user.user.discriminator, "inline": true }, { "name": "Full Username", - "value": user.tag, + "value": user.user.tag, "inline": true }, { "name": "User Profile Picture", - "value": user.displayAvatarURL() + "value": user.user.displayAvatarURL() }, { "name": "User Status", - value: user.presence.status + "value": user.presence?.status ?? "Error getting status, does the bot have the GUILD_PRESENCES intent?" + //IMPORTANT NOTE: + //There seems to be an issue where offline and invisible users return a null presense + //I'll try to patch this soon if I can figure out why }, { "name": "User ID", - "value": `\`${user.id}\`` + "value": `\`${user.user.id}\`` }, { "name": "User Joined Discord", - "value": user.createdAt, - inline: true + "value": user.user.createdAt.toString(), + "inline": true }, ] }]}); diff --git a/config-example.json b/config-example.json index d61c748..fb3f1d0 100644 --- a/config-example.json +++ b/config-example.json @@ -1,21 +1,21 @@ { - "prefix": "n!", - "token": "IM SO EXCITED ABOUT BURGER", - "ownerID": "MY FAVORITE COLOR IS TWELVE", - "release": "anitrox_dev", - "build": "Stable", - "footerTxt": "Anitrox, made with <3 by IDeletedSystem64 | 2018-2022", - - "statuses": [ - "with np!help", - "with Sophie!", - "Trans Rights!", - "in your computer", - "with my internet router", - "ssh: system64@borkeonv2", - "YouTube", - "with source code", - "Visual Studio Code", + "prefix": "n!", + "token": "IM SO EXCITED ABOUT BURGER", + "ownerID": "MY FAVORITE COLOR IS TWELVE", + "release": "anitrox_dev", + "build": "Stable", + "footerTxt": "Anitrox, made with <3 by IDeletedSystem64 | 2018-2022", + + "statuses": [ + "with np!help", + "with Sophie!", + "Trans Rights!", + "in your computer", + "with my internet router", + "ssh: system64@borkeonv2", + "YouTube", + "with source code", + "Visual Studio Code", "Minecraft", "with the network connections.", "VLC Media Player", @@ -56,6 +56,7 @@ ], "intents": [ "GUILDS", - "GUILD_MESSAGES" + "GUILD_MESSAGES", + "GUILD_PRESENCES" ] - } \ No newline at end of file +} \ No newline at end of file From e315feb737d8f329b6235b45e76afc1572dbad66 Mon Sep 17 00:00:00 2001 From: Nathaniel Mason Date: Fri, 22 Apr 2022 00:09:21 +0100 Subject: [PATCH 05/15] Add ESlint to help enforce coding style --- .eslintrc.json | 17 ++++ commands/8ball.js | 48 +++++------ commands/avatar.js | 30 +++---- commands/bonk.js | 44 +++++------ commands/cheese.js | 38 ++++----- commands/choose.js | 30 +++---- commands/contributors.js | 56 ++++++------- commands/cuddle.js | 44 ++++++----- commands/eval.js | 52 ++++++------ commands/help.js | 44 ++++++----- commands/hug.js | 50 ++++++------ commands/info.js | 167 ++++++++++++++++++++------------------- commands/invite.js | 58 +++++++------- commands/kiss.js | 50 ++++++------ commands/leskiss.js | 74 ++++++++--------- commands/lick.js | 46 +++++------ commands/nom.js | 46 +++++------ commands/pat.js | 46 +++++------ commands/ping.js | 32 ++++---- commands/poke.js | 48 +++++------ commands/reload.js | 49 ++++++------ commands/restart.js | 20 ++--- commands/setnick.js | 54 +++++++------ commands/slap.js | 40 +++++----- commands/snuggle.js | 47 +++++------ commands/stop.js | 50 ++++++------ commands/uinfo.js | 104 ++++++++++++------------ package.json | 12 ++- start.js | 75 +++++++++--------- 29 files changed, 770 insertions(+), 701 deletions(-) create mode 100644 .eslintrc.json diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 0000000..5e2d5fe --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,17 @@ +{ + "env": { + "browser": true, + "commonjs": true, + "es2021": true + }, + "extends": [ + "standard" + ], + "parserOptions": { + "ecmaVersion": "latest" + }, + "rules": { + "no-eval": "off", + "semi": [1, "always"] + } +} diff --git a/commands/8ball.js b/commands/8ball.js index c69e97b..f196c63 100644 --- a/commands/8ball.js +++ b/commands/8ball.js @@ -2,32 +2,34 @@ module.exports = { name: require('path').parse(__filename).name, description: 'Ask Anitrox a question, any question! and they will answer it!', - syntax: ["[Question]"], - - async execute(client, message, args, config) { + syntax: ['[Question]'], + + async execute (client, message, args, config) { const index = Math.floor(Math.random() * config.answers.length); - const answer = config.answers[index] - const question = args.slice(0).join(" ") - const avatarURL = message.author.displayAvatarURL() + const answer = config.answers[index]; + const question = args.slice(0).join(' '); + const avatarURL = message.author.displayAvatarURL(); if (!question) { - await message.channel.send(client.generateErrorMessage("You need to ask a question!", avatarURL)); + await message.channel.send(client.generateErrorMessage('You need to ask a question!', avatarURL)); } else { - await message.channel.send({embeds: [{ - "title": ":8ball: 8Ball", - "description": `Your amazing question: **${question}**`, - "color": 9442302, - "footer": { - "icon_url": avatarURL, - "text": config.footerTxt - }, - "fields": [ - { - "name": "Answer", - "value": `${answer}` - } - ] - }]}); + await message.channel.send({ + embeds: [{ + title: ':8ball: 8Ball', + description: `Your amazing question: **${question}**`, + color: 9442302, + footer: { + icon_url: avatarURL, + text: config.footerTxt + }, + fields: [ + { + name: 'Answer', + value: `${answer}` + } + ] + }] + }); } } -} \ No newline at end of file +}; diff --git a/commands/avatar.js b/commands/avatar.js index 2cf250b..16159ef 100644 --- a/commands/avatar.js +++ b/commands/avatar.js @@ -3,19 +3,21 @@ module.exports = { name: require('path').parse(__filename).name, description: "Gets a user's avatar.", - async execute(client, message, args, config) { + async execute (client, message, args, config) { const user = message.mentions.users.first() || client.users.cache.get(args[0]) || message.author; - - await message.channel.send({embeds: [{ - "title": `:frame_photo: ${user.username}'s Beautiful Avatar!`, - "color": 9442302, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": config.footerTxt - }, - "image": { - "url": user.displayAvatarURL() - } - }]}); + + await message.channel.send({ + embeds: [{ + title: `:frame_photo: ${user.username}'s Beautiful Avatar!`, + color: 9442302, + footer: { + icon_url: message.author.displayAvatarURL(), + text: config.footerTxt + }, + image: { + url: user.displayAvatarURL() + } + }] + }); } -} +}; diff --git a/commands/bonk.js b/commands/bonk.js index 287af71..bc4ffb5 100644 --- a/commands/bonk.js +++ b/commands/bonk.js @@ -1,29 +1,29 @@ -const avatar = require('./avatar'); - module.exports = { - - name: require('path').parse(__filename).name, - description: "Bonks a user!", - async execute(client, message, _, config) { + name: require('path').parse(__filename).name, + description: 'Bonks a user!', + + async execute (client, message, _, config) { const taggedUser = message.mentions.users.first(); const avatarURL = message.author.displayAvatarURL(); - - if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!", avatarURL)); + + if (!taggedUser) { + await message.channel.send(client.generateErrorMessage('You need to @mention a user!', avatarURL)); } else { - await message.channel.send({embeds: [{ - "title": " Bonk", - "description": `${taggedUser} You have been bonked by ${message.author}!`, - "color": 9442302, - "footer": { - "icon_url": avatarURL, - "text": config.footerTxt - }, - "image": { - "url": "https://cdn.discordapp.com/attachments/793537380330111028/801194481549312060/HappyBONK.gif" - } - }]}); + await message.channel.send({ + embeds: [{ + title: ' Bonk', + description: `${taggedUser} You have been bonked by ${message.author}!`, + color: 9442302, + footer: { + icon_url: avatarURL, + text: config.footerTxt + }, + image: { + url: 'https://cdn.discordapp.com/attachments/793537380330111028/801194481549312060/HappyBONK.gif' + } + }] + }); } } -} +}; diff --git a/commands/cheese.js b/commands/cheese.js index d735d41..94cc4a9 100644 --- a/commands/cheese.js +++ b/commands/cheese.js @@ -1,26 +1,28 @@ module.exports = { name: require('path').parse(__filename).name, - description: "Cheese an user, or run just ``n!cheese`` for a surprise :eyes:", + description: 'Cheese an user, or run just ``n!cheese`` for a surprise :eyes:', - async execute(_0, message, _1, config) { + async execute (_0, message, _1, config) { const taggedUser = message.mentions.users.first(); - - if(!taggedUser) { - await message.channel.send("*slams cheese on desk*\n**Cheese.** https://www.youtube.com/watch?v=Or4IE8fkpn4"); + + if (!taggedUser) { + await message.channel.send('*slams cheese on desk*\n**Cheese.** https://www.youtube.com/watch?v=Or4IE8fkpn4'); } else { - await message.channel.send({embeds: [{ - "title": ":cheese: Cheesed", - "description": `${taggedUser} You have been cheesed by ${message.author}!`, - "color": 16312092, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": config.footerTxt - }, - "image": { - "url": "https://cdn.discordapp.com/attachments/803658122299572255/812867714368536636/R06325af354168febcafd96b8328b7590.png" - } - }]}); + await message.channel.send({ + embeds: [{ + title: ':cheese: Cheesed', + description: `${taggedUser} You have been cheesed by ${message.author}!`, + color: 16312092, + footer: { + icon_url: message.author.displayAvatarURL(), + text: config.footerTxt + }, + image: { + url: 'https://cdn.discordapp.com/attachments/803658122299572255/812867714368536636/R06325af354168febcafd96b8328b7590.png' + } + }] + }); } } -} +}; diff --git a/commands/choose.js b/commands/choose.js index 4f8f16c..bb754e3 100644 --- a/commands/choose.js +++ b/commands/choose.js @@ -1,27 +1,29 @@ module.exports = { name: require('path').parse(__filename).name, - description: "Give some lines of input, and get one back at random", + description: 'Give some lines of input, and get one back at random', - async execute(client, message, _, config) { + async execute (client, message, _, config) { const avatarURL = message.author.displayAvatarURL(); - var [head, ...options] = message.content.split(/\s*\n\s*/); + let [head, ...options] = message.content.split(/\s*\n\s*/); head = head.slice(this.name.length + config.prefix.length); if (head) options.push(head); if (!options.length) { - await message.channel.send(client.generateErrorMessage("You need to provide some input!", avatarURL)); + await message.channel.send(client.generateErrorMessage('You need to provide some input!', avatarURL)); } else { const answer = options[Math.floor(Math.random() * options.length)]; - await message.channel.send({embeds: [{ - "title": "I have made my decision:", - "description": answer, - "color": 8311585, - "footer": { - "icon_url": avatarURL, - "text": config.footerTxt - }, - }]}); + await message.channel.send({ + embeds: [{ + title: 'I have made my decision:', + description: answer, + color: 8311585, + footer: { + icon_url: avatarURL, + text: config.footerTxt + } + }] + }); } } -} +}; diff --git a/commands/contributors.js b/commands/contributors.js index 6cad10d..3538684 100644 --- a/commands/contributors.js +++ b/commands/contributors.js @@ -2,33 +2,35 @@ 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({embeds: [{ - "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/emojis/809651812323164192.webp?size=128&quality=lossless" - }, - "fields": [ - { - "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)" + + async execute (_0, message, _1, config) { + await message.channel.send({ + embeds: [{ + title: 'Contributors', + description: 'Links to check out our contributors!', + color: 52508, + footer: { + icon_url: message.author.displayAvatarURL(), + text: config.footerTxt }, - { - "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)" + thumbnail: { + url: 'https://cdn.discordapp.com/emojis/809651812323164192.webp?size=128&quality=lossless' }, - { - "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)" - } - ] - }]}); + fields: [ + { + 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: '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: '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)' + } + ] + }] + }); } -} \ No newline at end of file +}; diff --git a/commands/cuddle.js b/commands/cuddle.js index bd237aa..7c6466a 100644 --- a/commands/cuddle.js +++ b/commands/cuddle.js @@ -1,36 +1,38 @@ const gifchoices = [ - "https://i.pinimg.com/originals/4d/89/d7/4d89d7f963b41a416ec8a55230dab31b.gif", - "https://media1.tenor.com/images/6d73b0a9cadef5310be4b6160d2f959a/tenor.gif?itemid=12099823", - "https://media.tenor.com/images/2636cf3c8152631b4630bf71757a4afa/tenor.gif", - "https://i.imgur.com/JiFpT5E.gif" + 'https://i.pinimg.com/originals/4d/89/d7/4d89d7f963b41a416ec8a55230dab31b.gif', + 'https://media1.tenor.com/images/6d73b0a9cadef5310be4b6160d2f959a/tenor.gif?itemid=12099823', + 'https://media.tenor.com/images/2636cf3c8152631b4630bf71757a4afa/tenor.gif', + 'https://i.imgur.com/JiFpT5E.gif' ]; module.exports = { name: require('path').parse(__filename).name, - description: "Cuddle an user!", + description: 'Cuddle a user!', - async execute(client, message, _, config) { + async execute (client, message, _, config) { const taggedUser = message.mentions.users.first(); const index = Math.floor(Math.random() * gifchoices.length); const gif = (gifchoices[index]); const avatarURL = message.author.displayAvatarURL(); - if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!", avatarURL)); + if (!taggedUser) { + await message.channel.send(client.generateErrorMessage('You need to @mention a user!', avatarURL)); } else { - await message.channel.send({embeds: [{ - "title": ":heart: Cuddle", - "description": `${taggedUser} You have been cuddled by ${message.author}!`, - "color": 9442302, - "footer": { - "icon_url": avatarURL, - "text": config.footerTxt - }, - "image": { - "url": gif - } - }]}); + await message.channel.send({ + embeds: [{ + title: ':heart: Cuddle', + description: `${taggedUser} You have been cuddled by ${message.author}!`, + color: 9442302, + footer: { + icon_url: avatarURL, + text: config.footerTxt + }, + image: { + url: gif + } + }] + }); } } -} +}; diff --git a/commands/eval.js b/commands/eval.js index 9edab67..d288c7d 100644 --- a/commands/eval.js +++ b/commands/eval.js @@ -1,36 +1,38 @@ -const { inspect } = require("util"); +const { inspect } = require('util'); module.exports = { - name: require('path').parse(__filename).name, - description: 'Executes JS code', + name: require('path').parse(__filename).name, + description: 'Executes JS code', - async execute(_, message, args, config) { - if (message.author.id == config.ownerID) { + async execute (_, message, args, config) { + if (message.author.id === config.ownerID) { try { - const code = args.join(" "); + const code = args.join(' '); const evaled = inspect(eval(code)); - await message.channel.send(evaled, {code:"xl"}); + await message.channel.send(evaled, { code: 'xl' }); } catch (error) { - await message.channel.send({embeds: [{ - "title": "<:AnitroxError:809651936563429416> **Something went wrong! **", - "color": 13632027, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": config.footerTxt - }, - "fields": [ - { - "name": "**What Happened?**", - "value": "The command you tried to run failed to execute due to an error." + await message.channel.send({ + embeds: [{ + title: '<:AnitroxError:809651936563429416> **Something went wrong! **', + color: 13632027, + footer: { + icon_url: message.author.displayAvatarURL(), + text: config.footerTxt }, - { - "name": "Error Info", - "value": error.message - } - ] - }]}); + fields: [ + { + name: '**What Happened?**', + value: 'The command you tried to run failed to execute due to an error.' + }, + { + name: 'Error Info', + value: error.message + } + ] + }] + }); } }; } -} +}; diff --git a/commands/help.js b/commands/help.js index 3d312f9..94b9f76 100644 --- a/commands/help.js +++ b/commands/help.js @@ -1,28 +1,30 @@ module.exports = { - + name: require('path').parse(__filename).name, description: 'Get help on anything from commands, to what the bot does! just not your homework..', syntax: '', - async execute(_0, message, _1, config) { - await message.channel.send({embeds: [{ - "title": "HELP! SEYMOUR! THE BOT IS ON FIRE!", - "description": "Get help on anything from commands, to what the bot does! just not your homework..", - "color": 9442302, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": `${config.footerTxt} | No mother it's just the northern lights` - }, - "fields": [ - { - "name": "Command List", - "value": "[Click here!](https://github.com/IDeletedSystem64/anitrox/blob/dev/commands.md)" + async execute (_0, message, _1, config) { + await message.channel.send({ + embeds: [{ + title: 'HELP! SEYMOUR! THE BOT IS ON FIRE!', + description: 'Get help on anything from commands, to what the bot does! just not your homework..', + color: 9442302, + footer: { + icon_url: message.author.displayAvatarURL(), + text: `${config.footerTxt} | No mother it's just the northern lights` }, - { - "name": "...Or is the bot actually on fire?", - "value": "Join the [support server!](https://discord.gg/grebRGsBZ3)" - } - ] - }]}); + fields: [ + { + name: 'Command List', + value: '[Click here!](https://github.com/IDeletedSystem64/anitrox/blob/dev/commands.md)' + }, + { + name: '...Or is the bot actually on fire?', + value: 'Join the [support server!](https://discord.gg/grebRGsBZ3)' + } + ] + }] + }); } -} +}; diff --git a/commands/hug.js b/commands/hug.js index 9a747a5..5ded0cd 100644 --- a/commands/hug.js +++ b/commands/hug.js @@ -1,36 +1,38 @@ const gifchoices = [ - "https://cdn.discordapp.com/attachments/803658122299572255/807670647920001044/hug2.gif", - "https://cdn.discordapp.com/attachments/803658122299572255/807670797983285268/hug1.gif", - "https://cdn.discordapp.com/attachments/803658122299572255/807670951113392178/gif6.gif", - "https://cdn.discordapp.com/attachments/803658122299572255/808834617494208532/gif3new.gif", - "https://cdn.discordapp.com/attachments/803658122299572255/807671126376972308/gif4.gif" + 'https://cdn.discordapp.com/attachments/803658122299572255/807670647920001044/hug2.gif', + 'https://cdn.discordapp.com/attachments/803658122299572255/807670797983285268/hug1.gif', + 'https://cdn.discordapp.com/attachments/803658122299572255/807670951113392178/gif6.gif', + 'https://cdn.discordapp.com/attachments/803658122299572255/808834617494208532/gif3new.gif', + 'https://cdn.discordapp.com/attachments/803658122299572255/807671126376972308/gif4.gif' ]; module.exports = { name: require('path').parse(__filename).name, - description: "Hugs a user!", - - async execute(client, message, _, config) { + description: 'Hugs a user!', + + async execute (client, message, _, config) { const taggedUser = message.mentions.users.first(); const avatarURL = message.author.displayAvatarURL(); - - if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!", avatarURL)); + + if (!taggedUser) { + await message.channel.send(client.generateErrorMessage('You need to @mention a user!', avatarURL)); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; - await message.channel.send({embeds: [{ - "title": " Hug", - "description": `${taggedUser} You have been hugged by ${message.author}!`, - "color": 8311585, - "footer": { - "icon_url": avatarURL, - "text": config.footerTxt - }, - "image": { - "url": gif - } - }]}); + await message.channel.send({ + embeds: [{ + title: ' Hug', + description: `${taggedUser} You have been hugged by ${message.author}!`, + color: 8311585, + footer: { + icon_url: avatarURL, + text: config.footerTxt + }, + image: { + url: gif + } + }] + }); } } -} +}; diff --git a/commands/info.js b/commands/info.js index 4c4f5b2..930b86b 100644 --- a/commands/info.js +++ b/commands/info.js @@ -1,4 +1,4 @@ -function Uptime(uptime) { +function Uptime (uptime) { const totalSeconds = (uptime / 1000); const days = parseInt(totalSeconds / 86400); @@ -6,10 +6,10 @@ function Uptime(uptime) { const minutes = parseInt((totalSeconds % 3600) / 60); const seconds = parseInt(totalSeconds % 60); - const daystring = days + (days === 1 ? " day" : " days"); - const hourstring = hours + (hours === 1 ? " hour" : " hours"); - const minutetring = minutes + (minutes === 1 ? " minute" : " minutes"); - const secondstring = seconds + (seconds === 1 ? " second" : " seconds"); + const daystring = days + (days === 1 ? ' day' : ' days'); + const hourstring = hours + (hours === 1 ? ' hour' : ' hours'); + const minutetring = minutes + (minutes === 1 ? ' minute' : ' minutes'); + const secondstring = seconds + (seconds === 1 ? ' second' : ' seconds'); return `${daystring}**, **${hourstring}**, **${minutetring}**, **${secondstring}`; } @@ -19,89 +19,90 @@ module.exports = { name: require('path').parse(__filename).name, description: 'Shows bot and host information', - async execute(client, message, _, config) { - const os = require("os"); + async execute (client, message, _, config) { + const os = require('os'); const osu = require('node-os-utils'); const cpu = osu.cpu; - - await message.channel.send({embeds: [{ - "title": "<:AnitroxInfo:809651936831733791> Information about Anitrox", - "description": "Everything you've ever wanted to know about your favorite bot, Anitrox!", - "color": 9442302, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": config.footerTxt - }, - "thumbnail": { - "url": client.user.displayAvatarURL() - }, - "fields": [ - { - "name": "Bot Information", - "value": "** **" - }, - { - "name": "Release Type", - "value": config.release, - "inline": true - }, - { - "name": "Release Version", - "value": config.build, - "inline": true - }, - { - "name": "Uptime", - "value": Uptime(client.uptime), - "inline": true - }, - { - "name": "<:memory:793536677737136178> Bot Memory Usage", - "value": `${(process.memoryUsage().heapUsed / 1024 / 1024).toFixed(2)} MiB`, - "inline": true - }, - { - "name": "Bot Name", - "value": client.user.tag, - "inline": true - }, - { - "name": "Bot ID", - "value": `\`${client.user.id}\``, - "inline": true - }, - { - "name": "<:hostinfo:793529505263517747> Host Information", - "value": "** **" - }, - { - "name": "<:hostinfo:793529505263517747> Host Uptime", - "value": Uptime(os.uptime() * 1000) - }, - { - "name": "<:cpu:793672442056802354> CPU Type", - "value": `${process.arch}, ${cpu.model()}` - }, - { - "name": "<:hostos:793866961675223090> OS Type", - "value": `${process.platform} / ${os.version()}` + await message.channel.send({ + embeds: [{ + title: '<:AnitroxInfo:809651936831733791> Information about Anitrox', + description: "Everything you've ever wanted to know about your favorite bot, Anitrox!", + color: 9442302, + footer: { + icon_url: message.author.displayAvatarURL(), + text: config.footerTxt }, - { - "name": "<:node:793537507018145813> Node.JS Version", - "value": process.version + thumbnail: { + url: client.user.displayAvatarURL() }, - { - "name": "<:hostinfo:793529505263517747> Bot Ping", - "value": `${Math.round(client.ws.ping)} ms`, - "inline": true - }, - { - "name": "**Special Thanks To**", - "value": "@OfficialTCGMatt for providing help with development\n @chuu_shi Allowing me to host Anitrox on his server" - } + fields: [ + { + name: 'Bot Information', + value: '** **' + }, + { + name: 'Release Type', + value: config.release, + inline: true + }, + { + name: 'Release Version', + value: config.build, + inline: true + }, + { + name: 'Uptime', + value: Uptime(client.uptime), + inline: true + }, + { + name: '<:memory:793536677737136178> Bot Memory Usage', + value: `${(process.memoryUsage().heapUsed / 1024 / 1024).toFixed(2)} MiB`, + inline: true + }, + { + name: 'Bot Name', + value: client.user.tag, + inline: true + }, + { + name: 'Bot ID', + value: `\`${client.user.id}\``, + inline: true + }, + { + name: '<:hostinfo:793529505263517747> Host Information', + value: '** **' + }, + { + name: '<:hostinfo:793529505263517747> Host Uptime', + value: Uptime(os.uptime() * 1000) + }, + { + name: '<:cpu:793672442056802354> CPU Type', + value: `${process.arch}, ${cpu.model()}` + }, - ] - }]}); + { + name: '<:hostos:793866961675223090> OS Type', + value: `${process.platform} / ${os.version()}` + }, + { + name: '<:node:793537507018145813> Node.JS Version', + value: process.version + }, + { + name: '<:hostinfo:793529505263517747> Bot Ping', + value: `${Math.round(client.ws.ping)} ms`, + inline: true + }, + { + name: '**Special Thanks To**', + value: '@OfficialTCGMatt for providing help with development\n @chuu_shi Allowing me to host Anitrox on his server' + } + ] + }] + }); } }; diff --git a/commands/invite.js b/commands/invite.js index 94e26ad..e373fbf 100644 --- a/commands/invite.js +++ b/commands/invite.js @@ -3,33 +3,35 @@ module.exports = { name: require('path').parse(__filename).name, description: 'Add Anitrox to your beautiful server!', syntax: [], - - async execute(_0, message, _1, config) { - await message.channel.send({embeds: [{ - "title": "Add Anitrox to your Server!", - "description": "Weather you want stable, or that squeaky clean fresh PTB build, we gotchu.", - "color": 9442302, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": config.footerTxt - }, - "thumbnail": { - "url": "https://cdn.discordapp.com/attachments/803658122299572255/814352905394061322/anitroxaddsrvr.png" - }, - "fields": [ - { - "name": "Anitrox", - "value": "Get the ripe off the vine Anitrox! \n [Add Anitrox to your server](https://discord.com/oauth2/authorize?client_id=576805923964715018&scope=bot&permissions=8)" + + async execute (_0, message, _1, config) { + await message.channel.send({ + embeds: [{ + title: 'Add Anitrox to your Server!', + description: 'Weather you want stable, or that squeaky clean fresh PTB build, we gotchu.', + color: 9442302, + footer: { + icon_url: message.author.displayAvatarURL(), + text: config.footerTxt }, - { - "name": "Anitrox PTB (Public Test Build)", - "value": "So you want the fresh and hot builds straight from the oven? We gotchu \n [Add Anitrox PTB to your server](https://discord.com/oauth2/authorize?client_id=489125054261755925&scope=bot&permissions=66186303)" + thumbnail: { + url: 'https://cdn.discordapp.com/attachments/803658122299572255/814352905394061322/anitroxaddsrvr.png' }, - { - "name": "Need help?", - "value": "Come join the Anitrox Support Server, for support and much more!\n [Anitrox Support Server](https://discord.gg/grebRGsBZ3)" - } - ] - }]}); - }, -}; \ No newline at end of file + fields: [ + { + name: 'Anitrox', + value: 'Get the ripe off the vine Anitrox! \n [Add Anitrox to your server](https://discord.com/oauth2/authorize?client_id=576805923964715018&scope=bot&permissions=8)' + }, + { + name: 'Anitrox PTB (Public Test Build)', + value: 'So you want the fresh and hot builds straight from the oven? We gotchu \n [Add Anitrox PTB to your server](https://discord.com/oauth2/authorize?client_id=489125054261755925&scope=bot&permissions=66186303)' + }, + { + name: 'Need help?', + value: 'Come join the Anitrox Support Server, for support and much more!\n [Anitrox Support Server](https://discord.gg/grebRGsBZ3)' + } + ] + }] + }); + } +}; diff --git a/commands/kiss.js b/commands/kiss.js index 1159efe..e79bfd9 100644 --- a/commands/kiss.js +++ b/commands/kiss.js @@ -1,36 +1,38 @@ const gifchoices = [ - "https://cdn.discordapp.com/attachments/803658122299572255/807671954055626812/kiss5.gif", - "https://cdn.discordapp.com/attachments/803658122299572255/807671956236140554/kiss2.gif", - "https://cdn.discordapp.com/attachments/803658122299572255/807671964599713862/kiss1.gif", - "https://cdn.discordapp.com/attachments/803658122299572255/807671971168387082/kiss4.gif", - "https://cdn.discordapp.com/attachments/803658122299572255/807672017217781840/kiss3.gif" + 'https://cdn.discordapp.com/attachments/803658122299572255/807671954055626812/kiss5.gif', + 'https://cdn.discordapp.com/attachments/803658122299572255/807671956236140554/kiss2.gif', + 'https://cdn.discordapp.com/attachments/803658122299572255/807671964599713862/kiss1.gif', + 'https://cdn.discordapp.com/attachments/803658122299572255/807671971168387082/kiss4.gif', + 'https://cdn.discordapp.com/attachments/803658122299572255/807672017217781840/kiss3.gif' ]; module.exports = { name: require('path').parse(__filename).name, - description: "Kisses a user!", - - async execute(client, message, _, config) { + description: 'Kisses a user!', + + async execute (client, message, _, config) { const taggedUser = message.mentions.users.first(); const avatarURL = message.author.displayAvatarURL(); - - if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!", avatarURL)); + + if (!taggedUser) { + await message.channel.send(client.generateErrorMessage('You need to @mention a user!', avatarURL)); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; - await message.channel.send({embeds: [{ - "title": ":heart: Kiss", - "description": `${taggedUser} You have been kissed by ${message.author}!`, - "color": 9442302, - "footer": { - "icon_url": avatarURL, - "text": config.footerTxt - }, - "image": { - "url": gif - } - }]}); + await message.channel.send({ + embeds: [{ + title: ':heart: Kiss', + description: `${taggedUser} You have been kissed by ${message.author}!`, + color: 9442302, + footer: { + icon_url: avatarURL, + text: config.footerTxt + }, + image: { + url: gif + } + }] + }); } } -} +}; diff --git a/commands/leskiss.js b/commands/leskiss.js index dcc64d5..1458094 100644 --- a/commands/leskiss.js +++ b/commands/leskiss.js @@ -1,46 +1,48 @@ const gifchoices = [ - "https://cdn.discordapp.com/attachments/793537380330111028/803833954750038066/gif5.gif", - "https://cdn.discordapp.com/attachments/793537380330111028/803833959338475550/gif12.gif", - "https://cdn.discordapp.com/attachments/793537380330111028/803834034135236628/gif9.gif", - "https://cdn.discordapp.com/attachments/793537380330111028/803834082034843658/gif18.gif", - "https://cdn.discordapp.com/attachments/793537380330111028/803834094063583302/gif8.gif", - "https://cdn.discordapp.com/attachments/793537380330111028/803834099869024296/gif10.gif", - "https://cdn.discordapp.com/attachments/793537380330111028/803834132035665950/gif16.gif", - "https://cdn.discordapp.com/attachments/793537380330111028/803834146413084713/gif13.gif", - "https://cdn.discordapp.com/attachments/793537380330111028/803834249425715210/gif22.gif", - "https://cdn.discordapp.com/attachments/793537380330111028/803834323898990592/gif11.gif", - "https://cdn.discordapp.com/attachments/793537380330111028/803834328848793650/gif14.gif", - "https://cdn.discordapp.com/attachments/793537380330111028/803834391226351676/gif17.gif", - "https://cdn.discordapp.com/attachments/793537380330111028/803834391226351676/gif17.gif", - "https://cdn.discordapp.com/attachments/793537380330111028/803834498714304522/gif15.gif", - "https://cdn.discordapp.com/attachments/793537380330111028/803834514269798460/gif19.gif" + 'https://cdn.discordapp.com/attachments/793537380330111028/803833954750038066/gif5.gif', + 'https://cdn.discordapp.com/attachments/793537380330111028/803833959338475550/gif12.gif', + 'https://cdn.discordapp.com/attachments/793537380330111028/803834034135236628/gif9.gif', + 'https://cdn.discordapp.com/attachments/793537380330111028/803834082034843658/gif18.gif', + 'https://cdn.discordapp.com/attachments/793537380330111028/803834094063583302/gif8.gif', + 'https://cdn.discordapp.com/attachments/793537380330111028/803834099869024296/gif10.gif', + 'https://cdn.discordapp.com/attachments/793537380330111028/803834132035665950/gif16.gif', + 'https://cdn.discordapp.com/attachments/793537380330111028/803834146413084713/gif13.gif', + 'https://cdn.discordapp.com/attachments/793537380330111028/803834249425715210/gif22.gif', + 'https://cdn.discordapp.com/attachments/793537380330111028/803834323898990592/gif11.gif', + 'https://cdn.discordapp.com/attachments/793537380330111028/803834328848793650/gif14.gif', + 'https://cdn.discordapp.com/attachments/793537380330111028/803834391226351676/gif17.gif', + 'https://cdn.discordapp.com/attachments/793537380330111028/803834391226351676/gif17.gif', + 'https://cdn.discordapp.com/attachments/793537380330111028/803834498714304522/gif15.gif', + 'https://cdn.discordapp.com/attachments/793537380330111028/803834514269798460/gif19.gif' ]; module.exports = { - + name: require('path').parse(__filename).name, - description: "Lesbian kiss <:lesbian:803831629428686849>", - - async execute(client, message, _, config) { + description: 'Lesbian kiss <:lesbian:803831629428686849>', + + async execute (client, message, _, config) { const taggedUser = message.mentions.users.first(); const avatarURL = message.author.displayAvatarURL(); - - if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!", avatarURL)); + + if (!taggedUser) { + await message.channel.send(client.generateErrorMessage('You need to @mention a user!', avatarURL)); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; - await message.channel.send({embeds: [{ - "title": ":heart: <:lesbian:803831629428686849> Kiss", - "description": `${taggedUser} You have been kissed by ${message.author}!`, - "color": 8311585, - "footer": { - "icon_url": avatarURL, - "text": config.footerTxt - }, - "image": { - "url": gif - } - }]}); - } + await message.channel.send({ + embeds: [{ + title: ':heart: <:lesbian:803831629428686849> Kiss', + description: `${taggedUser} You have been kissed by ${message.author}!`, + color: 8311585, + footer: { + icon_url: avatarURL, + text: config.footerTxt + }, + image: { + url: gif + } + }] + }); + } } -} +}; diff --git a/commands/lick.js b/commands/lick.js index e3730ea..f4490b5 100644 --- a/commands/lick.js +++ b/commands/lick.js @@ -1,35 +1,37 @@ const gifchoices = [ - "https://cdn.discordapp.com/attachments/803658122299572255/805314244123951114/cef569820773b0f5d54ee34cfa18e1f8.gif", - "https://cdn.lowgif.com/full/2027501b8fa5225c-.gif", - "https://i.gifer.com/36Nx.gif", - "https://media.tenor.com/images/e8bbe712a5f36bbe9545930894b08bf9/tenor.gif" + 'https://cdn.discordapp.com/attachments/803658122299572255/805314244123951114/cef569820773b0f5d54ee34cfa18e1f8.gif', + 'https://cdn.lowgif.com/full/2027501b8fa5225c-.gif', + 'https://i.gifer.com/36Nx.gif', + 'https://media.tenor.com/images/e8bbe712a5f36bbe9545930894b08bf9/tenor.gif' ]; module.exports = { name: require('path').parse(__filename).name, - description: "Licks a user!", - - async execute(client, message, _, config) { + description: 'Licks a user!', + + async execute (client, message, _, config) { const taggedUser = message.mentions.users.first(); const avatarURL = message.author.displayAvatarURL(); - if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!", avatarURL)); + if (!taggedUser) { + await message.channel.send(client.generateErrorMessage('You need to @mention a user!', avatarURL)); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; - await message.channel.send({embeds: [{ - "title": " Lick", - "description": `${taggedUser} You have been licked by ${message.author}!`, - "color": 8311585, - "footer": { - "icon_url": avatarURL, - "text": config.footerTxt - }, - "image": { - "url": "https://cdn.discordapp.com/attachments/803658122299572255/805314244123951114/cef569820773b0f5d54ee34cfa18e1f8.gif" - } - }]}); + await message.channel.send({ + embeds: [{ + title: ' Lick', + description: `${taggedUser} You have been licked by ${message.author}!`, + color: 8311585, + footer: { + icon_url: avatarURL, + text: config.footerTxt + }, + image: { + url: gif + } + }] + }); } } -} +}; diff --git a/commands/nom.js b/commands/nom.js index 8f6132e..fc63286 100644 --- a/commands/nom.js +++ b/commands/nom.js @@ -1,35 +1,37 @@ const gifchoices = [ - "https://i.imgur.com/Ns1RBzX.gif", - "https://cdn.lowgif.com/full/2027501b8fa5225c-.gif", - "https://i.gifer.com/36Nx.gif", - "https://media.tenor.com/images/e8bbe712a5f36bbe9545930894b08bf9/tenor.gif" + 'https://i.imgur.com/Ns1RBzX.gif', + 'https://cdn.lowgif.com/full/2027501b8fa5225c-.gif', + 'https://i.gifer.com/36Nx.gif', + 'https://media.tenor.com/images/e8bbe712a5f36bbe9545930894b08bf9/tenor.gif' ]; module.exports = { name: require('path').parse(__filename).name, - description: "Noms an user!", - - async execute(client, message, _, config) { + description: 'Noms an user!', + + async execute (client, message, _, config) { const taggedUser = message.mentions.users.first(); const avatarURL = message.author.displayAvatarURL(); - if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!", avatarURL)); + if (!taggedUser) { + await message.channel.send(client.generateErrorMessage('You need to @mention a user!', avatarURL)); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; - await message.channel.send({embeds: [{ - "title": "<:BlobNomBlob:801241117919805510> Nom", - "description": `${taggedUser} You have been nommed by ${message.author}!`, - "color": 8311585, - "footer": { - "icon_url": avatarURL, - "text": config.footerTxt - }, - "image": { - "url": gif - } - }]}); + await message.channel.send({ + embeds: [{ + title: '<:BlobNomBlob:801241117919805510> Nom', + description: `${taggedUser} You have been nommed by ${message.author}!`, + color: 8311585, + footer: { + icon_url: avatarURL, + text: config.footerTxt + }, + image: { + url: gif + } + }] + }); } } -} +}; diff --git a/commands/pat.js b/commands/pat.js index ce3d613..eecaea4 100644 --- a/commands/pat.js +++ b/commands/pat.js @@ -1,34 +1,36 @@ const gifchoices = [ - "https://cdn.discordapp.com/attachments/803658122299572255/803708174293008474/tenor.gif", - "https://community.gamepress.gg/uploads/default/original/3X/0/a/0a762099c5ad6de9ca5f13dd22a7e45884a99eb3.gif", - "https://media1.giphy.com/media/ARSp9T7wwxNcs/giphy.gif" + 'https://cdn.discordapp.com/attachments/803658122299572255/803708174293008474/tenor.gif', + 'https://community.gamepress.gg/uploads/default/original/3X/0/a/0a762099c5ad6de9ca5f13dd22a7e45884a99eb3.gif', + 'https://media1.giphy.com/media/ARSp9T7wwxNcs/giphy.gif' ]; module.exports = { name: require('path').parse(__filename).name, - description: "Pats a user!", - - async execute(client, message, _, config) { + description: 'Pats a user!', + + async execute (client, message, _, config) { const taggedUser = message.mentions.users.first(); const avatarURL = message.author.displayAvatarURL(); - - if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!", avatarURL)); + + if (!taggedUser) { + await message.channel.send(client.generateErrorMessage('You need to @mention a user!', avatarURL)); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; - await message.channel.send({embeds: [{ - "title": "<:pats:801238281286713355> Pat", - "description": `${taggedUser} You have been patted by ${message.author}!`, - "color": 8311585, - "footer": { - "icon_url": avatarURL, - "text": config.footerTxt - }, - "image": { - "url": gif - } - }]}); + await message.channel.send({ + embeds: [{ + title: '<:pats:801238281286713355> Pat', + description: `${taggedUser} You have been patted by ${message.author}!`, + color: 8311585, + footer: { + icon_url: avatarURL, + text: config.footerTxt + }, + image: { + url: gif + } + }] + }); } } -} +}; diff --git a/commands/ping.js b/commands/ping.js index 0815271..bbed30c 100644 --- a/commands/ping.js +++ b/commands/ping.js @@ -1,20 +1,22 @@ module.exports = { name: require('path').parse(__filename).name, - description: "Gets bot ping", - - async execute(client, message, _, config) { - const index = Math.floor(Math.random() * config.locations.length); - const location = config.locations[index] - - await message.channel.send({embeds:[{ - "title": ":ping_pong: Ping", - "description": `**Pong!** We pinged **${location}** and got ${client.ws.ping} ms.`, - "color": 9442302, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": config.footerTxt - } - }]}); + description: 'Gets bot ping', + + async execute (client, message, _, config) { + const index = Math.floor(Math.random() * config.locations.length); + const location = config.locations[index]; + + await message.channel.send({ + embeds: [{ + title: ':ping_pong: Ping', + description: `**Pong!** We pinged **${location}** and got ${client.ws.ping} ms.`, + color: 9442302, + footer: { + icon_url: message.author.displayAvatarURL(), + text: config.footerTxt + } + }] + }); } }; diff --git a/commands/poke.js b/commands/poke.js index ff2aa25..903e45a 100644 --- a/commands/poke.js +++ b/commands/poke.js @@ -1,34 +1,36 @@ const gifchoices = [ - "https://i.pinimg.com/originals/b4/95/fb/b495fb19f4b9a1b04f48297b676c497b.gif", - "https://i.imgur.com/H7Ok5tn.gif", - "https://media1.tenor.com/images/8fe23ec8e2c5e44964e5c11983ff6f41/tenor.gif?itemid=5600215" + 'https://i.pinimg.com/originals/b4/95/fb/b495fb19f4b9a1b04f48297b676c497b.gif', + 'https://i.imgur.com/H7Ok5tn.gif', + 'https://media1.tenor.com/images/8fe23ec8e2c5e44964e5c11983ff6f41/tenor.gif?itemid=5600215' ]; module.exports = { name: require('path').parse(__filename).name, - description: "Pokes a user!", - - async execute(client, message, _, config) { + description: 'Pokes a user!', + + async execute (client, message, _, config) { const taggedUser = message.mentions.users.first(); const avatarURL = message.author.displayAvatarURL(); - - if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!", avatarURL)); + + if (!taggedUser) { + await message.channel.send(client.generateErrorMessage('You need to @mention a user!', avatarURL)); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; - await message.channel.send({embeds: [{ - "title": "👉 Poke!", - "description": `${taggedUser} You have been poked by ${message.author}!`, - "color": 8311585, - "footer": { - "icon_url": avatarURL, - "text": config.footerTxt - }, - "image": { - "url": gif - } - }]}); - } + await message.channel.send({ + embeds: [{ + title: '👉 Poke!', + description: `${taggedUser} You have been poked by ${message.author}!`, + color: 8311585, + footer: { + icon_url: avatarURL, + text: config.footerTxt + }, + image: { + url: gif + } + }] + }); + } } -} +}; diff --git a/commands/reload.js b/commands/reload.js index 3101a4c..b4434d9 100644 --- a/commands/reload.js +++ b/commands/reload.js @@ -1,18 +1,18 @@ module.exports = { - name: require('path').parse(__filename).name, - description: 'Reloads a command', + name: require('path').parse(__filename).name, + description: 'Reloads a command', - async execute(client, message, args, config) { + async execute (client, message, args, config) { const avatarURL = message.author.displayAvatarURL(); - if (message.author.id = config.ownerID) { + if (message.author.id === config.ownerID) { if (!args.length) { - await message.channel.send(client.generateErrorMessage("You forgot to provide anything to reload, you pillock", avatarURL)); + await message.channel.send(client.generateErrorMessage('You forgot to provide anything to reload, you pillock', avatarURL)); } args.forEach(async (arg) => { const commandName = arg.toLowerCase(); - const command = message.client.commands.get(commandName) - || message.client.commands.find(cmd => cmd.aliases && cmd.aliases.includes(commandName)); + const command = message.client.commands.get(commandName) || + message.client.commands.find(cmd => cmd.aliases && cmd.aliases.includes(commandName)); if (!command) { await message.channel.send(client.generateErrorMessage(`There is no command with name or alias \`${commandName}\`, ${message.author}!`, avatarURL)); @@ -23,29 +23,30 @@ module.exports = { const newCommand = require(`./${command.name}.js`); client.commands.set(newCommand.name, newCommand); await message.channel.send(`<:AnitroxSuccess:809651936819019796> **Reloaded \`${command.name}\` successfully!**`); - console.log(`User reloaded ${command.name}.`) + console.log(`User reloaded ${command.name}.`); } catch (error) { console.error(error); await message.channel.send(client.generateErrorMessage(`There was an error while reloading \`${command.name}\`:\n\`${error.message}\``, avatarURL)); } } }); - } else { - message.channel.send({embeds: [{ - "title": "<:AnitroxDenied:809651936642203668> **403 Forbidden**", - "color": 13632027, - "footer": { - "icon_url": avatarURL, - "text": config.footerTxt - }, - "fields": [ - { - "name": "**What Happened?**", - "value": "You don't have the appropriate permissions to run this command!" - } - ] - }]}); + message.channel.send({ + embeds: [{ + title: '<:AnitroxDenied:809651936642203668> **403 Forbidden**', + color: 13632027, + footer: { + icon_url: avatarURL, + text: config.footerTxt + }, + fields: [ + { + name: '**What Happened?**', + value: "You don't have the appropriate permissions to run this command!" + } + ] + }] + }); } } -}; \ No newline at end of file +}; diff --git a/commands/restart.js b/commands/restart.js index d048849..8006701 100644 --- a/commands/restart.js +++ b/commands/restart.js @@ -2,19 +2,19 @@ module.exports = { name: require('path').parse(__filename).name, description: 'Restarts the bot', - - async execute(client, message, _, config) { - if (message.author.id == config.ownerID) { - console.log("Anitrox is restarting now!") - await message.channel.send(" Restarting...") + + async execute (client, message, _, config) { + if (message.author.id === config.ownerID) { + console.log('Anitrox is restarting now!'); + await message.channel.send(' Restarting...'); try { client.destroy(); await client.login(config.token); - await message.channel.send("<:NyabotSuccess:697211376740859914> Restart Successful") - console.log("All systems go") - } catch(e) {console.log(e);} + await message.channel.send('<:NyabotSuccess:697211376740859914> Restart Successful'); + console.log('All systems go'); + } catch (e) { console.log(e); } } else { - await message.channel.send("<:NyabotDenied:697145462565896194> Access Denied, You must be bot owner to execute this command."); + await message.channel.send('<:NyabotDenied:697145462565896194> Access Denied, You must be bot owner to execute this command.'); } } -} +}; diff --git a/commands/setnick.js b/commands/setnick.js index f7e4939..d63e0c5 100644 --- a/commands/setnick.js +++ b/commands/setnick.js @@ -3,37 +3,39 @@ module.exports = { name: require('path').parse(__filename).name, description: 'Sets your nickname', - async execute(client, message, args, config) { + async execute (client, message, args, config) { const avatarURL = message.author.displayAvatarURL(); - - if (message.channel.permissionsFor(message.author).has("CHANGE_NICKNAME")) { - const newnick = args.slice(0).join(" ") + + if (message.channel.permissionsFor(message.author).has('CHANGE_NICKNAME')) { + const newnick = args.slice(0).join(' '); try { - await message.member.setNickname(newnick, "Nickname change requested by the server member. If you don't want users to be able to change their nickname disable 'CHANGE_NICKNAME' via Change Nickname in Roles.") - await message.channel.send({embeds: [{ - "title": "<:AnitroxSuccess:809651936819019796> Nickname Changed", - "color": 9442302, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": config.footerTxt - }, - "fields": [ - { - "name": "Changed nickname successfully!", - "value": `New Nickname: ${newnick}` + await message.member.setNickname(newnick, "Nickname change requested by the server member. If you don't want users to be able to change their nickname disable 'CHANGE_NICKNAME' via Change Nickname in Roles."); + await message.channel.send({ + embeds: [{ + title: '<:AnitroxSuccess:809651936819019796> Nickname Changed', + color: 9442302, + footer: { + icon_url: message.author.displayAvatarURL(), + text: config.footerTxt }, - { - "name": "New Nickname", - "value": newnick, - "inline": true - } - ] - }]}); + fields: [ + { + name: 'Changed nickname successfully!', + value: `New Nickname: ${newnick}` + }, + { + name: 'New Nickname', + value: newnick, + inline: true + } + ] + }] + }); } catch (error) { - await message.channel.send(client.generateErrorMessage("Failed to set user nickname. Does the bot have the correct permissions?", avatarURL)); + await message.channel.send(client.generateErrorMessage('Failed to set user nickname. Does the bot have the correct permissions?', avatarURL)); }; } else { - await message.channel.send(client.generateErrorMessage("You need to have permission ``CHANGE_NICKNAME`` to change your nick!", avatarURL)); + await message.channel.send(client.generateErrorMessage('You need to have permission ``CHANGE_NICKNAME`` to change your nick!', avatarURL)); } } -} +}; diff --git a/commands/slap.js b/commands/slap.js index 1b31afd..9146866 100644 --- a/commands/slap.js +++ b/commands/slap.js @@ -1,27 +1,29 @@ module.exports = { name: require('path').parse(__filename).name, - description: "Slaps an user!", - - async execute(client, message, _, config) { + description: 'Slaps an user!', + + async execute (client, message, _, config) { const taggedUser = message.mentions.users.first(); const avatarURL = message.author.displayAvatarURL(); - if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!", avatarURL)); + if (!taggedUser) { + await message.channel.send(client.generateErrorMessage('You need to @mention a user!', avatarURL)); } else { - await message.channel.send({embeds: [{ - "title": ":anger: Slap", - "description": `${taggedUser} You have been slapped by ${message.author}!`, - "color": 9442302, - "footer": { - "icon_url": avatarURL, - "text": config.footerTxt - }, - "image": { - "url": "https://media1.tenor.com/images/b6d8a83eb652a30b95e87cf96a21e007/tenor.gif?itemid=10426943" - } - }]}); - } + await message.channel.send({ + embeds: [{ + title: ':anger: Slap', + description: `${taggedUser} You have been slapped by ${message.author}!`, + color: 9442302, + footer: { + icon_url: avatarURL, + text: config.footerTxt + }, + image: { + url: 'https://media1.tenor.com/images/b6d8a83eb652a30b95e87cf96a21e007/tenor.gif?itemid=10426943' + } + }] + }); + } } -} +}; diff --git a/commands/snuggle.js b/commands/snuggle.js index 0020797..4322d9f 100644 --- a/commands/snuggle.js +++ b/commands/snuggle.js @@ -1,35 +1,36 @@ const gifchoices = [ - "https://media.discordapp.net/attachments/803658122299572255/806775382995894282/anime-couple-snuggle-gif-5.gif?width=450&height=238", - "https://media.discordapp.net/attachments/803658122299572255/806775411928989726/snuggl1.gif", - "https://cdn.discordapp.com/attachments/803658122299572255/806775422833786911/ImpureDeepAmbushbug-small.gif" + 'https://media.discordapp.net/attachments/803658122299572255/806775382995894282/anime-couple-snuggle-gif-5.gif?width=450&height=238', + 'https://media.discordapp.net/attachments/803658122299572255/806775411928989726/snuggl1.gif', + 'https://cdn.discordapp.com/attachments/803658122299572255/806775422833786911/ImpureDeepAmbushbug-small.gif' ]; - module.exports = { name: require('path').parse(__filename).name, - description: "Snuggle an user!", - - async execute(client, message, _, config) { + description: 'Snuggle an user!', + + async execute (client, message, _, config) { const taggedUser = message.mentions.users.first(); const avatarURL = message.author.displayAvatarURL(); - - if(!taggedUser) { - await message.channel.send(client.generateErrorMessage("You need to @mention a user!", avatarURL)); + + if (!taggedUser) { + await message.channel.send(client.generateErrorMessage('You need to @mention a user!', avatarURL)); } else { const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; - await message.channel.send({embeds: [{ - "title": "<:BlobSnuggleCat:806759753450782731> Snuggle", - "description": `${taggedUser} You have been snuggled by ${message.author}!`, - "color": 9442302, - "footer": { - "icon_url": avatarURL, - "text": config.footerTxt - }, - "image": { - "url": gif - } - }]}); + await message.channel.send({ + embeds: [{ + title: '<:BlobSnuggleCat:806759753450782731> Snuggle', + description: `${taggedUser} You have been snuggled by ${message.author}!`, + color: 9442302, + footer: { + icon_url: avatarURL, + text: config.footerTxt + }, + image: { + url: gif + } + }] + }); } } -} \ No newline at end of file +}; diff --git a/commands/stop.js b/commands/stop.js index 9dee70e..f878c80 100644 --- a/commands/stop.js +++ b/commands/stop.js @@ -2,30 +2,34 @@ module.exports = { name: require('path').parse(__filename).name, description: "IT'S TIME TO STOP!... the bot", - - async execute(_0, message, _1, config) { - if (message.author.id == config.ownerID) { - await message.channel.send({embeds: [{ - "title": " **Shutting Down...**", - "description": "See you next time!", - "color": 9442302, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": config.footerTxt - }, - }]}); - console.log("The bot is shutting down! Bye bye!") + + async execute (_0, message, _1, config) { + if (message.author.id === config.ownerID) { + await message.channel.send({ + embeds: [{ + title: ' **Shutting Down...**', + description: 'See you next time!', + color: 9442302, + footer: { + icon_url: message.author.displayAvatarURL(), + text: config.footerTxt + } + }] + }); + console.log('The bot is shutting down! Bye bye!'); process.exit(); } else { - await message.channel.send({embeds: [{ - "title": "<:AnitroxDenied:809651936642203668> 403 Forbidden", - "description": "You need to be the bot owner to execute this command!", - "color": 13632027, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": config.footerTxt - }, - }]}); + await message.channel.send({ + embeds: [{ + title: '<:AnitroxDenied:809651936642203668> 403 Forbidden', + description: 'You need to be the bot owner to execute this command!', + color: 13632027, + footer: { + icon_url: message.author.displayAvatarURL(), + text: config.footerTxt + } + }] + }); } } -} \ No newline at end of file +}; diff --git a/commands/uinfo.js b/commands/uinfo.js index 8b5feea..2ed0b0f 100644 --- a/commands/uinfo.js +++ b/commands/uinfo.js @@ -1,59 +1,61 @@ module.exports = { name: require('path').parse(__filename).name, - description: "Gets info about an user, such as ID, Discord Join date and more", - syntax: "", + description: 'Gets info about an user, such as ID, Discord Join date and more', + syntax: '', - async execute(_0, message, _1, config) { + async execute (_0, message, _1, config) { const user = message.mentions.users.first() || message.member; - - await message.channel.send({embeds: [{ - "title": `Everything you've ever wanted to know about ${user.user}!`, - "color": 9442302, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": config.footerTxt - }, - "thumbnail": { - "url": user.user.displayAvatarURL() - }, - "fields": [ - { - "name": "Username", - "value": user.user.username, - "inline": true + + await message.channel.send({ + embeds: [{ + title: `Everything you've ever wanted to know about ${user.user}!`, + color: 9442302, + footer: { + icon_url: message.author.displayAvatarURL(), + text: config.footerTxt }, - { - "name": "Discriminator", - "value": user.user.discriminator, - "inline": true + thumbnail: { + url: user.user.displayAvatarURL() }, - { - "name": "Full Username", - "value": user.user.tag, - "inline": true - }, - { - "name": "User Profile Picture", - "value": user.user.displayAvatarURL() - }, - { - "name": "User Status", - "value": user.presence?.status ?? "Error getting status, does the bot have the GUILD_PRESENCES intent?" - //IMPORTANT NOTE: - //There seems to be an issue where offline and invisible users return a null presense - //I'll try to patch this soon if I can figure out why - }, - { - "name": "User ID", - "value": `\`${user.user.id}\`` - }, - { - "name": "User Joined Discord", - "value": user.user.createdAt.toString(), - "inline": true - }, - ] - }]}); + fields: [ + { + name: 'Username', + value: user.user.username, + inline: true + }, + { + name: 'Discriminator', + value: user.user.discriminator, + inline: true + }, + { + name: 'Full Username', + value: user.user.tag, + inline: true + }, + { + name: 'User Profile Picture', + value: user.user.displayAvatarURL() + }, + { + name: 'User Status', + value: user.presence?.status ?? 'Error getting status, does the bot have the GUILD_PRESENCES intent?' + // IMPORTANT NOTE: + // There seems to be an issue where offline and invisible users return a null presense + // I'll try to patch this soon if I can figure out why + }, + { + name: 'User ID', + value: `\`${user.user.id}\`` + }, + { + name: 'User Joined Discord', + value: user.user.createdAt.toString(), + inline: true + } + ] + }] + }); } -} +}; diff --git a/package.json b/package.json index 55d9b35..74182dd 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,13 @@ "node-os-utils": "^1.3.2", "require-all": "^3.0.0" }, - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, "author": "IDeletedSystem64", - "license": "ISC" + "license": "ISC", + "devDependencies": { + "eslint": "^8.13.0", + "eslint-config-standard": "^17.0.0", + "eslint-plugin-import": "^2.26.0", + "eslint-plugin-n": "^15.1.0", + "eslint-plugin-promise": "^6.0.0" + } } diff --git a/start.js b/start.js index e9b9a65..778ee15 100755 --- a/start.js +++ b/start.js @@ -3,77 +3,78 @@ const fs = require('fs'); const Discord = require('discord.js'); const config = require('./config.json'); -console.log('Starting!') -const client = new Discord.Client({ intents: config.intents.map(intent => eval(`Discord.Intents.FLAGS.${intent}`))}); +console.log('Starting!'); +const client = new Discord.Client({ intents: config.intents.map(intent => eval(`Discord.Intents.FLAGS.${intent}`)) }); client.commands = new Discord.Collection(); const commandFiles = fs.readdirSync('./commands').filter(file => file.endsWith('.js')); for (const file of commandFiles) { - const command = require(`./commands/${file}`); - client.commands.set(command.name, command); + const command = require(`./commands/${file}`); + client.commands.set(command.name, command); } -client.generateErrorMessage = (errorMsg, avatarURL) => ({embeds: [{ - "title": "<:AnitroxError:809651936563429416> Error", - "color": 13632027, - "footer": { - "icon_url": avatarURL, - "text": config.footerTxt - }, - "fields": [ - { - "name": "Something went wrong!", - "value": errorMsg - } - ] -}]}) +client.generateErrorMessage = (errorMsg, avatarURL) => ({ + embeds: [{ + title: '<:AnitroxError:809651936563429416> Error', + color: 13632027, + footer: { + icon_url: avatarURL, + text: config.footerTxt + }, + fields: [ + { + name: 'Something went wrong!', + value: errorMsg + } + ] + }] +}); -client.on("error", (e) => console.log(`[ERROR] ${error(e)}`)); -client.on("warn", (e) => (`[WARN] ${warn(e)}`)); +client.on('error', (e) => console.log(`[ERROR] ${e}`)); +client.on('warn', (e) => (`[WARN] ${e}`)); client.once('ready', () => { - console.clear() + console.clear(); console.log(' ___ _ __ '); console.log(' / | ____ (_) /__________ _ __'); console.log(' / /| | / __ \\/ / __/ ___/ __ \\| |/_/'); console.log(' / ___ |/ / / / / /_/ / / /_/ /> < '); console.log('/_/ |_/_/ /_/_/\\__/_/ \\____/_/|_| '); console.log(`${config.release}, ${config.build}`); - console.log("Bot online. | Anitrox by IDeletedSystem64 | ALL MY CODE KEEPS BLOWING UP!"); + console.log('Bot online. | Anitrox by IDeletedSystem64 | ALL MY CODE KEEPS BLOWING UP!'); // Statuses setInterval(async () => { // Picks a status from the config file const index = Math.floor(Math.random() * config.statuses.length); await client.user.setActivity(config.statuses[index]); }, 20000); - }); - // Begin Command Handler client.on('messageCreate', async (message) => { - if (!message.content.startsWith(config.prefix) || message.author.bot) return; const args = message.content.slice(config.prefix.length).split(/\s+/); const command = args.shift().toLowerCase(); - + if (!client.commands.has(command)) return; try { await client.commands.get(command).execute(client, message, args, config); } catch (error) { - console.stack; - message.channel.send({embeds: [{ - "title": "<:AnitroxError:809651936563429416> **Something went wrong!**", - "description": error.stack, - "color": 13632027, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": config.footerTxt - }, - }]}); + console.stack(); + message.channel.send({ + embeds: [{ + title: '<:AnitroxError:809651936563429416> **Something went wrong!**', + description: error.stack, + color: 13632027, + footer: { + icon_url: message.author.displayAvatarURL(), + text: config.footerTxt + } + }] + }); } }); -client.login(config.token); \ No newline at end of file +client.login(config.token); From e3318d26c79abd2ffd6bf577a088cfc260ca536a Mon Sep 17 00:00:00 2001 From: Nathaniel Mason Date: Fri, 22 Apr 2022 02:53:03 +0100 Subject: [PATCH 06/15] use the new client.application.commands to generate slash command interfaces --- commands/8ball.js | 9 ++++++++- commands/avatar.js | 14 ++++++++++++++ commands/bonk.js | 8 ++++++++ commands/cheese.js | 10 +++++++++- commands/choose.js | 1 + commands/contributors.js | 1 + commands/cuddle.js | 8 ++++++++ commands/eval.js | 8 ++++++++ commands/help.js | 2 +- commands/hug.js | 8 ++++++++ commands/info.js | 1 + commands/invite.js | 2 +- commands/kiss.js | 8 ++++++++ commands/leskiss.js | 8 ++++++++ commands/lick.js | 8 ++++++++ commands/nom.js | 8 ++++++++ commands/pat.js | 8 ++++++++ commands/ping.js | 1 + commands/poke.js | 8 ++++++++ commands/reload.js | 1 + commands/restart.js | 1 + commands/setnick.js | 8 ++++++++ commands/slap.js | 8 ++++++++ commands/snuggle.js | 8 ++++++++ commands/stop.js | 1 + commands/uinfo.js | 15 ++++++++++++++- start.js | 34 ++++++++++++++++++++++++++-------- 27 files changed, 184 insertions(+), 13 deletions(-) diff --git a/commands/8ball.js b/commands/8ball.js index f196c63..668cf31 100644 --- a/commands/8ball.js +++ b/commands/8ball.js @@ -1,8 +1,15 @@ +const { Constants } = require('discord.js'); + module.exports = { name: require('path').parse(__filename).name, description: 'Ask Anitrox a question, any question! and they will answer it!', - syntax: ['[Question]'], + options: [{ + name: 'question', + description: 'The question to ask Anitrox', + required: true, + type: Constants.ApplicationCommandOptionTypes.STRING + }], async execute (client, message, args, config) { const index = Math.floor(Math.random() * config.answers.length); diff --git a/commands/avatar.js b/commands/avatar.js index 16159ef..ee831cd 100644 --- a/commands/avatar.js +++ b/commands/avatar.js @@ -1,7 +1,21 @@ +const { Constants } = require('discord.js'); + module.exports = { name: require('path').parse(__filename).name, description: "Gets a user's avatar.", + options: [{ + name: 'user', + description: 'Another user', + required: false, + type: Constants.ApplicationCommandOptionTypes.USER + }, + { + name: 'userid', + description: "Another user's ID", + required: false, + type: Constants.ApplicationCommandOptionTypes.INTEGER + }], async execute (client, message, args, config) { const user = message.mentions.users.first() || client.users.cache.get(args[0]) || message.author; diff --git a/commands/bonk.js b/commands/bonk.js index bc4ffb5..e1088ac 100644 --- a/commands/bonk.js +++ b/commands/bonk.js @@ -1,7 +1,15 @@ +const { Constants } = require('discord.js'); + module.exports = { name: require('path').parse(__filename).name, description: 'Bonks a user!', + options: [{ + name: 'user', + description: 'The user to bonk', + required: true, + type: Constants.ApplicationCommandOptionTypes.USER + }], async execute (client, message, _, config) { const taggedUser = message.mentions.users.first(); diff --git a/commands/cheese.js b/commands/cheese.js index 94cc4a9..4721efc 100644 --- a/commands/cheese.js +++ b/commands/cheese.js @@ -1,7 +1,15 @@ +const { Constants } = require('discord.js'); + module.exports = { name: require('path').parse(__filename).name, - description: 'Cheese an user, or run just ``n!cheese`` for a surprise :eyes:', + description: 'Cheese a user, or run with no arguments for a surprise :eyes:', + options: [{ + name: 'user', + description: 'The user to cheese', + required: false, + type: Constants.ApplicationCommandOptionTypes.USER + }], async execute (_0, message, _1, config) { const taggedUser = message.mentions.users.first(); diff --git a/commands/choose.js b/commands/choose.js index bb754e3..083b518 100644 --- a/commands/choose.js +++ b/commands/choose.js @@ -2,6 +2,7 @@ module.exports = { name: require('path').parse(__filename).name, description: 'Give some lines of input, and get one back at random', + options: [], async execute (client, message, _, config) { const avatarURL = message.author.displayAvatarURL(); diff --git a/commands/contributors.js b/commands/contributors.js index 3538684..17e8c9a 100644 --- a/commands/contributors.js +++ b/commands/contributors.js @@ -2,6 +2,7 @@ module.exports = { name: require('path').parse(__filename).name, description: 'Attributions to open source components used by Anitrox', + options: [], async execute (_0, message, _1, config) { await message.channel.send({ diff --git a/commands/cuddle.js b/commands/cuddle.js index 7c6466a..1beac8e 100644 --- a/commands/cuddle.js +++ b/commands/cuddle.js @@ -1,3 +1,5 @@ +const { Constants } = require('discord.js'); + const gifchoices = [ 'https://i.pinimg.com/originals/4d/89/d7/4d89d7f963b41a416ec8a55230dab31b.gif', 'https://media1.tenor.com/images/6d73b0a9cadef5310be4b6160d2f959a/tenor.gif?itemid=12099823', @@ -9,6 +11,12 @@ module.exports = { name: require('path').parse(__filename).name, description: 'Cuddle a user!', + options: [{ + name: 'user', + description: 'The user to cuddle', + required: true, + type: Constants.ApplicationCommandOptionTypes.USER + }], async execute (client, message, _, config) { const taggedUser = message.mentions.users.first(); diff --git a/commands/eval.js b/commands/eval.js index d288c7d..5a2493f 100644 --- a/commands/eval.js +++ b/commands/eval.js @@ -1,9 +1,17 @@ +const { Constants } = require('discord.js'); + const { inspect } = require('util'); module.exports = { name: require('path').parse(__filename).name, description: 'Executes JS code', + options: [{ + name: 'text', + description: 'The string to evaluate', + required: true, + type: Constants.ApplicationCommandOptionTypes.STRING + }], async execute (_, message, args, config) { if (message.author.id === config.ownerID) { diff --git a/commands/help.js b/commands/help.js index 94b9f76..a62e9e5 100644 --- a/commands/help.js +++ b/commands/help.js @@ -2,7 +2,7 @@ module.exports = { name: require('path').parse(__filename).name, description: 'Get help on anything from commands, to what the bot does! just not your homework..', - syntax: '', + options: [], async execute (_0, message, _1, config) { await message.channel.send({ diff --git a/commands/hug.js b/commands/hug.js index 5ded0cd..be6a8ad 100644 --- a/commands/hug.js +++ b/commands/hug.js @@ -1,3 +1,5 @@ +const { Constants } = require('discord.js'); + const gifchoices = [ 'https://cdn.discordapp.com/attachments/803658122299572255/807670647920001044/hug2.gif', 'https://cdn.discordapp.com/attachments/803658122299572255/807670797983285268/hug1.gif', @@ -10,6 +12,12 @@ module.exports = { name: require('path').parse(__filename).name, description: 'Hugs a user!', + options: [{ + name: 'user', + description: 'The user to hug', + required: true, + type: Constants.ApplicationCommandOptionTypes.USER + }], async execute (client, message, _, config) { const taggedUser = message.mentions.users.first(); diff --git a/commands/info.js b/commands/info.js index 930b86b..f99181d 100644 --- a/commands/info.js +++ b/commands/info.js @@ -18,6 +18,7 @@ module.exports = { name: require('path').parse(__filename).name, description: 'Shows bot and host information', + options: [], async execute (client, message, _, config) { const os = require('os'); diff --git a/commands/invite.js b/commands/invite.js index e373fbf..76e85b1 100644 --- a/commands/invite.js +++ b/commands/invite.js @@ -2,7 +2,7 @@ module.exports = { name: require('path').parse(__filename).name, description: 'Add Anitrox to your beautiful server!', - syntax: [], + options: [], async execute (_0, message, _1, config) { await message.channel.send({ diff --git a/commands/kiss.js b/commands/kiss.js index e79bfd9..e36d0cc 100644 --- a/commands/kiss.js +++ b/commands/kiss.js @@ -1,3 +1,5 @@ +const { Constants } = require('discord.js'); + const gifchoices = [ 'https://cdn.discordapp.com/attachments/803658122299572255/807671954055626812/kiss5.gif', 'https://cdn.discordapp.com/attachments/803658122299572255/807671956236140554/kiss2.gif', @@ -10,6 +12,12 @@ module.exports = { name: require('path').parse(__filename).name, description: 'Kisses a user!', + options: [{ + name: 'user', + description: 'The user to kiss', + required: true, + type: Constants.ApplicationCommandOptionTypes.USER + }], async execute (client, message, _, config) { const taggedUser = message.mentions.users.first(); diff --git a/commands/leskiss.js b/commands/leskiss.js index 1458094..8758203 100644 --- a/commands/leskiss.js +++ b/commands/leskiss.js @@ -1,3 +1,5 @@ +const { Constants } = require('discord.js'); + const gifchoices = [ 'https://cdn.discordapp.com/attachments/793537380330111028/803833954750038066/gif5.gif', 'https://cdn.discordapp.com/attachments/793537380330111028/803833959338475550/gif12.gif', @@ -20,6 +22,12 @@ module.exports = { name: require('path').parse(__filename).name, description: 'Lesbian kiss <:lesbian:803831629428686849>', + options: [{ + name: 'user', + description: 'The user to kiss', + required: true, + type: Constants.ApplicationCommandOptionTypes.USER + }], async execute (client, message, _, config) { const taggedUser = message.mentions.users.first(); diff --git a/commands/lick.js b/commands/lick.js index f4490b5..85d6de3 100644 --- a/commands/lick.js +++ b/commands/lick.js @@ -1,3 +1,5 @@ +const { Constants } = require('discord.js'); + const gifchoices = [ 'https://cdn.discordapp.com/attachments/803658122299572255/805314244123951114/cef569820773b0f5d54ee34cfa18e1f8.gif', 'https://cdn.lowgif.com/full/2027501b8fa5225c-.gif', @@ -9,6 +11,12 @@ module.exports = { name: require('path').parse(__filename).name, description: 'Licks a user!', + options: [{ + name: 'user', + description: 'The user to lick', + required: true, + type: Constants.ApplicationCommandOptionTypes.USER + }], async execute (client, message, _, config) { const taggedUser = message.mentions.users.first(); diff --git a/commands/nom.js b/commands/nom.js index fc63286..8f319e7 100644 --- a/commands/nom.js +++ b/commands/nom.js @@ -1,3 +1,5 @@ +const { Constants } = require('discord.js'); + const gifchoices = [ 'https://i.imgur.com/Ns1RBzX.gif', 'https://cdn.lowgif.com/full/2027501b8fa5225c-.gif', @@ -9,6 +11,12 @@ module.exports = { name: require('path').parse(__filename).name, description: 'Noms an user!', + options: [{ + name: 'user', + description: 'The user to nom', + required: true, + type: Constants.ApplicationCommandOptionTypes.USER + }], async execute (client, message, _, config) { const taggedUser = message.mentions.users.first(); diff --git a/commands/pat.js b/commands/pat.js index eecaea4..4e843a7 100644 --- a/commands/pat.js +++ b/commands/pat.js @@ -1,3 +1,5 @@ +const { Constants } = require('discord.js'); + const gifchoices = [ 'https://cdn.discordapp.com/attachments/803658122299572255/803708174293008474/tenor.gif', 'https://community.gamepress.gg/uploads/default/original/3X/0/a/0a762099c5ad6de9ca5f13dd22a7e45884a99eb3.gif', @@ -8,6 +10,12 @@ module.exports = { name: require('path').parse(__filename).name, description: 'Pats a user!', + options: [{ + name: 'user', + description: 'The user to pat', + required: true, + type: Constants.ApplicationCommandOptionTypes.USER + }], async execute (client, message, _, config) { const taggedUser = message.mentions.users.first(); diff --git a/commands/ping.js b/commands/ping.js index bbed30c..5163a4e 100644 --- a/commands/ping.js +++ b/commands/ping.js @@ -2,6 +2,7 @@ module.exports = { name: require('path').parse(__filename).name, description: 'Gets bot ping', + options: [], async execute (client, message, _, config) { const index = Math.floor(Math.random() * config.locations.length); diff --git a/commands/poke.js b/commands/poke.js index 903e45a..830c435 100644 --- a/commands/poke.js +++ b/commands/poke.js @@ -1,3 +1,5 @@ +const { Constants } = require('discord.js'); + const gifchoices = [ 'https://i.pinimg.com/originals/b4/95/fb/b495fb19f4b9a1b04f48297b676c497b.gif', 'https://i.imgur.com/H7Ok5tn.gif', @@ -8,6 +10,12 @@ module.exports = { name: require('path').parse(__filename).name, description: 'Pokes a user!', + options: [{ + name: 'user', + description: 'The user to poke', + required: true, + type: Constants.ApplicationCommandOptionTypes.USER + }], async execute (client, message, _, config) { const taggedUser = message.mentions.users.first(); diff --git a/commands/reload.js b/commands/reload.js index b4434d9..3bee5af 100644 --- a/commands/reload.js +++ b/commands/reload.js @@ -2,6 +2,7 @@ module.exports = { name: require('path').parse(__filename).name, description: 'Reloads a command', + options: [], async execute (client, message, args, config) { const avatarURL = message.author.displayAvatarURL(); diff --git a/commands/restart.js b/commands/restart.js index 8006701..09482cd 100644 --- a/commands/restart.js +++ b/commands/restart.js @@ -2,6 +2,7 @@ module.exports = { name: require('path').parse(__filename).name, description: 'Restarts the bot', + options: [], async execute (client, message, _, config) { if (message.author.id === config.ownerID) { diff --git a/commands/setnick.js b/commands/setnick.js index d63e0c5..ca71b01 100644 --- a/commands/setnick.js +++ b/commands/setnick.js @@ -1,7 +1,15 @@ +const { Constants } = require('discord.js'); + module.exports = { name: require('path').parse(__filename).name, description: 'Sets your nickname', + options: [{ + name: 'name', + description: 'The new nickname', + required: true, + type: Constants.ApplicationCommandOptionTypes.STRING + }], async execute (client, message, args, config) { const avatarURL = message.author.displayAvatarURL(); diff --git a/commands/slap.js b/commands/slap.js index 9146866..2b0beb5 100644 --- a/commands/slap.js +++ b/commands/slap.js @@ -1,7 +1,15 @@ +const { Constants } = require('discord.js'); + module.exports = { name: require('path').parse(__filename).name, description: 'Slaps an user!', + options: [{ + name: 'user', + description: 'The user to slap', + required: true, + type: Constants.ApplicationCommandOptionTypes.USER + }], async execute (client, message, _, config) { const taggedUser = message.mentions.users.first(); diff --git a/commands/snuggle.js b/commands/snuggle.js index 4322d9f..4c54797 100644 --- a/commands/snuggle.js +++ b/commands/snuggle.js @@ -1,3 +1,5 @@ +const { Constants } = require('discord.js'); + const gifchoices = [ 'https://media.discordapp.net/attachments/803658122299572255/806775382995894282/anime-couple-snuggle-gif-5.gif?width=450&height=238', 'https://media.discordapp.net/attachments/803658122299572255/806775411928989726/snuggl1.gif', @@ -8,6 +10,12 @@ module.exports = { name: require('path').parse(__filename).name, description: 'Snuggle an user!', + options: [{ + name: 'user', + description: 'The user to snuggle', + required: true, + type: Constants.ApplicationCommandOptionTypes.USER + }], async execute (client, message, _, config) { const taggedUser = message.mentions.users.first(); diff --git a/commands/stop.js b/commands/stop.js index f878c80..d98d512 100644 --- a/commands/stop.js +++ b/commands/stop.js @@ -2,6 +2,7 @@ module.exports = { name: require('path').parse(__filename).name, description: "IT'S TIME TO STOP!... the bot", + options: [], async execute (_0, message, _1, config) { if (message.author.id === config.ownerID) { diff --git a/commands/uinfo.js b/commands/uinfo.js index 2ed0b0f..383d94f 100644 --- a/commands/uinfo.js +++ b/commands/uinfo.js @@ -1,8 +1,21 @@ +const { Constants } = require('discord.js'); + module.exports = { name: require('path').parse(__filename).name, description: 'Gets info about an user, such as ID, Discord Join date and more', - syntax: '', + options: [{ + name: 'user', + description: 'Another user', + required: false, + type: Constants.ApplicationCommandOptionTypes.USER + }, + { + name: 'userid', + description: "Another user's ID", + required: false, + type: Constants.ApplicationCommandOptionTypes.INTEGER + }], async execute (_0, message, _1, config) { const user = message.mentions.users.first() || message.member; diff --git a/start.js b/start.js index 778ee15..9fe1db4 100755 --- a/start.js +++ b/start.js @@ -5,14 +5,12 @@ const Discord = require('discord.js'); const config = require('./config.json'); console.log('Starting!'); const client = new Discord.Client({ intents: config.intents.map(intent => eval(`Discord.Intents.FLAGS.${intent}`)) }); + client.commands = new Discord.Collection(); - -const commandFiles = fs.readdirSync('./commands').filter(file => file.endsWith('.js')); - -for (const file of commandFiles) { +fs.readdirSync('./commands').filter(file => file.endsWith('.js')).forEach(file => { const command = require(`./commands/${file}`); client.commands.set(command.name, command); -} +}); client.generateErrorMessage = (errorMsg, avatarURL) => ({ embeds: [{ @@ -33,8 +31,28 @@ client.generateErrorMessage = (errorMsg, avatarURL) => ({ client.on('error', (e) => console.log(`[ERROR] ${e}`)); client.on('warn', (e) => (`[WARN] ${e}`)); -client.once('ready', () => { - console.clear(); +client.once('ready', async () => { + const commands = config.sandbox ? client.guilds.cache.get(config.sandboxGuild)?.commands : client.application.commands; + + if (config.sandbox) { + console.log('deleting previous commands from sandbox'); + const localCommands = await commands.fetch(); + localCommands.forEach(async x => { + await commands.delete(x); + }); + + // console.log('deleting global commands'); + // const globalCommands = await client.application.commands.fetch(); + // globalCommands.forEach(async x => { + // await client.application.commands.delete(x); + // }); + } + + client.commands.forEach(async command => { + await commands.create(command); + }); + + // console.clear(); console.log(' ___ _ __ '); console.log(' / | ____ (_) /__________ _ __'); console.log(' / /| | / __ \\/ / __/ ___/ __ \\| |/_/'); @@ -62,7 +80,7 @@ client.on('messageCreate', async (message) => { try { await client.commands.get(command).execute(client, message, args, config); } catch (error) { - console.stack(); + console.trace(); message.channel.send({ embeds: [{ title: '<:AnitroxError:809651936563429416> **Something went wrong!**', From ab2cd6bd7ddcbcc0aee544f329f5062aefa2fe32 Mon Sep 17 00:00:00 2001 From: Nathaniel Mason Date: Fri, 22 Apr 2022 05:44:02 +0100 Subject: [PATCH 07/15] Add (almost complete) slash command support --- commands/8ball.js | 53 +++++++++++++++------------- commands/avatar.js | 24 ++++++++----- commands/bonk.js | 45 +++++++++++++----------- commands/cheese.js | 44 ++++++++++++----------- commands/choose.js | 41 ++++++++++++---------- commands/contributors.js | 16 ++++++--- commands/cuddle.js | 48 +++++++++++++------------ commands/eval.js | 29 +++++++++------ commands/help.js | 16 ++++++--- commands/hug.js | 47 +++++++++++++------------ commands/info.js | 16 ++++++--- commands/invite.js | 16 ++++++--- commands/kiss.js | 47 +++++++++++++------------ commands/leskiss.js | 47 +++++++++++++------------ commands/lick.js | 46 ++++++++++++------------ commands/nom.js | 47 +++++++++++++------------ commands/pat.js | 46 ++++++++++++------------ commands/ping.js | 16 ++++++--- commands/poke.js | 47 +++++++++++++------------ commands/reload.js | 38 ++++++++++++-------- commands/restart.js | 20 +++++++---- commands/setnick.js | 76 +++++++++++++++++++++++----------------- commands/slap.js | 44 ++++++++++++----------- commands/snuggle.js | 47 +++++++++++++------------ commands/stop.js | 29 +++++++++------ commands/uinfo.js | 42 +++++++++++----------- start.js | 41 ++++++++++++---------- 27 files changed, 585 insertions(+), 443 deletions(-) diff --git a/commands/8ball.js b/commands/8ball.js index 668cf31..81b6ed8 100644 --- a/commands/8ball.js +++ b/commands/8ball.js @@ -11,32 +11,37 @@ module.exports = { type: Constants.ApplicationCommandOptionTypes.STRING }], - async execute (client, message, args, config) { + async parseMessage (client, config, message, args) { + await message.channel.send(this.handle(client, config, message.author, args.slice(0).join(' '))); + }, + + async parseInteraction (client, config, interaction) { + await interaction.reply(this.handle(client, config, interaction.user, interaction.options.getString('question'))); + }, + + handle (client, config, user, question) { const index = Math.floor(Math.random() * config.answers.length); const answer = config.answers[index]; - const question = args.slice(0).join(' '); - const avatarURL = message.author.displayAvatarURL(); + const avatarURL = user.displayAvatarURL(); - if (!question) { - await message.channel.send(client.generateErrorMessage('You need to ask a question!', avatarURL)); - } else { - await message.channel.send({ - embeds: [{ - title: ':8ball: 8Ball', - description: `Your amazing question: **${question}**`, - color: 9442302, - footer: { - icon_url: avatarURL, - text: config.footerTxt - }, - fields: [ - { - name: 'Answer', - value: `${answer}` - } - ] - }] - }); - } + if (!question) return client.generateErrorMessage('You need to ask a question!', avatarURL); + + return { + embeds: [{ + title: ':8ball: 8Ball', + description: `Your amazing question: **${question}**`, + color: 9442302, + footer: { + icon_url: avatarURL, + text: config.footerTxt + }, + fields: [ + { + name: 'Answer', + value: `${answer}` + } + ] + }] + }; } }; diff --git a/commands/avatar.js b/commands/avatar.js index ee831cd..53d203e 100644 --- a/commands/avatar.js +++ b/commands/avatar.js @@ -14,24 +14,32 @@ module.exports = { name: 'userid', description: "Another user's ID", required: false, - type: Constants.ApplicationCommandOptionTypes.INTEGER + type: Constants.ApplicationCommandOptionTypes.STRING }], - async execute (client, message, args, config) { - const user = message.mentions.users.first() || client.users.cache.get(args[0]) || message.author; + async parseMessage (client, config, message, args) { + const target = message.mentions.users.first() || client.users.cache.get(args[0]) || message.author; + await message.channel.send(this.handle(client, config, message.author, target)); + }, - await message.channel.send({ + async parseInteraction (client, config, interaction) { + const target = interaction.options.getUser('user') || client.users.cache.get(interaction.options.getString('userid')) || interaction.user; + await interaction.reply(this.handle(client, config, interaction.user, target)); + }, + + handle (_, config, user, target) { + return { embeds: [{ - title: `:frame_photo: ${user.username}'s Beautiful Avatar!`, + title: `:frame_photo: ${target.username}'s Beautiful Avatar!`, color: 9442302, footer: { - icon_url: message.author.displayAvatarURL(), + icon_url: user.displayAvatarURL(), text: config.footerTxt }, image: { - url: user.displayAvatarURL() + url: target.displayAvatarURL() } }] - }); + }; } }; diff --git a/commands/bonk.js b/commands/bonk.js index e1088ac..0dff2b4 100644 --- a/commands/bonk.js +++ b/commands/bonk.js @@ -11,27 +11,30 @@ module.exports = { type: Constants.ApplicationCommandOptionTypes.USER }], - async execute (client, message, _, config) { - const taggedUser = message.mentions.users.first(); - const avatarURL = message.author.displayAvatarURL(); + async parseMessage (client, config, message) { + await message.channel.send(this.handle(client, config, message.author, message.mentions.users.first())); + }, - if (!taggedUser) { - await message.channel.send(client.generateErrorMessage('You need to @mention a user!', avatarURL)); - } else { - await message.channel.send({ - embeds: [{ - title: ' Bonk', - description: `${taggedUser} You have been bonked by ${message.author}!`, - color: 9442302, - footer: { - icon_url: avatarURL, - text: config.footerTxt - }, - image: { - url: 'https://cdn.discordapp.com/attachments/793537380330111028/801194481549312060/HappyBONK.gif' - } - }] - }); - } + async parseInteraction (client, config, interaction) { + await interaction.reply(this.handle(client, config, interaction.user, interaction.options.getUser('user'))); + }, + + handle (client, config, user, target) { + if (!target) return client.generateErrorMessage('You need to @mention a user!', user.displayAvatarURL()); + + return { + embeds: [{ + title: ' Bonk', + description: `${target} You have been bonked by ${user}!`, + color: 9442302, + footer: { + icon_url: user.displayAvatarURL(), + text: config.footerTxt + }, + image: { + url: 'https://cdn.discordapp.com/attachments/793537380330111028/801194481549312060/HappyBONK.gif' + } + }] + }; } }; diff --git a/commands/cheese.js b/commands/cheese.js index 4721efc..38b4f5e 100644 --- a/commands/cheese.js +++ b/commands/cheese.js @@ -11,26 +11,30 @@ module.exports = { type: Constants.ApplicationCommandOptionTypes.USER }], - async execute (_0, message, _1, config) { - const taggedUser = message.mentions.users.first(); + async parseMessage (client, config, message) { + await message.channel.send(this.handle(client, config, message.author, message.mentions.users.first())); + }, - if (!taggedUser) { - await message.channel.send('*slams cheese on desk*\n**Cheese.** https://www.youtube.com/watch?v=Or4IE8fkpn4'); - } else { - await message.channel.send({ - embeds: [{ - title: ':cheese: Cheesed', - description: `${taggedUser} You have been cheesed by ${message.author}!`, - color: 16312092, - footer: { - icon_url: message.author.displayAvatarURL(), - text: config.footerTxt - }, - image: { - url: 'https://cdn.discordapp.com/attachments/803658122299572255/812867714368536636/R06325af354168febcafd96b8328b7590.png' - } - }] - }); - } + async parseInteraction (client, config, interaction) { + await interaction.reply(this.handle(client, config, interaction.user, interaction.options.getUser('user'))); + }, + + handle (_, config, user, target) { + if (!target) return '*slams cheese on desk*\n**Cheese.** https://www.youtube.com/watch?v=Or4IE8fkpn4'; + + return { + embeds: [{ + title: ':cheese: Cheesed', + description: `${target} You have been cheesed by ${user}!`, + color: 16312092, + footer: { + icon_url: user.displayAvatarURL(), + text: config.footerTxt + }, + image: { + url: 'https://cdn.discordapp.com/attachments/803658122299572255/812867714368536636/R06325af354168febcafd96b8328b7590.png' + } + }] + }; } }; diff --git a/commands/choose.js b/commands/choose.js index 083b518..023bd50 100644 --- a/commands/choose.js +++ b/commands/choose.js @@ -4,27 +4,32 @@ module.exports = { description: 'Give some lines of input, and get one back at random', options: [], - async execute (client, message, _, config) { - const avatarURL = message.author.displayAvatarURL(); + async parseMessage (client, config, message, args) { let [head, ...options] = message.content.split(/\s*\n\s*/); head = head.slice(this.name.length + config.prefix.length); if (head) options.push(head); + await message.channel.send(this.handle(client, config, message.author, options)); + }, - if (!options.length) { - await message.channel.send(client.generateErrorMessage('You need to provide some input!', avatarURL)); - } else { - const answer = options[Math.floor(Math.random() * options.length)]; - await message.channel.send({ - embeds: [{ - title: 'I have made my decision:', - description: answer, - color: 8311585, - footer: { - icon_url: avatarURL, - text: config.footerTxt - } - }] - }); - } + // TODO: Figure out variable input + async parseInteraction (client, config, interaction) { + await interaction.reply(this.handle(client, config, interaction.user, interaction.options.getString('question'))); + }, + + handle (client, config, user, options) { + if (!options.length) return client.generateErrorMessage('You need to provide some input!', user.displayAvatarURL()); + + const answer = options[Math.floor(Math.random() * options.length)]; + return { + embeds: [{ + title: 'I have made my decision:', + description: answer, + color: 8311585, + footer: { + icon_url: user.displayAvatarURL(), + text: config.footerTxt + } + }] + }; } }; diff --git a/commands/contributors.js b/commands/contributors.js index 17e8c9a..9b11355 100644 --- a/commands/contributors.js +++ b/commands/contributors.js @@ -4,14 +4,22 @@ module.exports = { description: 'Attributions to open source components used by Anitrox', options: [], - async execute (_0, message, _1, config) { - await message.channel.send({ + async parseMessage (_, config, message) { + await message.channel.send(this.handle(config, message.author)); + }, + + async parseInteraction (_, config, interaction) { + await interaction.reply(this.handle(config, interaction.user)); + }, + + handle (config, user) { + return { embeds: [{ title: 'Contributors', description: 'Links to check out our contributors!', color: 52508, footer: { - icon_url: message.author.displayAvatarURL(), + icon_url: user.displayAvatarURL(), text: config.footerTxt }, thumbnail: { @@ -32,6 +40,6 @@ module.exports = { } ] }] - }); + }; } }; diff --git a/commands/cuddle.js b/commands/cuddle.js index 1beac8e..bbf5e61 100644 --- a/commands/cuddle.js +++ b/commands/cuddle.js @@ -18,29 +18,31 @@ module.exports = { type: Constants.ApplicationCommandOptionTypes.USER }], - async execute (client, message, _, config) { - const taggedUser = message.mentions.users.first(); - const index = Math.floor(Math.random() * gifchoices.length); - const gif = (gifchoices[index]); - const avatarURL = message.author.displayAvatarURL(); + async parseMessage (client, config, message) { + await message.channel.send(this.handle(client, config, message.author, message.mentions.users.first())); + }, - if (!taggedUser) { - await message.channel.send(client.generateErrorMessage('You need to @mention a user!', avatarURL)); - } else { - await message.channel.send({ - embeds: [{ - title: ':heart: Cuddle', - description: `${taggedUser} You have been cuddled by ${message.author}!`, - color: 9442302, - footer: { - icon_url: avatarURL, - text: config.footerTxt - }, - image: { - url: gif - } - }] - }); - } + async parseInteraction (client, config, interaction) { + await interaction.reply(this.handle(client, config, interaction.user, interaction.options.getUser('user'))); + }, + + handle (client, config, user, target) { + if (!target) return client.generateErrorMessage('You need to @mention a user!', user.displayAvatarURL()); + + const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; + return { + embeds: [{ + title: ':heart: Cuddle', + description: `${target} You have been cuddled by ${user}!`, + color: 9442302, + footer: { + icon_url: user.displayAvatarURL(), + text: config.footerTxt + }, + image: { + url: gif + } + }] + }; } }; diff --git a/commands/eval.js b/commands/eval.js index 5a2493f..df12710 100644 --- a/commands/eval.js +++ b/commands/eval.js @@ -1,37 +1,44 @@ const { Constants } = require('discord.js'); - const { inspect } = require('util'); module.exports = { name: require('path').parse(__filename).name, - description: 'Executes JS code', + description: 'handles JS code', options: [{ - name: 'text', + name: 'code', description: 'The string to evaluate', required: true, type: Constants.ApplicationCommandOptionTypes.STRING }], - async execute (_, message, args, config) { - if (message.author.id === config.ownerID) { + async parseMessage (client, config, message, args) { + await message.channel.send(this.handle(client, config, message.author, args.join(' '))); + }, + + async parseInteraction (client, config, interaction) { + await interaction.reply(this.handle(client, config, interaction.user, interaction.options.getString('code'))); + }, + + handle (_, config, user, code) { + if (user.id === config.ownerID) { try { - const code = args.join(' '); const evaled = inspect(eval(code)); - await message.channel.send(evaled, { code: 'xl' }); + // await message.channel.send(evaled, { code: 'xl' }); + return `\`\`\`js\n${evaled}\n\`\`\``; } catch (error) { - await message.channel.send({ + return { embeds: [{ title: '<:AnitroxError:809651936563429416> **Something went wrong! **', color: 13632027, footer: { - icon_url: message.author.displayAvatarURL(), + icon_url: user.displayAvatarURL(), text: config.footerTxt }, fields: [ { name: '**What Happened?**', - value: 'The command you tried to run failed to execute due to an error.' + value: 'The command you tried to run failed to handle due to an error.' }, { name: 'Error Info', @@ -39,7 +46,7 @@ module.exports = { } ] }] - }); + }; } }; } diff --git a/commands/help.js b/commands/help.js index a62e9e5..99ee3e5 100644 --- a/commands/help.js +++ b/commands/help.js @@ -4,14 +4,22 @@ module.exports = { description: 'Get help on anything from commands, to what the bot does! just not your homework..', options: [], - async execute (_0, message, _1, config) { - await message.channel.send({ + async parseMessage (client, config, message) { + await message.channel.send(this.handle(client, config, message.author)); + }, + + async parseInteraction (client, config, interaction) { + await interaction.reply(this.handle(client, config, interaction.user)); + }, + + handle (_, config, user) { + return { embeds: [{ title: 'HELP! SEYMOUR! THE BOT IS ON FIRE!', description: 'Get help on anything from commands, to what the bot does! just not your homework..', color: 9442302, footer: { - icon_url: message.author.displayAvatarURL(), + icon_url: user.displayAvatarURL(), text: `${config.footerTxt} | No mother it's just the northern lights` }, fields: [ @@ -25,6 +33,6 @@ module.exports = { } ] }] - }); + }; } }; diff --git a/commands/hug.js b/commands/hug.js index be6a8ad..b3d2f8e 100644 --- a/commands/hug.js +++ b/commands/hug.js @@ -19,28 +19,31 @@ module.exports = { type: Constants.ApplicationCommandOptionTypes.USER }], - async execute (client, message, _, config) { - const taggedUser = message.mentions.users.first(); - const avatarURL = message.author.displayAvatarURL(); + async parseMessage (client, config, message) { + await message.channel.send(this.handle(client, config, message.author, message.mentions.users.first())); + }, - if (!taggedUser) { - await message.channel.send(client.generateErrorMessage('You need to @mention a user!', avatarURL)); - } else { - const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; - await message.channel.send({ - embeds: [{ - title: ' Hug', - description: `${taggedUser} You have been hugged by ${message.author}!`, - color: 8311585, - footer: { - icon_url: avatarURL, - text: config.footerTxt - }, - image: { - url: gif - } - }] - }); - } + async parseInteraction (client, config, interaction) { + await interaction.reply(this.handle(client, config, interaction.user, interaction.options.getUser('user'))); + }, + + handle (client, config, user, target) { + if (!target) return client.generateErrorMessage('You need to @mention a user!', user.displayAvatarURL()); + + const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; + return { + embeds: [{ + title: ' Hug', + description: `${target} You have been hugged by ${user}!`, + color: 8311585, + footer: { + icon_url: user.displayAvatarURL(), + text: config.footerTxt + }, + image: { + url: gif + } + }] + }; } }; diff --git a/commands/info.js b/commands/info.js index f99181d..36ccdf4 100644 --- a/commands/info.js +++ b/commands/info.js @@ -20,18 +20,26 @@ module.exports = { description: 'Shows bot and host information', options: [], - async execute (client, message, _, config) { + async parseMessage (client, config, message) { + await message.channel.send(this.handle(client, config, message.author)); + }, + + async parseInteraction (client, config, interaction) { + await interaction.reply(this.handle(client, config, interaction.user)); + }, + + async handle (client, config, user) { const os = require('os'); const osu = require('node-os-utils'); const cpu = osu.cpu; - await message.channel.send({ + return { embeds: [{ title: '<:AnitroxInfo:809651936831733791> Information about Anitrox', description: "Everything you've ever wanted to know about your favorite bot, Anitrox!", color: 9442302, footer: { - icon_url: message.author.displayAvatarURL(), + icon_url: user.displayAvatarURL(), text: config.footerTxt }, thumbnail: { @@ -104,6 +112,6 @@ module.exports = { } ] }] - }); + }; } }; diff --git a/commands/invite.js b/commands/invite.js index 76e85b1..afc2376 100644 --- a/commands/invite.js +++ b/commands/invite.js @@ -4,14 +4,22 @@ module.exports = { description: 'Add Anitrox to your beautiful server!', options: [], - async execute (_0, message, _1, config) { - await message.channel.send({ + async parseMessage (client, config, message, args) { + await message.channel.send(this.handle(client, config, message.author, args.slice(0).join(' '))); + }, + + async parseInteraction (client, config, interaction) { + await interaction.reply(this.handle(client, config, interaction.user, interaction.options.getString('question'))); + }, + + handle (_, config, user) { + return { embeds: [{ title: 'Add Anitrox to your Server!', description: 'Weather you want stable, or that squeaky clean fresh PTB build, we gotchu.', color: 9442302, footer: { - icon_url: message.author.displayAvatarURL(), + icon_url: user.displayAvatarURL(), text: config.footerTxt }, thumbnail: { @@ -32,6 +40,6 @@ module.exports = { } ] }] - }); + }; } }; diff --git a/commands/kiss.js b/commands/kiss.js index e36d0cc..871257e 100644 --- a/commands/kiss.js +++ b/commands/kiss.js @@ -19,28 +19,31 @@ module.exports = { type: Constants.ApplicationCommandOptionTypes.USER }], - async execute (client, message, _, config) { - const taggedUser = message.mentions.users.first(); - const avatarURL = message.author.displayAvatarURL(); + async parseMessage (client, config, message) { + await message.channel.send(this.handle(client, config, message.author, message.mentions.users.first())); + }, - if (!taggedUser) { - await message.channel.send(client.generateErrorMessage('You need to @mention a user!', avatarURL)); - } else { - const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; - await message.channel.send({ - embeds: [{ - title: ':heart: Kiss', - description: `${taggedUser} You have been kissed by ${message.author}!`, - color: 9442302, - footer: { - icon_url: avatarURL, - text: config.footerTxt - }, - image: { - url: gif - } - }] - }); - } + async parseInteraction (client, config, interaction) { + await interaction.reply(this.handle(client, config, interaction.user, interaction.options.getUser('user'))); + }, + + handle (client, config, user, target) { + if (!target) return client.generateErrorMessage('You need to @mention a user!', user.displayAvaterURL()); + + const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; + return { + embeds: [{ + title: ':heart: Kiss', + description: `${target} You have been kissed by ${user}!`, + color: 9442302, + footer: { + icon_url: user.displayAvaterURL(), + text: config.footerTxt + }, + image: { + url: gif + } + }] + }; } }; diff --git a/commands/leskiss.js b/commands/leskiss.js index 8758203..89b34db 100644 --- a/commands/leskiss.js +++ b/commands/leskiss.js @@ -29,28 +29,31 @@ module.exports = { type: Constants.ApplicationCommandOptionTypes.USER }], - async execute (client, message, _, config) { - const taggedUser = message.mentions.users.first(); - const avatarURL = message.author.displayAvatarURL(); + async parseMessage (client, config, message) { + await message.channel.send(this.handle(client, config, message.author, message.mentions.users.first())); + }, - if (!taggedUser) { - await message.channel.send(client.generateErrorMessage('You need to @mention a user!', avatarURL)); - } else { - const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; - await message.channel.send({ - embeds: [{ - title: ':heart: <:lesbian:803831629428686849> Kiss', - description: `${taggedUser} You have been kissed by ${message.author}!`, - color: 8311585, - footer: { - icon_url: avatarURL, - text: config.footerTxt - }, - image: { - url: gif - } - }] - }); - } + async parseInteraction (client, config, interaction) { + await interaction.reply(this.handle(client, config, interaction.user, interaction.options.getUser('user'))); + }, + + handle (client, config, user, target) { + if (!target) return client.generateErrorMessage('You need to @mention a user!', user.displayAvatarURL()); + + const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; + return { + embeds: [{ + title: ':heart: <:lesbian:803831629428686849> Kiss', + description: `${target} You have been kissed by ${user}!`, + color: 8311585, + footer: { + icon_url: user.displayAvatarURL(), + text: config.footerTxt + }, + image: { + url: gif + } + }] + }; } }; diff --git a/commands/lick.js b/commands/lick.js index 85d6de3..abf6257 100644 --- a/commands/lick.js +++ b/commands/lick.js @@ -18,28 +18,30 @@ module.exports = { type: Constants.ApplicationCommandOptionTypes.USER }], - async execute (client, message, _, config) { - const taggedUser = message.mentions.users.first(); - const avatarURL = message.author.displayAvatarURL(); + async parseMessage (client, config, message) { + await message.channel.send(this.handle(client, config, message.author, message.mentions.users.first())); + }, - if (!taggedUser) { - await message.channel.send(client.generateErrorMessage('You need to @mention a user!', avatarURL)); - } else { - const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; - await message.channel.send({ - embeds: [{ - title: ' Lick', - description: `${taggedUser} You have been licked by ${message.author}!`, - color: 8311585, - footer: { - icon_url: avatarURL, - text: config.footerTxt - }, - image: { - url: gif - } - }] - }); - } + async parseInteraction (client, config, interaction) { + await interaction.reply(this.handle(client, config, interaction.user, interaction.options.getUser('user'))); + }, + + handle (client, config, user, target) { + if (!target) return client.generateErrorMessage('You need to @mention a user!', user.displayAvatarURL()); + const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; + return { + embeds: [{ + title: ' Lick', + description: `${target} You have been licked by ${user}!`, + color: 8311585, + footer: { + icon_url: user.displayAvatarURL(), + text: config.footerTxt + }, + image: { + url: gif + } + }] + }; } }; diff --git a/commands/nom.js b/commands/nom.js index 8f319e7..7d9dfc1 100644 --- a/commands/nom.js +++ b/commands/nom.js @@ -18,28 +18,31 @@ module.exports = { type: Constants.ApplicationCommandOptionTypes.USER }], - async execute (client, message, _, config) { - const taggedUser = message.mentions.users.first(); - const avatarURL = message.author.displayAvatarURL(); + async parseMessage (client, config, message) { + await message.channel.send(this.handle(client, config, message.author, message.mentions.users.first())); + }, - if (!taggedUser) { - await message.channel.send(client.generateErrorMessage('You need to @mention a user!', avatarURL)); - } else { - const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; - await message.channel.send({ - embeds: [{ - title: '<:BlobNomBlob:801241117919805510> Nom', - description: `${taggedUser} You have been nommed by ${message.author}!`, - color: 8311585, - footer: { - icon_url: avatarURL, - text: config.footerTxt - }, - image: { - url: gif - } - }] - }); - } + async parseInteraction (client, config, interaction) { + await interaction.reply(this.handle(client, config, interaction.user, interaction.options.getUser('user'))); + }, + + handle (client, config, user, target) { + if (!target) return client.generateErrorMessage('You need to @mention a user!', user.displayAvatarURL()); + + const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; + return { + embeds: [{ + title: '<:BlobNomBlob:801241117919805510> Nom', + description: `${target} You have been nommed by ${user}!`, + color: 8311585, + footer: { + icon_url: user.displayAvatarURL(), + text: config.footerTxt + }, + image: { + url: gif + } + }] + }; } }; diff --git a/commands/pat.js b/commands/pat.js index 4e843a7..03baec6 100644 --- a/commands/pat.js +++ b/commands/pat.js @@ -17,28 +17,30 @@ module.exports = { type: Constants.ApplicationCommandOptionTypes.USER }], - async execute (client, message, _, config) { - const taggedUser = message.mentions.users.first(); - const avatarURL = message.author.displayAvatarURL(); + async parseMessage (client, config, message) { + await message.channel.send(this.handle(client, config, message.author, message.mentions.users.first())); + }, - if (!taggedUser) { - await message.channel.send(client.generateErrorMessage('You need to @mention a user!', avatarURL)); - } else { - const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; - await message.channel.send({ - embeds: [{ - title: '<:pats:801238281286713355> Pat', - description: `${taggedUser} You have been patted by ${message.author}!`, - color: 8311585, - footer: { - icon_url: avatarURL, - text: config.footerTxt - }, - image: { - url: gif - } - }] - }); - } + async parseInteraction (client, config, interaction) { + await interaction.reply(this.handle(client, config, interaction.user, interaction.options.getUser('user'))); + }, + + handle (client, config, user, target) { + if (!target) return client.generateErrorMessage('You need to @mention a user!', user.displayAvatarURL()); + const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; + return { + embeds: [{ + title: '<:pats:801238281286713355> Pat', + description: `${target} You have been patted by ${user}!`, + color: 8311585, + footer: { + icon_url: user.displayAvatarURL(), + text: config.footerTxt + }, + image: { + url: gif + } + }] + }; } }; diff --git a/commands/ping.js b/commands/ping.js index 5163a4e..3988921 100644 --- a/commands/ping.js +++ b/commands/ping.js @@ -4,20 +4,28 @@ module.exports = { description: 'Gets bot ping', options: [], - async execute (client, message, _, config) { + async parseMessage (client, config, message, args) { + await message.channel.send(await this.handle(client, config, message.author, args.slice(0).join(' '))); + }, + + async parseInteraction (client, config, interaction) { + await interaction.reply(await this.handle(client, config, interaction.user, interaction.options.getString('question'))); + }, + + async handle (client, config, user) { const index = Math.floor(Math.random() * config.locations.length); const location = config.locations[index]; - await message.channel.send({ + return { embeds: [{ title: ':ping_pong: Ping', description: `**Pong!** We pinged **${location}** and got ${client.ws.ping} ms.`, color: 9442302, footer: { - icon_url: message.author.displayAvatarURL(), + icon_url: user.displayAvatarURL(), text: config.footerTxt } }] - }); + }; } }; diff --git a/commands/poke.js b/commands/poke.js index 830c435..52a9c3f 100644 --- a/commands/poke.js +++ b/commands/poke.js @@ -17,28 +17,31 @@ module.exports = { type: Constants.ApplicationCommandOptionTypes.USER }], - async execute (client, message, _, config) { - const taggedUser = message.mentions.users.first(); - const avatarURL = message.author.displayAvatarURL(); + async parseMessage (client, config, message) { + await message.channel.send(this.handle(client, config, message.author, message.mentions.users.first())); + }, - if (!taggedUser) { - await message.channel.send(client.generateErrorMessage('You need to @mention a user!', avatarURL)); - } else { - const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; - await message.channel.send({ - embeds: [{ - title: '👉 Poke!', - description: `${taggedUser} You have been poked by ${message.author}!`, - color: 8311585, - footer: { - icon_url: avatarURL, - text: config.footerTxt - }, - image: { - url: gif - } - }] - }); - } + async parseInteraction (client, config, interaction) { + await interaction.reply(this.handle(client, config, interaction.user, interaction.options.getUser('user'))); + }, + + handle (client, config, user, target) { + if (!target) return client.generateErrorMessage('You need to @mention a user!', user.displayAvatarURL()); + + const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; + return { + embeds: [{ + title: '👉 Poke!', + description: `${target} You have been poked by ${user}!`, + color: 8311585, + footer: { + icon_url: user.displayAvatarURL(), + text: config.footerTxt + }, + image: { + url: gif + } + }] + }; } }; diff --git a/commands/reload.js b/commands/reload.js index 3bee5af..00c3471 100644 --- a/commands/reload.js +++ b/commands/reload.js @@ -4,40 +4,50 @@ module.exports = { description: 'Reloads a command', options: [], - async execute (client, message, args, config) { - const avatarURL = message.author.displayAvatarURL(); - if (message.author.id === config.ownerID) { - if (!args.length) { - await message.channel.send(client.generateErrorMessage('You forgot to provide anything to reload, you pillock', avatarURL)); - } + async parseMessage (client, config, message, args) { + await message.channel.send(this.handle(client, config, message.author, args.split(' '))); + }, + + // TODO: figure out variable input (again) + async parseInteraction (client, config, interaction) { + await interaction.reply(this.handle(client, config, interaction.user)); + }, + + handle (client, config, user, args) { + if (user.id === config.ownerID) { + if (!args) return client.generateErrorMessage('You forgot to provide anything to reload, you pillock', user.displayAvatarURL()); + let returnMessage = ''; + args.forEach(async (arg) => { const commandName = arg.toLowerCase(); - const command = message.client.commands.get(commandName) || - message.client.commands.find(cmd => cmd.aliases && cmd.aliases.includes(commandName)); + const command = client.commands.get(commandName) || + client.commands.find(cmd => cmd.aliases && cmd.aliases.includes(commandName)); if (!command) { - await message.channel.send(client.generateErrorMessage(`There is no command with name or alias \`${commandName}\`, ${message.author}!`, avatarURL)); + returnMessage += `There is no command with name or alias \`${commandName}\`\n`; } else { delete require.cache[require.resolve(`./${command.name}.js`)]; try { const newCommand = require(`./${command.name}.js`); client.commands.set(newCommand.name, newCommand); - await message.channel.send(`<:AnitroxSuccess:809651936819019796> **Reloaded \`${command.name}\` successfully!**`); + returnMessage += `Successfully reloaded \`${commandName}\`\n`; console.log(`User reloaded ${command.name}.`); } catch (error) { console.error(error); - await message.channel.send(client.generateErrorMessage(`There was an error while reloading \`${command.name}\`:\n\`${error.message}\``, avatarURL)); + returnMessage += `There was an error while reloading \`${command.name}\`\n`; } } }); + + return returnMessage; } else { - message.channel.send({ + return { embeds: [{ title: '<:AnitroxDenied:809651936642203668> **403 Forbidden**', color: 13632027, footer: { - icon_url: avatarURL, + icon_url: user.displayAvatarURL(), text: config.footerTxt }, fields: [ @@ -47,7 +57,7 @@ module.exports = { } ] }] - }); + }; } } }; diff --git a/commands/restart.js b/commands/restart.js index 09482cd..ebd8577 100644 --- a/commands/restart.js +++ b/commands/restart.js @@ -4,18 +4,26 @@ module.exports = { description: 'Restarts the bot', options: [], - async execute (client, message, _, config) { - if (message.author.id === config.ownerID) { + async parseMessage (client, config, message, args) { + await message.channel.send(await this.handle(client, config, message.author, args.slice(0).join(' '))); + }, + + async parseInteraction (client, config, interaction) { + await interaction.reply(await this.handle(client, config, interaction.user, interaction.options.getString('question'))); + }, + + async handle (client, config, user) { + if (user.id === config.ownerID) { console.log('Anitrox is restarting now!'); - await message.channel.send(' Restarting...'); + // await message.channel.send(' Restarting...'); try { client.destroy(); await client.login(config.token); - await message.channel.send('<:NyabotSuccess:697211376740859914> Restart Successful'); console.log('All systems go'); - } catch (e) { console.log(e); } + return '<:NyabotSuccess:697211376740859914> Restart Successful'; + } catch (e) { console.error(e); } } else { - await message.channel.send('<:NyabotDenied:697145462565896194> Access Denied, You must be bot owner to execute this command.'); + return '<:NyabotDenied:697145462565896194> Access Denied, You must be bot owner to execute this command.'; } } }; diff --git a/commands/setnick.js b/commands/setnick.js index ca71b01..dd9ea3d 100644 --- a/commands/setnick.js +++ b/commands/setnick.js @@ -11,39 +11,49 @@ module.exports = { type: Constants.ApplicationCommandOptionTypes.STRING }], - async execute (client, message, args, config) { - const avatarURL = message.author.displayAvatarURL(); + async parseMessage (client, config, message, args) { + await message.channel.send(this.handle(client, config, message.author, args.slice(0).join(' '))); + }, - if (message.channel.permissionsFor(message.author).has('CHANGE_NICKNAME')) { - const newnick = args.slice(0).join(' '); - try { - await message.member.setNickname(newnick, "Nickname change requested by the server member. If you don't want users to be able to change their nickname disable 'CHANGE_NICKNAME' via Change Nickname in Roles."); - await message.channel.send({ - embeds: [{ - title: '<:AnitroxSuccess:809651936819019796> Nickname Changed', - color: 9442302, - footer: { - icon_url: message.author.displayAvatarURL(), - text: config.footerTxt - }, - fields: [ - { - name: 'Changed nickname successfully!', - value: `New Nickname: ${newnick}` - }, - { - name: 'New Nickname', - value: newnick, - inline: true - } - ] - }] - }); - } catch (error) { - await message.channel.send(client.generateErrorMessage('Failed to set user nickname. Does the bot have the correct permissions?', avatarURL)); - }; - } else { - await message.channel.send(client.generateErrorMessage('You need to have permission ``CHANGE_NICKNAME`` to change your nick!', avatarURL)); - } + async parseInteraction (client, config, interaction) { + await interaction.reply(this.handle(client, config, interaction.user, interaction.options.getString('question'))); + }, + + handle (client, config, user, newNick) { + return "Discord has an inbuilt slash command for this, so I think it's best we deprecate this"; + + // const avatarURL = message.author.displayAvatarURL(); + + // if (message.channel.permissionsFor(message.author).has('CHANGE_NICKNAME')) { + // const newnick = args.slice(0).join(' '); + // try { + // await message.member.setNickname(newnick, "Nickname change requested by the server member. If you don't want users to be able to change their nickname disable 'CHANGE_NICKNAME' via Change Nickname in Roles."); + // await message.channel.send({ + // embeds: [{ + // title: '<:AnitroxSuccess:809651936819019796> Nickname Changed', + // color: 9442302, + // footer: { + // icon_url: message.author.displayAvatarURL(), + // text: config.footerTxt + // }, + // fields: [ + // { + // name: 'Changed nickname successfully!', + // value: `New Nickname: ${newnick}` + // }, + // { + // name: 'New Nickname', + // value: newnick, + // inline: true + // } + // ] + // }] + // }); + // } catch (error) { + // await message.channel.send(client.generateErrorMessage('Failed to set user nickname. Does the bot have the correct permissions?', avatarURL)); + // }; + // } else { + // await message.channel.send(client.generateErrorMessage('You need to have permission ``CHANGE_NICKNAME`` to change your nick!', avatarURL)); + // } } }; diff --git a/commands/slap.js b/commands/slap.js index 2b0beb5..ac5d86d 100644 --- a/commands/slap.js +++ b/commands/slap.js @@ -11,27 +11,29 @@ module.exports = { type: Constants.ApplicationCommandOptionTypes.USER }], - async execute (client, message, _, config) { - const taggedUser = message.mentions.users.first(); - const avatarURL = message.author.displayAvatarURL(); + async parseMessage (client, config, message) { + await message.channel.send(this.handle(client, config, message.author, message.mentions.users.first())); + }, - if (!taggedUser) { - await message.channel.send(client.generateErrorMessage('You need to @mention a user!', avatarURL)); - } else { - await message.channel.send({ - embeds: [{ - title: ':anger: Slap', - description: `${taggedUser} You have been slapped by ${message.author}!`, - color: 9442302, - footer: { - icon_url: avatarURL, - text: config.footerTxt - }, - image: { - url: 'https://media1.tenor.com/images/b6d8a83eb652a30b95e87cf96a21e007/tenor.gif?itemid=10426943' - } - }] - }); - } + async parseInteraction (client, config, interaction) { + await interaction.reply(this.handle(client, config, interaction.user, interaction.options.getUser('user'))); + }, + + handle (client, config, user, target) { + if (!target) return client.generateErrorMessage('You need to @mention a user!', user.displayAvatarURL()); + return { + embeds: [{ + title: ':anger: Slap', + description: `${target} You have been slapped by ${user}!`, + color: 9442302, + footer: { + icon_url: user.displayAvatarURL(), + text: config.footerTxt + }, + image: { + url: 'https://media1.tenor.com/images/b6d8a83eb652a30b95e87cf96a21e007/tenor.gif?itemid=10426943' + } + }] + }; } }; diff --git a/commands/snuggle.js b/commands/snuggle.js index 4c54797..1eaeff7 100644 --- a/commands/snuggle.js +++ b/commands/snuggle.js @@ -17,28 +17,31 @@ module.exports = { type: Constants.ApplicationCommandOptionTypes.USER }], - async execute (client, message, _, config) { - const taggedUser = message.mentions.users.first(); - const avatarURL = message.author.displayAvatarURL(); + async parseMessage (client, config, message) { + await message.channel.send(this.handle(client, config, message.author, message.mentions.users.first())); + }, - if (!taggedUser) { - await message.channel.send(client.generateErrorMessage('You need to @mention a user!', avatarURL)); - } else { - const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; - await message.channel.send({ - embeds: [{ - title: '<:BlobSnuggleCat:806759753450782731> Snuggle', - description: `${taggedUser} You have been snuggled by ${message.author}!`, - color: 9442302, - footer: { - icon_url: avatarURL, - text: config.footerTxt - }, - image: { - url: gif - } - }] - }); - } + async parseInteraction (client, config, interaction) { + await interaction.reply(this.handle(client, config, interaction.user, interaction.options.getUser('user'))); + }, + + handle (client, config, user, target) { + if (!target) return client.generateErrorMessage('You need to @mention a user!', user.displayAvatarURL()); + + const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; + return { + embeds: [{ + title: '<:BlobSnuggleCat:806759753450782731> Snuggle', + description: `${target} You have been snuggled by ${user}!`, + color: 9442302, + footer: { + icon_url: user.displayAvatarURL(), + text: config.footerTxt + }, + image: { + url: gif + } + }] + }; } }; diff --git a/commands/stop.js b/commands/stop.js index d98d512..86d355f 100644 --- a/commands/stop.js +++ b/commands/stop.js @@ -4,33 +4,42 @@ module.exports = { description: "IT'S TIME TO STOP!... the bot", options: [], - async execute (_0, message, _1, config) { - if (message.author.id === config.ownerID) { - await message.channel.send({ + async parseMessage (client, config, message, args) { + await message.channel.send(await this.handle(client, config, message.author, args.slice(0).join(' '))); + process.exit(); + }, + + async parseInteraction (client, config, interaction) { + await interaction.reply(await this.handle(client, config, interaction.user, interaction.options.getString('question'))); + process.exit(); + }, + + async handle (_, config, user) { + if (user.id === config.ownerID) { + console.log('The bot is shutting down! Bye bye!'); + return { embeds: [{ title: ' **Shutting Down...**', description: 'See you next time!', color: 9442302, footer: { - icon_url: message.author.displayAvatarURL(), + icon_url: user.displayAvatarURL(), text: config.footerTxt } }] - }); - console.log('The bot is shutting down! Bye bye!'); - process.exit(); + }; } else { - await message.channel.send({ + return { embeds: [{ title: '<:AnitroxDenied:809651936642203668> 403 Forbidden', description: 'You need to be the bot owner to execute this command!', color: 13632027, footer: { - icon_url: message.author.displayAvatarURL(), + icon_url: user.displayAvatarURL(), text: config.footerTxt } }] - }); + }; } } }; diff --git a/commands/uinfo.js b/commands/uinfo.js index 383d94f..4e36d03 100644 --- a/commands/uinfo.js +++ b/commands/uinfo.js @@ -9,66 +9,68 @@ module.exports = { description: 'Another user', required: false, type: Constants.ApplicationCommandOptionTypes.USER - }, - { - name: 'userid', - description: "Another user's ID", - required: false, - type: Constants.ApplicationCommandOptionTypes.INTEGER }], - async execute (_0, message, _1, config) { - const user = message.mentions.users.first() || message.member; + async parseMessage (client, config, message) { + const target = message.mentions.members.first() || message.member; + await message.channel.send(this.handle(client, config, message.author, target)); + }, - await message.channel.send({ + async parseInteraction (client, config, interaction) { + const target = interaction.options.getUser('user') ? (await interaction.guild.members.fetch(interaction.options.getUser('user'))) : interaction.member; + await interaction.reply(this.handle(client, config, interaction.user, target)); + }, + + handle (client, config, user, target) { + return { embeds: [{ - title: `Everything you've ever wanted to know about ${user.user}!`, + title: `Everything you've ever wanted to know about ${target}!`, color: 9442302, footer: { - icon_url: message.author.displayAvatarURL(), + icon_url: user.displayAvatarURL(), text: config.footerTxt }, thumbnail: { - url: user.user.displayAvatarURL() + url: target.displayAvatarURL() }, fields: [ { name: 'Username', - value: user.user.username, + value: target.user.username, inline: true }, { name: 'Discriminator', - value: user.user.discriminator, + value: target.user.discriminator, inline: true }, { name: 'Full Username', - value: user.user.tag, + value: target.user.tag, inline: true }, { name: 'User Profile Picture', - value: user.user.displayAvatarURL() + value: target.user.displayAvatarURL() }, { name: 'User Status', - value: user.presence?.status ?? 'Error getting status, does the bot have the GUILD_PRESENCES intent?' + value: target.presence?.status ?? (config.intents.includes('GUILD_PRESENCES') ? 'Offline' : 'Missing GUILD_PRESENCES intent') // IMPORTANT NOTE: // There seems to be an issue where offline and invisible users return a null presense // I'll try to patch this soon if I can figure out why }, { name: 'User ID', - value: `\`${user.user.id}\`` + value: `\`${target.user.id}\`` }, { name: 'User Joined Discord', - value: user.user.createdAt.toString(), + value: target.user.createdAt.toString(), inline: true } ] }] - }); + }; } }; diff --git a/start.js b/start.js index 9fe1db4..675f5af 100755 --- a/start.js +++ b/start.js @@ -32,25 +32,26 @@ client.generateErrorMessage = (errorMsg, avatarURL) => ({ client.on('error', (e) => console.log(`[ERROR] ${e}`)); client.on('warn', (e) => (`[WARN] ${e}`)); client.once('ready', async () => { - const commands = config.sandbox ? client.guilds.cache.get(config.sandboxGuild)?.commands : client.application.commands; + // const commands = config.sandbox ? client.guilds.cache.get(config.sandboxGuild)?.commands : client.application.commands; - if (config.sandbox) { - console.log('deleting previous commands from sandbox'); - const localCommands = await commands.fetch(); - localCommands.forEach(async x => { - await commands.delete(x); - }); + // if (config.sandbox) { + // console.log('deleting previous commands from sandbox'); + // const localCommands = await commands.fetch(); + // localCommands.forEach(async x => { + // await commands.delete(x); + // }); - // console.log('deleting global commands'); - // const globalCommands = await client.application.commands.fetch(); - // globalCommands.forEach(async x => { - // await client.application.commands.delete(x); - // }); - } + // console.log('deleting global commands'); + // const globalCommands = await client.application.commands.fetch(); + // globalCommands.forEach(async x => { + // await client.application.commands.delete(x); + // }); + // } - client.commands.forEach(async command => { - await commands.create(command); - }); + // client.commands.forEach(async command => { + // await commands.create(command); + // console.log(command); + // }); // console.clear(); console.log(' ___ _ __ '); @@ -78,9 +79,9 @@ client.on('messageCreate', async (message) => { if (!client.commands.has(command)) return; try { - await client.commands.get(command).execute(client, message, args, config); + await client.commands.get(command).parseMessage(client, config, message, args); } catch (error) { - console.trace(); + console.log(error); message.channel.send({ embeds: [{ title: '<:AnitroxError:809651936563429416> **Something went wrong!**', @@ -95,4 +96,8 @@ client.on('messageCreate', async (message) => { } }); +client.on('interactionCreate', async (interaction) => { + client.commands.get(interaction.commandName).parseInteraction(client, config, interaction); +}); + client.login(config.token); From 37e0603ebf7f2bd2a356ac482f15ffeba554b760 Mon Sep 17 00:00:00 2001 From: Nathaniel Mason Date: Fri, 22 Apr 2022 06:11:53 +0100 Subject: [PATCH 08/15] Basic implementation of variadic list inputs --- commands/choose.js | 12 +++++++++--- commands/reload.js | 12 +++++++++--- config-example.json | 2 ++ start.js | 37 +++++++++++++++++++------------------ 4 files changed, 39 insertions(+), 24 deletions(-) diff --git a/commands/choose.js b/commands/choose.js index 023bd50..d295970 100644 --- a/commands/choose.js +++ b/commands/choose.js @@ -1,8 +1,15 @@ +const { Constants } = require('discord.js'); + module.exports = { name: require('path').parse(__filename).name, description: 'Give some lines of input, and get one back at random', - options: [], + options: [...Array(10).keys()].map(i => ({ + name: `option${i + 1}`, + description: 'Another option', + required: false, + type: Constants.ApplicationCommandOptionTypes.STRING + })), async parseMessage (client, config, message, args) { let [head, ...options] = message.content.split(/\s*\n\s*/); @@ -11,9 +18,8 @@ module.exports = { await message.channel.send(this.handle(client, config, message.author, options)); }, - // TODO: Figure out variable input async parseInteraction (client, config, interaction) { - await interaction.reply(this.handle(client, config, interaction.user, interaction.options.getString('question'))); + await interaction.reply(this.handle(client, config, interaction.user, [...Array(10).keys()].map(i => interaction.options.getString(`option${i + 1}`)))); }, handle (client, config, user, options) { diff --git a/commands/reload.js b/commands/reload.js index 00c3471..d3f9487 100644 --- a/commands/reload.js +++ b/commands/reload.js @@ -1,16 +1,22 @@ +const { Constants } = require('discord.js'); + module.exports = { name: require('path').parse(__filename).name, description: 'Reloads a command', - options: [], + options: [...Array(10).keys()].map(i => ({ + name: `option${i + 1}`, + description: 'Another option', + required: false, + type: Constants.ApplicationCommandOptionTypes.STRING + })), async parseMessage (client, config, message, args) { await message.channel.send(this.handle(client, config, message.author, args.split(' '))); }, - // TODO: figure out variable input (again) async parseInteraction (client, config, interaction) { - await interaction.reply(this.handle(client, config, interaction.user)); + await interaction.reply(this.handle(client, config, interaction.user, [...Array(10).keys()].map(i => interaction.options.getString(`option${i + 1}`)))); }, handle (client, config, user, args) { diff --git a/config-example.json b/config-example.json index fb3f1d0..7f2ecde 100644 --- a/config-example.json +++ b/config-example.json @@ -5,6 +5,8 @@ "release": "anitrox_dev", "build": "Stable", "footerTxt": "Anitrox, made with <3 by IDeletedSystem64 | 2018-2022", + "sandbox": false, + "sandboxGuild": "Set the value above to true and put a server ID here to use local slash commands instead of global. Used for debugging purposes", "statuses": [ "with np!help", diff --git a/start.js b/start.js index 675f5af..76a423a 100755 --- a/start.js +++ b/start.js @@ -32,28 +32,29 @@ client.generateErrorMessage = (errorMsg, avatarURL) => ({ client.on('error', (e) => console.log(`[ERROR] ${e}`)); client.on('warn', (e) => (`[WARN] ${e}`)); client.once('ready', async () => { - // const commands = config.sandbox ? client.guilds.cache.get(config.sandboxGuild)?.commands : client.application.commands; + const commands = config.sandbox ? client.guilds.cache.get(config.sandboxGuild)?.commands : client.application.commands; - // if (config.sandbox) { - // console.log('deleting previous commands from sandbox'); - // const localCommands = await commands.fetch(); - // localCommands.forEach(async x => { - // await commands.delete(x); - // }); + // Be careful about running the code below, there's a 200-per-day limit on creating slash commands + if (config.sandbox) { + console.log('deleting previous commands from sandbox'); + const localCommands = await commands.fetch(); + localCommands.forEach(async x => { + await commands.delete(x); + }); - // console.log('deleting global commands'); - // const globalCommands = await client.application.commands.fetch(); - // globalCommands.forEach(async x => { - // await client.application.commands.delete(x); - // }); - // } + console.log('deleting global commands'); + const globalCommands = await client.application.commands.fetch(); + globalCommands.forEach(async x => { + await client.application.commands.delete(x); + }); + } - // client.commands.forEach(async command => { - // await commands.create(command); - // console.log(command); - // }); + client.commands.forEach(async command => { + await commands.create(command); + console.log(command); + }); - // console.clear(); + console.clear(); console.log(' ___ _ __ '); console.log(' / | ____ (_) /__________ _ __'); console.log(' / /| | / __ \\/ / __/ ___/ __ \\| |/_/'); From 984aaecc532a0bb53ee5164fa73076acd567cadf Mon Sep 17 00:00:00 2001 From: Nathaniel Mason Date: Fri, 22 Apr 2022 06:22:02 +0100 Subject: [PATCH 09/15] Filter lists down to only used inputs --- commands/choose.js | 3 ++- commands/reload.js | 4 ++-- start.js | 34 +++++++++++++++++----------------- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/commands/choose.js b/commands/choose.js index d295970..6e71126 100644 --- a/commands/choose.js +++ b/commands/choose.js @@ -19,7 +19,8 @@ module.exports = { }, async parseInteraction (client, config, interaction) { - await interaction.reply(this.handle(client, config, interaction.user, [...Array(10).keys()].map(i => interaction.options.getString(`option${i + 1}`)))); + console.log([...Array(10).keys()].map(i => interaction.options.getString(`option${i + 1}`)).filter(str => str)); + await interaction.reply(this.handle(client, config, interaction.user, [...Array(10).keys()].map(i => interaction.options.getString(`option${i + 1}`)).filter(str => str))); }, handle (client, config, user, options) { diff --git a/commands/reload.js b/commands/reload.js index d3f9487..8ea1693 100644 --- a/commands/reload.js +++ b/commands/reload.js @@ -16,7 +16,7 @@ module.exports = { }, async parseInteraction (client, config, interaction) { - await interaction.reply(this.handle(client, config, interaction.user, [...Array(10).keys()].map(i => interaction.options.getString(`option${i + 1}`)))); + await interaction.reply(this.handle(client, config, interaction.user, [...Array(10).keys()].map(i => interaction.options.getString(`option${i + 1}`)).filter(str => str))); }, handle (client, config, user, args) { @@ -25,7 +25,7 @@ module.exports = { let returnMessage = ''; args.forEach(async (arg) => { - const commandName = arg.toLowerCase(); + const commandName = arg?.toLowerCase(); const command = client.commands.get(commandName) || client.commands.find(cmd => cmd.aliases && cmd.aliases.includes(commandName)); diff --git a/start.js b/start.js index 76a423a..f83cf76 100755 --- a/start.js +++ b/start.js @@ -32,27 +32,27 @@ client.generateErrorMessage = (errorMsg, avatarURL) => ({ client.on('error', (e) => console.log(`[ERROR] ${e}`)); client.on('warn', (e) => (`[WARN] ${e}`)); client.once('ready', async () => { - const commands = config.sandbox ? client.guilds.cache.get(config.sandboxGuild)?.commands : client.application.commands; + // const commands = config.sandbox ? client.guilds.cache.get(config.sandboxGuild)?.commands : client.application.commands; // Be careful about running the code below, there's a 200-per-day limit on creating slash commands - if (config.sandbox) { - console.log('deleting previous commands from sandbox'); - const localCommands = await commands.fetch(); - localCommands.forEach(async x => { - await commands.delete(x); - }); + // if (config.sandbox) { + // console.log('deleting previous commands from sandbox'); + // const localCommands = await commands.fetch(); + // localCommands.forEach(async x => { + // await commands.delete(x); + // }); - console.log('deleting global commands'); - const globalCommands = await client.application.commands.fetch(); - globalCommands.forEach(async x => { - await client.application.commands.delete(x); - }); - } + // console.log('deleting global commands'); + // const globalCommands = await client.application.commands.fetch(); + // globalCommands.forEach(async x => { + // await client.application.commands.delete(x); + // }); + // } - client.commands.forEach(async command => { - await commands.create(command); - console.log(command); - }); + // client.commands.forEach(async command => { + // await commands.create(command); + // console.log(command); + // }); console.clear(); console.log(' ___ _ __ '); From f921a6760847fcf559168001e58da90b01957682 Mon Sep 17 00:00:00 2001 From: Nathaniel Mason Date: Fri, 22 Apr 2022 21:01:17 +0100 Subject: [PATCH 10/15] better support for sanboxing commands --- config-example.json | 8 ++++++-- start.js | 50 +++++++++++++++++++++++++++++---------------- 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/config-example.json b/config-example.json index 7f2ecde..a89d9ee 100644 --- a/config-example.json +++ b/config-example.json @@ -5,8 +5,12 @@ "release": "anitrox_dev", "build": "Stable", "footerTxt": "Anitrox, made with <3 by IDeletedSystem64 | 2018-2022", - "sandbox": false, - "sandboxGuild": "Set the value above to true and put a server ID here to use local slash commands instead of global. Used for debugging purposes", + "sandbox": { + "enabled": false, + "id": "788391989460205571", + "refreshLocal": false, + "refreshGlobal": false + }, "statuses": [ "with np!help", diff --git a/start.js b/start.js index f83cf76..b8a21d2 100755 --- a/start.js +++ b/start.js @@ -32,27 +32,41 @@ client.generateErrorMessage = (errorMsg, avatarURL) => ({ client.on('error', (e) => console.log(`[ERROR] ${e}`)); client.on('warn', (e) => (`[WARN] ${e}`)); client.once('ready', async () => { - // const commands = config.sandbox ? client.guilds.cache.get(config.sandboxGuild)?.commands : client.application.commands; + const sandboxSettings = config.sandbox; + const localCommands = client.guilds.cache.get(sandboxSettings.id)?.commands; + const globalCommands = client.application.commands; + let existingLocal = await localCommands.fetch(); + let existingGlobal = await globalCommands.fetch(); - // Be careful about running the code below, there's a 200-per-day limit on creating slash commands - // if (config.sandbox) { - // console.log('deleting previous commands from sandbox'); - // const localCommands = await commands.fetch(); - // localCommands.forEach(async x => { - // await commands.delete(x); - // }); + if (sandboxSettings.enabled) { + if (sandboxSettings.refreshLocal) { + console.log('deleting previous local commands'); + existingLocal.forEach(async x => { + await localCommands.delete(x); + }); + existingLocal = new Discord.Collection(); + } - // console.log('deleting global commands'); - // const globalCommands = await client.application.commands.fetch(); - // globalCommands.forEach(async x => { - // await client.application.commands.delete(x); - // }); - // } + if (sandboxSettings.refreshGlobal) { + console.log('deleting previous global commands'); + existingGlobal.forEach(async x => { + await client.application.commands.delete(x); + }); + existingGlobal = new Discord.Collection(); + } + } - // client.commands.forEach(async command => { - // await commands.create(command); - // console.log(command); - // }); + client.commands.forEach(async command => { + console.log(command); + if (sandboxSettings.enabled && !existingLocal.map(x => x.name).includes(command.name)) { + await localCommands.create(command); + // console.log(`created new local command ${command.name}`); + } + if (!existingGlobal.map(x => x.name).includes(command.name)) { + await globalCommands.create(command); + // console.log(`created new global command ${command.name}`); + } + }); console.clear(); console.log(' ___ _ __ '); From 9c28f9f228e54657609535bcf627c3ba0567c15b Mon Sep 17 00:00:00 2001 From: Nathaniel Mason Date: Fri, 22 Apr 2022 21:02:05 +0100 Subject: [PATCH 11/15] fix no argument response to /reload --- commands/reload.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/reload.js b/commands/reload.js index 8ea1693..80addfe 100644 --- a/commands/reload.js +++ b/commands/reload.js @@ -21,7 +21,7 @@ module.exports = { handle (client, config, user, args) { if (user.id === config.ownerID) { - if (!args) return client.generateErrorMessage('You forgot to provide anything to reload, you pillock', user.displayAvatarURL()); + if (!args.length) return client.generateErrorMessage('You forgot to provide anything to reload, you pillock', user.displayAvatarURL()); let returnMessage = ''; args.forEach(async (arg) => { From 7d10366f01802ed0f0555f3af3b5a0a4a3ea1e0b Mon Sep 17 00:00:00 2001 From: Nathaniel Mason Date: Fri, 22 Apr 2022 21:07:25 +0100 Subject: [PATCH 12/15] fix reload message parsing --- commands/reload.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/reload.js b/commands/reload.js index 80addfe..efa7c12 100644 --- a/commands/reload.js +++ b/commands/reload.js @@ -12,7 +12,7 @@ module.exports = { })), async parseMessage (client, config, message, args) { - await message.channel.send(this.handle(client, config, message.author, args.split(' '))); + await message.channel.send(this.handle(client, config, message.author, args)); }, async parseInteraction (client, config, interaction) { From 5a7040767ea2cecfb68bf1cbc200da9c8c4a341d Mon Sep 17 00:00:00 2001 From: Nathaniel Mason Date: Fri, 22 Apr 2022 21:16:14 +0100 Subject: [PATCH 13/15] make variadic lists force at least one parameter + grammar corrections --- commands/choose.js | 2 +- commands/nom.js | 2 +- commands/reload.js | 2 +- commands/slap.js | 2 +- commands/snuggle.js | 2 +- start.js | 1 - 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/commands/choose.js b/commands/choose.js index 6e71126..cf841b2 100644 --- a/commands/choose.js +++ b/commands/choose.js @@ -7,7 +7,7 @@ module.exports = { options: [...Array(10).keys()].map(i => ({ name: `option${i + 1}`, description: 'Another option', - required: false, + required: i === 0, type: Constants.ApplicationCommandOptionTypes.STRING })), diff --git a/commands/nom.js b/commands/nom.js index 7d9dfc1..c2ea792 100644 --- a/commands/nom.js +++ b/commands/nom.js @@ -10,7 +10,7 @@ const gifchoices = [ module.exports = { name: require('path').parse(__filename).name, - description: 'Noms an user!', + description: 'Noms a user!', options: [{ name: 'user', description: 'The user to nom', diff --git a/commands/reload.js b/commands/reload.js index efa7c12..26daa67 100644 --- a/commands/reload.js +++ b/commands/reload.js @@ -7,7 +7,7 @@ module.exports = { options: [...Array(10).keys()].map(i => ({ name: `option${i + 1}`, description: 'Another option', - required: false, + required: i === 0, type: Constants.ApplicationCommandOptionTypes.STRING })), diff --git a/commands/slap.js b/commands/slap.js index ac5d86d..c57ac8c 100644 --- a/commands/slap.js +++ b/commands/slap.js @@ -3,7 +3,7 @@ const { Constants } = require('discord.js'); module.exports = { name: require('path').parse(__filename).name, - description: 'Slaps an user!', + description: 'Slaps a user!', options: [{ name: 'user', description: 'The user to slap', diff --git a/commands/snuggle.js b/commands/snuggle.js index 1eaeff7..308202b 100644 --- a/commands/snuggle.js +++ b/commands/snuggle.js @@ -9,7 +9,7 @@ const gifchoices = [ module.exports = { name: require('path').parse(__filename).name, - description: 'Snuggle an user!', + description: 'Snuggle a user!', options: [{ name: 'user', description: 'The user to snuggle', diff --git a/start.js b/start.js index b8a21d2..52af0c7 100755 --- a/start.js +++ b/start.js @@ -57,7 +57,6 @@ client.once('ready', async () => { } client.commands.forEach(async command => { - console.log(command); if (sandboxSettings.enabled && !existingLocal.map(x => x.name).includes(command.name)) { await localCommands.create(command); // console.log(`created new local command ${command.name}`); From 8c431e95c7953f1ea7ee905ee161f6f90c5b0a9b Mon Sep 17 00:00:00 2001 From: Nathaniel Mason Date: Fri, 22 Apr 2022 21:28:11 +0100 Subject: [PATCH 14/15] remove old todo --- commands/uinfo.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/commands/uinfo.js b/commands/uinfo.js index 4e36d03..438413a 100644 --- a/commands/uinfo.js +++ b/commands/uinfo.js @@ -56,9 +56,6 @@ module.exports = { { name: 'User Status', value: target.presence?.status ?? (config.intents.includes('GUILD_PRESENCES') ? 'Offline' : 'Missing GUILD_PRESENCES intent') - // IMPORTANT NOTE: - // There seems to be an issue where offline and invisible users return a null presense - // I'll try to patch this soon if I can figure out why }, { name: 'User ID', From a8409b4828bdea6e19bdab8f83c55c0c9b485078 Mon Sep 17 00:00:00 2001 From: Nathaniel Mason Date: Sat, 23 Apr 2022 19:07:50 +0100 Subject: [PATCH 15/15] fix function signatures and spelling errors --- commands/invite.js | 6 +++--- commands/kiss.js | 4 ++-- commands/ping.js | 4 ++-- commands/restart.js | 6 +++--- commands/setnick.js | 6 +++--- commands/stop.js | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/commands/invite.js b/commands/invite.js index afc2376..f918bfa 100644 --- a/commands/invite.js +++ b/commands/invite.js @@ -4,12 +4,12 @@ module.exports = { description: 'Add Anitrox to your beautiful server!', options: [], - async parseMessage (client, config, message, args) { - await message.channel.send(this.handle(client, config, message.author, args.slice(0).join(' '))); + async parseMessage (client, config, message) { + await message.channel.send(this.handle(client, config, message.author)); }, async parseInteraction (client, config, interaction) { - await interaction.reply(this.handle(client, config, interaction.user, interaction.options.getString('question'))); + await interaction.reply(this.handle(client, config, interaction.user)); }, handle (_, config, user) { diff --git a/commands/kiss.js b/commands/kiss.js index 871257e..d3c132a 100644 --- a/commands/kiss.js +++ b/commands/kiss.js @@ -28,7 +28,7 @@ module.exports = { }, handle (client, config, user, target) { - if (!target) return client.generateErrorMessage('You need to @mention a user!', user.displayAvaterURL()); + if (!target) return client.generateErrorMessage('You need to @mention a user!', user.displayAvatarURL()); const gif = gifchoices[Math.floor(Math.random() * gifchoices.length)]; return { @@ -37,7 +37,7 @@ module.exports = { description: `${target} You have been kissed by ${user}!`, color: 9442302, footer: { - icon_url: user.displayAvaterURL(), + icon_url: user.displayAvatarURL(), text: config.footerTxt }, image: { diff --git a/commands/ping.js b/commands/ping.js index 3988921..ff623e2 100644 --- a/commands/ping.js +++ b/commands/ping.js @@ -5,11 +5,11 @@ module.exports = { options: [], async parseMessage (client, config, message, args) { - await message.channel.send(await this.handle(client, config, message.author, args.slice(0).join(' '))); + await message.channel.send(await this.handle(client, config, message.author)); }, async parseInteraction (client, config, interaction) { - await interaction.reply(await this.handle(client, config, interaction.user, interaction.options.getString('question'))); + await interaction.reply(await this.handle(client, config, interaction.user)); }, async handle (client, config, user) { diff --git a/commands/restart.js b/commands/restart.js index ebd8577..e21689a 100644 --- a/commands/restart.js +++ b/commands/restart.js @@ -4,12 +4,12 @@ module.exports = { description: 'Restarts the bot', options: [], - async parseMessage (client, config, message, args) { - await message.channel.send(await this.handle(client, config, message.author, args.slice(0).join(' '))); + async parseMessage (client, config, message) { + await message.channel.send(await this.handle(client, config, message.author)); }, async parseInteraction (client, config, interaction) { - await interaction.reply(await this.handle(client, config, interaction.user, interaction.options.getString('question'))); + await interaction.reply(await this.handle(client, config, interaction.user)); }, async handle (client, config, user) { diff --git a/commands/setnick.js b/commands/setnick.js index dd9ea3d..090fe5a 100644 --- a/commands/setnick.js +++ b/commands/setnick.js @@ -11,12 +11,12 @@ module.exports = { type: Constants.ApplicationCommandOptionTypes.STRING }], - async parseMessage (client, config, message, args) { - await message.channel.send(this.handle(client, config, message.author, args.slice(0).join(' '))); + async parseMessage (client, config, message) { + await message.channel.send(this.handle(client, config, message.author)); }, async parseInteraction (client, config, interaction) { - await interaction.reply(this.handle(client, config, interaction.user, interaction.options.getString('question'))); + await interaction.reply(this.handle(client, config, interaction.user)); }, handle (client, config, user, newNick) { diff --git a/commands/stop.js b/commands/stop.js index 86d355f..26bad67 100644 --- a/commands/stop.js +++ b/commands/stop.js @@ -4,13 +4,13 @@ module.exports = { description: "IT'S TIME TO STOP!... the bot", options: [], - async parseMessage (client, config, message, args) { - await message.channel.send(await this.handle(client, config, message.author, args.slice(0).join(' '))); + async parseMessage (client, config, message) { + await message.channel.send(await this.handle(client, config, message.author)); process.exit(); }, async parseInteraction (client, config, interaction) { - await interaction.reply(await this.handle(client, config, interaction.user, interaction.options.getString('question'))); + await interaction.reply(await this.handle(client, config, interaction.user)); process.exit(); },