diff --git a/commands/8ball.js b/commands/8ball.js index 499359b..cd58d94 100644 --- a/commands/8ball.js +++ b/commands/8ball.js @@ -1,62 +1,30 @@ module.exports = { - name: '8ball', - description: 'Ask Anitrox a question, any question! and they will answer it!', - syntax: ["[Question]"], - execute(client, message, args) { - const {footerTxt} = require('../config.json'); - const answers = [ - "Heck no!", - "Are you crazy!? No!", - "Don't even think about it.", - "No! You might bork something!", - "Heck yeah", - "I don't think so.", - "Let me think about it first. No.", - "Let me think about it first. Yeah", - "Let me think about it first. Maybe", - "I don't know man", - "Maybe", - "I'm not sure", - "Ask again", - "YEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE!!!", - "Definitely!", - "Go for it! :smile:", - "Good idea!", - "Sure" - ] - const index = Object.keys(answers)[Math.floor(Math.random() * Object.keys(answers).length)]; - var question = args.slice(0).join(" ") - var answer = (answers[index]); - console.log(args); + name: '8ball', + description: 'Ask Anitrox a question, any question! and they will answer it!', + 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(" ") - if (!question) { - const embed = { - "title": "<:AnitroxError:809651936563429416> **Something went wrong!**", - "description": "You need to ask a", - "color": 13632027, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": footerTxt - } + if (!question) { + await message.channel.send(client.generateErrorMessage("You need to ask a question!", message.author.displayAvatarURL)); + } else { + await message.channel.send({embed: { + "title": ":8ball: 8Ball", + "description": `Your amazing question: **${question}**`, + "color": 9442302, + "footer": { + "icon_url": message.author.displayAvatarURL(), + "text": config.footerTxt + }, + "fields": [ + { + "name": "Answer", + "value": `${answer}` } - } - const embed = { - "title": ":8ball: Anitrox 8 Ball", - "description": "Your question: **" + question + "**", - "color": 9442302, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": footerTxt - }, - - "fields": [ - { - "name": "🤔 My Answer", - "value": answer - } - ] - }; - message.channel.send({ embed }); - + ] + }}); } + } } \ No newline at end of file diff --git a/commands/avatar.js b/commands/avatar.js index 3741e6e..356265b 100644 --- a/commands/avatar.js +++ b/commands/avatar.js @@ -1,23 +1,21 @@ module.exports = { - name: "avatar", - description: "Gets a users avatar.", - execute(client, message, args) { - user = message.mentions.users.first() - if (!user) user = message.author - const {footerTxt} = require('../config.json'); + name: "avatar", + description: "Gets a user's avatar.", + async execute(client, message, args, config) { + + const user = message.mentions.users.first() || client.users.cache.get(args[0]) || message.author; - const embed = { - "title": ":frame_photo: " + user.username + "'s Beautiful Avatar!", - "color": 9442302, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": footerTxt - }, - "image": { - "url": user.displayAvatarURL() - } - }; - message.channel.send({ embed }); - } + await message.channel.send({embed: { + "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 99da59f..d4d984c 100644 --- a/commands/bonk.js +++ b/commands/bonk.js @@ -1,44 +1,25 @@ module.exports = { - name: "bonk", - description: "Bonks an user!", - execute(client, message, args) { - const taggedUser = message.mentions.users.first(); - const {footerTxt} = require('../config.json'); - const errorembed = { - "title": "<:AnitroxError:809651936563429416> Error", - "color": 13632027, + name: "bonk", + description: "Bonks a user!", + async execute(client, message, _, config) { + const taggedUser = message.mentions.users.first(); + + if(!taggedUser) { + await message.channel.send(client.generateErrorMessage("You need to @mention a user!", message.author.displayAvatarURL())); + } else { + await message.channel.send({embed: { + "title": " Bonk", + "description": `${taggedUser} You have been bonked by ${message.author}!`, + "color": 9442302, "footer": { - "icon_url": "https://images-ext-2.discordapp.net/external/-qaO3jaZLojhEnjrHiKABdXD7gLWqFvdUqHdskNGWhE/https/media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png", - "text": "Made with ❤ in Illinois | Anitrox by IDeletedSystem64" + "icon_url": message.author.displayAvatarURL(), + "text": config.footerTxt }, - "fields": [ - { - "name": "Well that happened...", - "value": "You need to @mention an user!" - } - ] - }; - - if(!taggedUser) { - return message.channel.send({ embed: errorembed}); - // Checks if a user was mentioned. If not, returns error message. - } - - const embed = { - "title": " Bonk", - "description": "<@" + taggedUser + ">" + " You have been bonked by <@" + message.author + ">!", - "color": 9442302, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": footerTxt - }, - "image": { - "url": "https://cdn.discordapp.com/attachments/793537380330111028/801194481549312060/HappyBONK.gif" - } - } - - - message.channel.send({ embed: embed }); - } + "image": { + "url": "https://cdn.discordapp.com/attachments/793537380330111028/801194481549312060/HappyBONK.gif" + } + }}); } + } +} diff --git a/commands/cheese.js b/commands/cheese.js index 76aae42..88516d2 100644 --- a/commands/cheese.js +++ b/commands/cheese.js @@ -1,31 +1,23 @@ module.exports = { -//a - name: "cheese", - description: "Cheese an user, or run just ``n!cheese`` for a surprise :eyes:", - execute(client, message, args) { - const taggedUser = message.mentions.users.first(); - const {footerTxt} = require('../config.json'); - + name: "cheese", + description: "Cheese an user, or run just ``n!cheese`` for a surprise :eyes:", + async execute(_0, message, _1, config) { + const taggedUser = message.mentions.users.first(); if(!taggedUser) { - return message.channel.send("*slams cheese on desk* Cheese. https://www.youtube.com/watch?v=Or4IE8fkpn4"); - - } - - - const embed = { - "title": ":cheese: Cheesed", - "description": "<@" + taggedUser + ">" + " You got cheesed by " + "<@" + message.author + ">!", - "color": 16312092, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": footerTxt - }, - "image": { - "url": "https://cdn.discordapp.com/attachments/803658122299572255/812867714368536636/R06325af354168febcafd96b8328b7590.png" - } - } - - - message.channel.send({ embed: embed }); - } + await message.channel.send("*slams cheese on desk*\n**Cheese.** https://www.youtube.com/watch?v=Or4IE8fkpn4"); + } else { + await message.channel.send({embed: { + "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/cuddle.js b/commands/cuddle.js index b518f31..d14cb10 100644 --- a/commands/cuddle.js +++ b/commands/cuddle.js @@ -1,38 +1,35 @@ +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" +]; + module.exports = { - name: "cuddle", - description: "Cuddle an user!", - execute(client, message, args) { - const taggedUser = message.mentions.users.first(); - const {footerTxt} = require('../config.json'); - // -------------------------------------- - 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" - ]; - const index = Math.floor(Math.random() * (gifchoices.length - 1) + 1); - var gif = (gifchoices[index]); - // --------------------------------------- + name: "cuddle", + description: "Cuddle an user!", + async execute(client, message, _, config) { - if(!taggedUser) { - return message.channel.send("<:AnitroxError:809651936563429416> You need to specify an user!") - } - const embed = { - "title": ":heart: Cuddle", - "description": "<@" + taggedUser + ">" + " You have been cuddled by " + "<@" + message.author + ">!", - "color": 9442302, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": footerTxt - }, - "image": { - "url": gif - } - } + const taggedUser = message.mentions.users.first(); + const index = Math.floor(Math.random() * gifchoices.length); + const gif = (gifchoices[index]); - - message.channel.send({ embed: embed }); - } + if(!taggedUser) { + await message.channel.send(client.generateErrorMessage("You need to @mention a user!", message.author.displayAvatarURL())); + } else { + await message.channel.send({embed: { + "title": ":heart: Cuddle", + "description": `${taggedUser} You have been cuddled by ${message.author}!`, + "color": 9442302, + "footer": { + "icon_url": message.author.displayAvatarURL(), + "text": config.footerTxt + }, + "image": { + "url": gif + } + }}); } + } +} diff --git a/commands/eval.js b/commands/eval.js index 8d3eb19..1b0983c 100644 --- a/commands/eval.js +++ b/commands/eval.js @@ -1,40 +1,34 @@ - +const { inspect } = require("util"); module.exports = { name: 'eval', - description: 'Runs js code', - execute(client, message, args) { - const commandName = args[0].toLowerCase(); - if (message.author.id == 309427567004483586) { - try { - const code = args.join(" "); - let evaled = eval(code); - - if (typeof evaled !== "string") - evaled = require("util").inspect(evaled); - - message.channel.send(clean(evaled), {code:"xl"}); - } catch (error) { - const embed = { - "title": "<:NyabotError:697145462347661412> **Well that happened...**", - "color": 13632027, - "footer": { - "icon_url": "https://cdn.discordapp.com/attachments/549707869138714635/793524910172667964/Screenshot_26.png", - "text": "Anitrox © IDeletedSystem64 2018-2021 All Rights Reserved." - }, - "fields": [ - { - "name": "**What Happened?**", - "value": "The command you tried to run failed to execute due to an error." - }, - { - "name": "Error Info", - "value": error.message - } - ] - }; - message.channel.send({ embed }); - } -}; - } + description: 'Executes JS code', + async execute(_, message, args, config) { + if (message.author.id == config.ownerID) { + try { + const code = args.join(" "); + const evaled = inspect(eval(code)); + await message.channel.send(evaled, {code:"xl"}); + } catch (error) { + await message.channel.send({embed: { + "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." + }, + { + "name": "Error Info", + "value": error.message + } + ] + }}); + } + }; + } } diff --git a/commands/help.js b/commands/help.js index bed475e..940501b 100644 --- a/commands/help.js +++ b/commands/help.js @@ -4,16 +4,14 @@ module.exports = { description: 'Get help on anything from commands, to what the bot does! just not your homework..', syntax: '', - execute(client, message, args) { - const {footerTxt} = require('../config.json'); - - const Embed = { + async execute(_0, message, _1, config) { + await message.channel.send({embed: { "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": footerTxt + " | No mother it's just the northern lights" + "text": `${config.footerTxt} | No mother it's just the northern lights` }, "fields": [ { @@ -25,6 +23,6 @@ module.exports = { "value": "Join the [support server!](https://discord.gg/grebRGsBZ3)" } ] - }; - message.channel.send({ embed: Embed }); -}}; \ No newline at end of file + }}); + } +} diff --git a/commands/hug.js b/commands/hug.js index 4c17632..a4ddf72 100644 --- a/commands/hug.js +++ b/commands/hug.js @@ -1,54 +1,34 @@ +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" +]; + module.exports = { - name: "hug", - description: "Hugs an user!", - execute(client, message, args) { - const {footerTxt} = require('../config.json'); - const taggedUser = message.mentions.users.first(); - 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" - ]; - //--------------------------------- - const errorembed = { - "title": "<:AnitroxError:809651936563429416> Error", - "color": 9442302, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": message.author.displayAvatarURL() - }, - "fields": [ - { - "name": "Well that happened...", - "value": "You need to @mention an user!" - } - ] - }; - + name: "hug", + description: "Hugs a user!", + async execute(client, message, _, config) { + const taggedUser = message.mentions.users.first(); + if(!taggedUser) { - return message.channel.send({ embed: errorembed}); - // Checks if a user was mentioned. If not, returns error message. - } - - const index = Math.floor(Math.random() * (gifchoices.length - 1) + 0.4); - var gif = (gifchoices[index]); - const embed = { - "title": " Hug", - "description": "<@" + taggedUser + ">" + " You have been hugged by " + "<@" + message.author + ">!", - "color": 8311585, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": footerTxt - }, - "image": { - "url": gif - } - } - - - message.channel.send({ embed: embed }); - } + 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: { + "title": " Hug", + "description": `${taggedUser} You have been hugged by ${message.author}!`, + "color": 8311585, + "footer": { + "icon_url": message.author.displayAvatarURL(), + "text": config.footerTxt + }, + "image": { + "url": gif + } + }}); } + } +} diff --git a/commands/info.js b/commands/info.js index 648adcd..5ae1be0 100644 --- a/commands/info.js +++ b/commands/info.js @@ -1,113 +1,106 @@ -const { Client, ClientUser } = require('discord.js'); - module.exports = { - name: 'info', - description: 'Shows bot and host information', - execute(client, message, args) { - const { build, release, footerTxt } = require('../config.json'); - function Uptime(uptimetype) { - let totalSeconds = (uptimetype / 1000); + name: 'info', + description: 'Shows bot and host information', + async execute(client, message, _, config) { - let days = parseInt(Math.floor(totalSeconds / 86400)) + " day"; - let hours = Math.floor(parseInt(Math.floor(totalSeconds / 3600)) % 24) + " hour"; - totalSeconds %= 3600; - let minutes = parseInt(Math.floor(totalSeconds / 60)) + " minute"; - let seconds = parseInt(totalSeconds % 60) + " second"; + function Uptime(uptime) { + const totalSeconds = (uptime / 1000); - if (parseInt(days.substring(0,2)) != 1) days += "s"; - if (parseInt(hours.substring(0,3)) != 1) hours += "s"; - if (parseInt(minutes.substring(0,3)) != 1) minutes += "s"; - if (parseInt(seconds.substring(0,3)) != 1) seconds += "s"; + const days = parseInt(totalSeconds / 86400); + const hours = parseInt((totalSeconds % 86400) / 3600); + const minutes = parseInt((totalSeconds % 3600) / 60); + const seconds = parseInt(totalSeconds % 60); - let uptime = `${days}**, **${hours}**, **${minutes}**, **${seconds}`; - return uptime; - }; + 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 os = require("os") - var osu = require('node-os-utils') - var cpu = osu.cpu - let botAvatar = client.user.displayAvatarURL() - const embed = { - "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": footerTxt - }, - "thumbnail": { - "url": client.user.displayAvatarURL() - }, - "fields": [ - { - "name": "Bot Information", - "value": "** **" - }, - { - "name": "Release Type", - "value": release, - "inline": true - }, - { - "name": "Release Version", - "value": build, - "inline": true - }, - { - "name": "Uptime", - "value": Uptime(client.uptime), - "inline": true - }, - { - "name": "<:memory:793536677737136178> Bot Memory Usage", - "value": (Math.round(process.memoryUsage().heapUsed / 1024 / 1024 * 100) / 100) + " 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() - }, + return `${daystring}**, **${hourstring}**, **${minutetring}**, **${secondstring}`; + } - { - "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": "<:usersuccess:793885338250641469> **Special Thanks To**", - "value": "@OfficialTCGMatt for providing help with development\n @chuu_shi Allowing me to host Anitrox on his server" - } - - ] - }; - message.channel.send({ embed }); + const os = require("os"); + const osu = require('node-os-utils'); + const cpu = osu.cpu; + await message.channel.send({embed: { + "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()}` + }, + { + "name": "<:node:793537507018145813> Node.JS Version", + "value": process.version + }, + { + "name": "<:hostinfo:793529505263517747> Bot Ping", + "value": `${Math.round(client.ws.ping)} ms`, + "inline": true + }, + { + "name": "<:usersuccess:793885338250641469> **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 d2d184a..873e385 100644 --- a/commands/invite.js +++ b/commands/invite.js @@ -1,38 +1,34 @@ - module.exports = { - - name: 'invite', - description: 'Add Anitrox to your beautiful server!', - syntax: [], - execute(client, message) { - const {footerTxt} = require('../config.json'); - const embed = { - "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": 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)" - }, - { - "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)" - } - ] - }; - message.channel.send({ embed }); - }, + name: 'invite', + description: 'Add Anitrox to your beautiful server!', + syntax: [], + async execute(_0, message, _1, config) { + await message.channel.send({embed: { + "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)" + }, + { + "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)" + } + ] + }}); + }, }; \ No newline at end of file diff --git a/commands/kiss.js b/commands/kiss.js index e4b8fca..6b51e9a 100644 --- a/commands/kiss.js +++ b/commands/kiss.js @@ -1,60 +1,34 @@ +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" +]; + module.exports = { - name: "kiss", - description: "Kisses an user!", - execute(client, message, args) { - const {footerTxt} = require('../config.json'); - const taggedUser = message.mentions.users.first(); - - - // -------------------------------------- - 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" - ]; - const index = Math.floor(Math.random() * (gifchoices.length - 1) + 1); - var gif = (gifchoices[index]); - // --------------------------------------- - const errorembed = { - "title": "<:AnitroxError:809651936563429416> Error", - "color": 13632027, + name: "kiss", + description: "Kisses a user!", + async execute(client, message, _, config) { + const taggedUser = message.mentions.users.first(); + + if(!taggedUser) { + 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: { + "title": ":heart: Kiss", + "description": `${taggedUser} You have been kissed by ${message.author}!`, + "color": 9442302, "footer": { "icon_url": message.author.displayAvatarURL(), - "text": footerTxt + "text": config.footerTxt }, - "fields": [ - { - "name": "Well that happened...", - "value": "You need to @mention an user!" - } - ] - }; - - if(!taggedUser) { - return message.channel.send({ embed: errorembed}); - } - - if(!taggedUser) { - return message.channel.send({ embed: errorembed}); - // Checks if a user was mentioned. If not, returns error message. - } - const embed = { - "title": ":heart: Kiss", - "description": "<@" + taggedUser + ">" + ", You have been kissed by <@" + messageAuthor + ">!", - "color": 9442302, - "footer": { - "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png", - "text": "Made with ❤ in Illinois | Anitrox © IDeletedSystem64 2018-2021" - }, - "image": { - "url": gif - } - } - - - message.channel.send({ embed: embed }); - } + "image": { + "url": gif + } + }}); } + } +} diff --git a/commands/leskiss.js b/commands/leskiss.js index a94c328..18242c4 100644 --- a/commands/leskiss.js +++ b/commands/leskiss.js @@ -1,70 +1,44 @@ -const { Message } = require("discord.js"); -const { execute } = require("./info"); +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" +]; module.exports = { - name: "leskiss", - description: "Lesbian kiss <:lesbian:803831629428686849>", - execute(client, message, args) { - const taggedUser = message.mentions.users.first(); - const {footerTxt} = require('../config.json'); - // -------------------------------------- - 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" - - ]; - const index = Math.floor(Math.random() * (gifchoices.length - 1) + 1.75); - var gif = (gifchoices[index]); - // --------------------------------------- - const errorembed = { - "title": "<:AnitroxError:809651936563429416> Error", - "color": 9442302, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": footerTxt - }, - "fields": [ - { - "name": "Well that happened...", - "value": "You need to @mention an user!" - } - ] - }; - - if(!taggedUser) { - return message.channel.send({ embed: errorembed}); - // Checks if a user was mentioned. If not, returns error message. - } - - - const embed = { + name: "leskiss", + description: "Lesbian kiss <:lesbian:803831629428686849>", + async execute(client, message, _, config) { + const taggedUser = message.mentions.users.first(); + + if(!taggedUser) { + 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: { "title": ":heart: <:lesbian:803831629428686849> Kiss", - "description": "<@" + taggedUser + ">" + " You have been kissed by <@" + messageAuthor + ">! <:lesbian:803831629428686849>", + "description": `${taggedUser} You have been kissed by ${message.author}!`, "color": 8311585, "footer": { - "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png", - "text": "Made with ❤ in Illinois | Anitrox © IDeletedSystem64 2018-2021" + "icon_url": message.author.displayAvatarURL(), + "text": config.footerTxt }, "image": { "url": gif } - } - - - message.channel.send({ embed: embed }); - } + }}); + } + } } diff --git a/commands/lick.js b/commands/lick.js index 7d10aef..f3573ac 100644 --- a/commands/lick.js +++ b/commands/lick.js @@ -1,58 +1,33 @@ -module.exports = { - - name: "lick", - description: "Licks an user!", - execute(client, message, args) { - const {footerTxt} = require('../config.json'); - const taggedUser = message.mentions.users.first(); -//--------------------------------------------------- - // -------------------------------------- - const gifchoices = [ +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" - - ]; -const index = Math.floor(Math.random() * (gifchoices.length - 1) + 1); -var gif = (gifchoices[index]); -// --------------------------------------- -//--------------------------------------------------- -const errorembed = { - "title": "<:AnitroxError:809651936563429416> Error", - "color": 9442302, - "footer": { - "icon_url": "https://images-ext-2.discordapp.net/external/-qaO3jaZLojhEnjrHiKABdXD7gLWqFvdUqHdskNGWhE/https/media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png", - "text": "Made with ❤ in Illinois | Anitrox © 2018-2021 IDeletedSystem64" - }, - "fields": [ - { - "name": "Well that happened...", - "value": "You need to @mention an user!" - } - ] -}; -if(!taggedUser) { - return message.channel.send({ embed: errorembed}); -// Checks if a user was mentioned. If not, returns error message. +module.exports = { + + name: "lick", + description: "Licks a user!", + async execute(client, message, _, config) { + const taggedUser = message.mentions.users.first(); + + if(!taggedUser) { + 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: { + "title": " Lick", + "description": `${taggedUser} You have been licked by ${message.author}!`, + "color": 8311585, + "footer": { + "icon_url": message.author.displayAvatarURL(), + "text": config.footerTxt + }, + "image": { + "url": "https://cdn.discordapp.com/attachments/803658122299572255/805314244123951114/cef569820773b0f5d54ee34cfa18e1f8.gif" + } + }}); + } + } } - - const embed = { - "title": " Lick", - "description": "<@" + taggedUser + "> You have been licked by <@" + message.author + ">!", - "color": 8311585, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": footerTxt - }, - "image": { - "url": "https://cdn.discordapp.com/attachments/803658122299572255/805314244123951114/cef569820773b0f5d54ee34cfa18e1f8.gif" - } - } - - - message.channel.send({ embed: embed }); - } - } diff --git a/commands/nom.js b/commands/nom.js index d77eddd..1ace929 100644 --- a/commands/nom.js +++ b/commands/nom.js @@ -1,57 +1,33 @@ +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" +]; + module.exports = { - name: "nom", - description: "Noms an user!", - execute(client, message, args) { - const {footerTxt} = require('../config.json'); - const taggedUser = message.mentions.users.first(); - - // -------------------------------------- - 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" - - - ]; - const index = Math.floor(Math.random() * (gifchoices.length - 1) + 1); - var gif = (gifchoices[index]); - // --------------------------------------- - const errorembed = { - "title": "<:AnitroxError:809651936563429416> Error", - "color": 9442302, - "footer": { - "icon_url": "https://images-ext-2.discordapp.net/external/-qaO3jaZLojhEnjrHiKABdXD7gLWqFvdUqHdskNGWhE/https/media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png", - "text": "Made with ❤ in Illinois | Anitrox by IDeletedSystem64" - }, - "fields": [ - { - "name": "Well that happened...", - "value": "You need to @mention an user!" - } - ] - }; - - if(!taggedUser) { - return message.channel.send({ embed: errorembed}); - // Checks if a user was mentioned. If not, returns error message. + name: "nom", + description: "Noms an user!", + async execute(client, message, _, config) { + const taggedUser = message.mentions.users.first(); + + if(!taggedUser) { + 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: { + "title": "<:BlobNomBlob:801241117919805510> Nom", + "description": `${taggedUser} You have been nommed by ${message.author}!`, + "color": 8311585, + "footer": { + "icon_url": message.author.displayAvatarURL(), + "text": config.footerTxt + }, + "image": { + "url": gif } - - const embed = { - "title": "<:BlobNomBlob:801241117919805510> Nom", - "description": "<@" + taggedUser + "> You have been nommed by <@" + messageAuthor + ">!", - "color": 8311585, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": footerTxt - }, - "image": { - "url": gif - } - } - - - message.channel.send({ embed: embed }); - } + }}); } + } +} diff --git a/commands/opensource.js b/commands/opensource.js index 342558d..762a6c1 100644 --- a/commands/opensource.js +++ b/commands/opensource.js @@ -1,33 +1,32 @@ module.exports = { name: 'opensource', description: 'Attributions to open source components used by Anitrox', - execute(client, message, args){ - const {footerTxt} = require('../config.json'); - const embed = { - "title": "Component Attribution", - "description": "Some parts of Anitrox are using open source code, and their attributions are avaliable here!", - "color": 52508, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": 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! ❤" - } - ] - }; - message.channel.send({ embed }); - }} \ No newline at end of file + async execute(_0, message, _1, config){ + await message.channel.send({embed: { + "title": "Component Attribution", + "description": "Some parts of Anitrox are using open source code, and their attributions are avaliable here!", + "color": 52508, + "footer": { + "icon_url": message.author.displayAvatarURL(), + "text": config.footerTxt + }, + "thumbnail": { + "url": "https://cdn.discordapp.com/attachments/803658122299572255/838854256471703602/793885335498522685.png" + }, + "fields": [ + { + "name": "Discord.JS", + "value": "[Check out the Discord.JS project on GitHub](https://github.com/discordjs/discord.js/)" + }, + { + "name": "The Anitrox Project", + "value": "[Check out Anitrox on GitHub](https://github.com/IDeletedSystem64/anitrox)" + }, + { + "name": "You", + "value": "Using and supporting the Anitrox Project, thank you! ❤" + } + ] + }}); + } +} \ No newline at end of file diff --git a/commands/pat.js b/commands/pat.js index adc8ee8..1d818a0 100644 --- a/commands/pat.js +++ b/commands/pat.js @@ -1,56 +1,32 @@ +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" +]; + module.exports = { - name: "pat", - description: "Pats an user!", - execute(client, message, args) { - const {footerTxt} = require('../config.json'); - const taggedUser = message.mentions.users.first(); - - // -------------------------------------- - 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" - - - ]; - const index = Math.floor(Math.random() * (gifchoices.length - 1) + 2); - var gif = (gifchoices[index]); - // --------------------------------------- - const errorembed = { - "title": "<:AnitroxError:809651936563429416> Error", - "color": 9442302, + name: "pat", + description: "Pats a user!", + async execute(client, message, _, config) { + const taggedUser = message.mentions.users.first(); + + if(!taggedUser) { + 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: { + "title": "<:pats:801238281286713355> Pat", + "description": `${taggedUser} You have been patted by ${message.author}!`, + "color": 8311585, "footer": { "icon_url": message.author.displayAvatarURL(), - "text": footerTxt + "text": config.footerTxt }, - "fields": [ - { - "name": "Well that happened...", - "value": "You need to @mention an user!" - } - ] - }; - - if(!taggedUser) { - return message.channel.send({ embed: errorembed}); - // Checks if a user was mentioned. If not, returns error message. - } - - const embed = { - "title": "<:pats:801238281286713355> Pat", - "description": "<@" + taggedUser + "> You have been patted by <@" + messageAuthor + ">!", - "color": 8311585, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": footerTxt - }, - "image": { - "url": gif - } - } - - - message.channel.send({ embed: embed }); - } + "image": { + "url": gif + } + }}); } + } +} diff --git a/commands/ping.js b/commands/ping.js index bfd0020..77f9544 100644 --- a/commands/ping.js +++ b/commands/ping.js @@ -1,21 +1,18 @@ module.exports = { name: "ping", description: "Gets bot ping", - execute(client, message) { - const {footerTxt, locations} = require('../config.json'); + async execute(client, message, _, config) { + const index = Math.floor(Math.random() * config.locations.length); + const location = config.locations[index] - const index = Math.floor(Math.random() * (locations.length -1 ) + 1); - PingLocation = locations[index] - const embed = { - "title": ":ping_pong: Ping", - "description": "**Pong!** We pinged **" + PingLocation + "** and got " + client.ws.ping + " ms.", - "color": 9442302, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": footerTxt - } -} - - message.channel.send({ embed }); + await message.channel.send({embed:{ + "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 d9a1fd5..46584ba 100644 --- a/commands/poke.js +++ b/commands/poke.js @@ -1,56 +1,32 @@ +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" +]; + module.exports = { - name: "poke", - description: "Pokes an user!", - execute(client, message, args) { - const messageAuthor = message.author - const taggedUser = message.mentions.users.first(); - - // -------------------------------------- - 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" - - - ]; - const index = Math.floor(Math.random() * (gifchoices.length - 1) + 2); - var gif = (gifchoices[index]); - // --------------------------------------- - const errorembed = { - "title": "<:AnitroxError:809651936563429416> Error", - "color": 9442302, + name: "poke", + description: "Pokes a user!", + async execute(client, message, _, config) { + const taggedUser = message.mentions.users.first(); + + if(!taggedUser) { + 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: { + "title": "👉 Poke!", + "description": `${taggedUser} You have been poked by ${message.author}!`, + "color": 8311585, "footer": { "icon_url": message.author.displayAvatarURL(), - "text": footerTxt + "text": config.footerTxt }, - "fields": [ - { - "name": "Well that happened...", - "value": "You need to @mention an user!" - } - ] - }; - - if(!taggedUser) { - return message.channel.send({ embed: errorembed}); - // Checks if a user was mentioned. If not, returns error message. - } - - const embed = { - "title": "👉 Poke!", - "description": "<@" + taggedUser + "> You have been poked by <@" + messageAuthor + ">!", - "color": 8311585, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": footerTxt - }, - "image": { - "url": gif - } - } - - - message.channel.send({ embed: embed }); - } - } + "image": { + "url": gif + } + }}); + } + } +} diff --git a/commands/reload.js b/commands/reload.js index 59af0ac..84de5cd 100644 --- a/commands/reload.js +++ b/commands/reload.js @@ -1,44 +1,48 @@ module.exports = { name: 'reload', description: 'Reloads a command', - args: true, - execute(client, message, args, denied) { - if (message.author.id == 309427567004483586) { - const commandName = args[0].toLowerCase(); - const command = message.client.commands.get(commandName) - || message.client.commands.find(cmd => cmd.aliases && cmd.aliases.includes(commandName)); + async execute(client, message, args, config) { + 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())); + } + 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)); - if (!command) { - return message.channel.send(`There is no command with name or alias \`${commandName}\`, ${message.author}!`); - } + if (!command) { + await message.channel.send(client.generateErrorMessage(`There is no command with name or alias \`${commandName}\`, ${message.author}!`,message.author.displayAvatarURL())); + } else { + delete require.cache[require.resolve(`./${command.name}.js`)]; - 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!**`); + 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())); + } + } + }); - try { - const newCommand = require(`./${command.name}.js`); - message.client.commands.set(newCommand.name, newCommand); - message.channel.send(`<:NyabotSuccess:697211376740859914> **Reloaded \`${command.name}\` successfully!**`); - console.log('User reloaded ${command.name}.') - } catch (error) { - console.error(error); - message.channel.send(`<:AnitroxError:809651936563429416> There was an error while reloading \`${command.name}\`:\n\`${error.message}\``); - } - } else { - const embed = { - "title": "<:NyabotDenied:697145462565896194> **Access is denied**", - "color": 13632027, - "footer": { - "icon_url": "https://cdn.discordapp.com/attachments/549707869138714635/793524910172667964/Screenshot_26.png", - "text": "Made with ❤ in Illinois | Anitrox by IDeletedSystem64" - }, - "fields": [ - { - "name": "**What Happened?**", - "value": "You don't have the appropriate permissions to run this command!" - } - ] - }; - message.channel.send({ embed }); - } - }, + } else { + message.channel.send({embed: { + "title": "<:AnitroxDenied:809651936642203668> **403 Forbidden**", + "color": 13632027, + "footer": { + "icon_url": message.author.displayAvatarURL(), + "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 009cc4a..237e03c 100644 --- a/commands/restart.js +++ b/commands/restart.js @@ -1,18 +1,17 @@ - module.exports = { - name: 'restart', - description: '(Owner Only) Shuts down the bot.', - execute(client, message, args) { - const { token } = require('../config.json'); - if (message.author.id == 309427567004483586) { - message.channel.send(" Restarting...").then - client.destroy() - .catch(console.error) - .then - setTimeout(() => { client.login(token); }, 3000); - message.channel.send("<:NyabotSuccess:697211376740859914> Restart Successful") + name: 'restart', + description: '(Owner Only) Shuts down the bot.', + async execute(client, message) { + if (message.author.id == 309427567004483586 || message.author.id == 475558313376088064) { + 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") - } else { - message.channel.send("<:NyabotDenied:697145462565896194> Access Denied, You must be bot owner to execute this command."); - } - }} + } catch(e) {console.log(e);} + } else { + 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 a828250..3569904 100644 --- a/commands/setnick.js +++ b/commands/setnick.js @@ -1,49 +1,37 @@ module.exports = { - name: 'setnick', - description: 'Sets your nickname', - execute(client, message, args) { - + name: 'setnick', + description: 'Sets your nickname', + async execute(client, message, args, config) { + if (message.channel.permissionsFor(message.author).has("CHANGE_NICKNAME")) { - var newnick = args.slice(0).join(" ") + const newnick = args.slice(0).join(" ") - try { - const successembed = { - "title": "<:AnitroxSuccess:809651936819019796> Nickname Changed", - "color": 9442302, - "footer": { - "icon_url": "https://images-ext-2.discordapp.net/external/-qaO3jaZLojhEnjrHiKABdXD7gLWqFvdUqHdskNGWhE/https/media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png", - "text": "Made with ❤ in Illinois | Anitrox by IDeletedSystem64" - }, - "fields": [ - { - "name": "Changed nickname successfully!", - "value": "You need to have permission ``CHANGE_NICKNAME`` to change your nick!" - }, - { - "name": "New Nickname", - "value": newnick, - "inline": true - } - ] - }; - 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.") - message.channel.send({ embed: successembed }); - } catch (error) { - const failembed = { - "title": "<:AnitroxDenied:809651936642203668> Well that happened...", - "color": 13632027, - "footer": { - "icon_url": "https://cdn.discordapp.com/embed/avatars/0.png", - "text": "Made with ❤ in Illinois | Anitrox © 2018-2021 IDeletedSystem64" - }, - "fields": [ - { - "name": "Failed to set nickname", - "value": "You need to have permission ``CHANGE_NICKNAME`` to change your nick!" - } - ] - }; - message.channel.send({ embed: failembed }); - }; - }; -}} + 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: { + "title": "<:AnitroxSuccess:809651936819019796> Nickname Changed", + "color": 9442302, + "footer": { + "icon_url": message.author.displayAvatarURL(), + "text": config.footerTxt + }, + "fields": [ + { + "name": "Changed nickname successfully!", + "value": "You need to have permission ``CHANGE_NICKNAME`` to change your nick!" + }, + { + "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?", message.author.displayAvatarURL())); + }; + } else { + await message.channel.send(client.generateErrorMessage("You need to have permission ``CHANGE_NICKNAME`` to change your nick!", message.author.displayAvatarURL())); + } + } +} diff --git a/commands/slap.js b/commands/slap.js index 106e0af..8e1d41b 100644 --- a/commands/slap.js +++ b/commands/slap.js @@ -1,47 +1,25 @@ module.exports = { - name: "slap", - description: "Slaps an user!", - execute(client, message, args) { - const {footerTxt} = require('../config.json'); - const taggedUser = message.mentions.users.first(); -//--------------------------------------------------- + name: "slap", + description: "Slaps an user!", + async execute(client, message, _, config) { + const taggedUser = message.mentions.users.first(); -//--------------------------------------------------- -const errorembed = { - "title": "<:AnitroxError:809651936563429416> Error", - "color": 13632027, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": footerTxt - }, - "fields": [ - { - "name": "Well that happened...", - "value": "You need to @mention an user!" - } - ] -}; - -if(!taggedUser) { - return message.channel.send({ embed: errorembed}); -// Checks if a user was mentioned. If not, returns error message. + if(!taggedUser) { + await message.channel.send(client.generateErrorMessage("You need to @mention a user!", message.author.displayAvatarURL())); + } else { + await message.channel.send({embed: { + "title": ":anger: Slap", + "description": `${taggedUser} You have been slapped by ${message.author}!`, + "color": 9442302, + "footer": { + "icon_url": message.author.displayAvatarURL(), + "text": config.footerTxt + }, + "image": { + "url": "https://media1.tenor.com/images/b6d8a83eb652a30b95e87cf96a21e007/tenor.gif?itemid=10426943" + } + }}); + } + } } - - const embed = { - "title": ":anger: Slap", - "description": "<@" + taggedUser + "> You have been slapped by <@" + messageAuthor + ">!", - "color": 9442302, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": footerTxt - }, - "image": { - "url": "https://media1.tenor.com/images/b6d8a83eb652a30b95e87cf96a21e007/tenor.gif?itemid=10426943" - } - } - - - message.channel.send({ embed: embed }); - } - } diff --git a/commands/snuggle.js b/commands/snuggle.js index 583219c..cda8b8a 100644 --- a/commands/snuggle.js +++ b/commands/snuggle.js @@ -1,36 +1,33 @@ +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" +]; + + module.exports = { name: "snuggle", description: "Snuggle an user!", - execute(client, message, args) { - const {footerTxt} = require('../config.json'); + async execute(client, message, _, config) { const taggedUser = message.mentions.users.first(); - // -------------------------------------- - 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" - - ]; - const index = Math.floor(Math.random() * (gifchoices.length - 1) + 1); - var gif = (gifchoices[index]); - // --------------------------------------- - - const embed = { - "title": "<:BlobSnuggleCat:806759753450782731> Snuggle", - "description": "<@" + taggedUser + ">" + " You have been snuggled by " + "<@" + messageAuthor + ">!", - "color": 9442302, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": footerTxt - }, - "image": { - "url": gif - } + if(!taggedUser) { + 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: { + "title": "<:BlobSnuggleCat:806759753450782731> Snuggle", + "description": `${taggedUser} You have been snuggled by ${message.author}!`, + "color": 9442302, + "footer": { + "icon_url": message.author.displayAvatarURL(), + "text": config.footerTxt + }, + "image": { + "url": gif } - - - message.channel.send({ embed: embed }); - } - } \ No newline at end of file + }}); + } + } +} \ No newline at end of file diff --git a/commands/stop.js b/commands/stop.js index 7b3fe5f..5fa179c 100644 --- a/commands/stop.js +++ b/commands/stop.js @@ -1,32 +1,29 @@ module.exports = { - name: "stop", - description: "Stops the bot", - execute(client, message, args) { - if (message.author.id == 309427567004483586) { - const embed = { - "title": " **Shutting Down...**", - "description": "See you next time!", - "color": 9442302, - "footer": { - "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png", - "text": "Made with ❤ in Illinois | Anitrox © 2018-2021 IDeletedSystem64" - } - }; - message.channel.send({ embed }); - setTimeout(function(){ - client.destroy() - }, 5000); - } else { - const denied = { - "title": ":AnitroxDenied: Access Denied", - "description": "You need to be the bot owner to execute this command!", - "color": 13632027, - "footer": { - "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png", - "text": "Made with ❤ in Illinois | Anitrox © 2018-2021 IDeletedSystem64" - } - }; - message.channel.send({ denied }); - } - } - } \ No newline at end of file + name: "stop", + description: "IT'S TIME TO STOP!... the bot", + async execute(_, message, config) { + if (message.author.id == config.ownerID) { + await message.channel.send({embed: { + "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({embed: { + "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 0cb944f..f7427a0 100644 --- a/commands/uinfo.js +++ b/commands/uinfo.js @@ -2,18 +2,15 @@ module.exports = { name: "uinfo", description: "Gets info about an user, such as ID, Discord Join date and more", syntax: "", - execute(client, message, args) { - const {footerTxt} = require('../config.json'); - let user = message.mentions.users.first() || args[0] - if (!user) user = message.author - const embed = { - "title": "Everything you've ever wanted to know about " + user.username + "!", + 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: { + "title": `Everything you've ever wanted to know about ${user.username}!`, "color": 9442302, "footer": { "icon_url": message.author.displayAvatarURL(), - "text": footerTxt + "text": config.footerTxt }, - "thumbnail": { "url": user.displayAvatarURL() }, @@ -44,7 +41,7 @@ module.exports = { }, { "name": "User ID", - "value": "``" + user.id + "``" + "value": `\`${user.id}\`` }, { "name": "User Joined Discord", @@ -52,7 +49,6 @@ module.exports = { inline: true }, ] - }; - message.channel.send({ embed: embed }); - } + }}); } +} diff --git a/config-example.json b/config-example.json index b6e2ed2..47afd8f 100644 --- a/config-example.json +++ b/config-example.json @@ -1,37 +1,57 @@ { - "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", - "Chromium" -], -"locations": [ -"Microsoft", -"LinusTechTips", -"Linus Torvalds", -"borkeonv2", -"Google", -"192.168.1.1", -"127.0.0.1", -"Sophie's computer", -"Mars", -"Elon Musk", -"TMC Software" -] -} \ No newline at end of file + "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", + "Chromium" + ], + "locations": [ + "Microsoft", + "LinusTechTips", + "Linus Torvalds", + "borkeonv2", + "Google", + "192.168.1.1", + "127.0.0.1", + "Sophie's computer", + "Mars", + "Elon Musk", + "TMC Software" + ], + "answers": [ + "Heck no!", + "Are you crazy!? No!", + "Don't even think about it.", + "No! You might bork something!", + "Heck yeah", + "I don't think so.", + "Let me think about it first. No.", + "Let me think about it first. Yeah", + "Let me think about it first. Maybe", + "I don't know man", + "Maybe", + "I'm not sure", + "Ask again", + "YEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE!!!", + "Definitely!", + "Go for it! :smile:", + "Good idea!", + "Sure" + ] + } \ No newline at end of file diff --git a/start.js b/start.js old mode 100644 new mode 100755 index 3c3169f..9dfde1a --- a/start.js +++ b/start.js @@ -1,9 +1,8 @@ +#!/usr/bin/env -S node + const fs = require('fs'); const Discord = require('discord.js'); -const { MessageActionRow, MessageButton } = require('discord.js') -const { statuses, build, release, prefix, token, footerTxt } = require('./config.json'); -const os = require("os"); - +const config = require('./config.json'); console.log('Starting!') const client = new Discord.Client(); client.commands = new Discord.Collection(); @@ -11,56 +10,70 @@ 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.on("error", (e) => console.log("[ERROR]" + error(e))); -client.on("warn", (e) => ("[WARN]" + warn(e))); -// Log errors to console. +client.generateErrorMessage = (errorMsg, messageAuthorURL) => ({embed: { + "title": "<:AnitroxError:809651936563429416> Error", + "color": 13632027, + "footer": { + "icon_url": messageAuthorURL, + "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.once('ready', () => { console.clear() console.log(' ___ _ __ '); console.log(' / | ____ (_) /__________ _ __'); - console.log(' / /| | / __ \/ / __/ ___/ __ \| |/_/'); + console.log(' / /| | / __ \\/ / __/ ___/ __ \\| |/_/'); console.log(' / ___ |/ / / / / /_/ / / /_/ /> < '); - console.log('/_/ |_/_/ /_/_/\__/_/ \____/_/|_| ') - console.log(release + ", " + build) - console.log("All Systems Go. | Anitrox by IDeletedSystem64 | ALL MY CODE KEEPS BLOWING UP!"); + console.log('/_/ |_/_/ /_/_/\\__/_/ \\____/_/|_| '); + console.log(`${config.release}, ${config.build}`); + 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); + }); -setInterval(() => { - const index = Math.floor(Math.random() * (statuses.length - 1) + 1); - client.user.setActivity(statuses[index]); -}, 20000); -// Picks a status from the config file // Begin Command Handler -client.on('message', message => { +client.on('message', async (message) => { - if (!message.content.startsWith(prefix) || message.author.bot) return; - const args = message.content.slice(prefix.length).split(/ +/); + if (!message.content.startsWith(config.prefix) || message.author.bot) return; + + const args = message.content.slice(config.prefix.length).split(/ +/); const command = args.shift().toLowerCase(); if (!client.commands.has(command)) return; try { - client.commands.get(command).execute(client, message, args, footerTxt, Discord); + await client.commands.get(command).execute(client, message, args, config); } catch (error) { - console.stack - const usr = message.author; - const embed = { + console.stack; + message.channel.send({embed: { "title": "<:AnitroxError:809651936563429416> **Something went wrong!**", "description": error.stack, "color": 13632027, - "footer": { - "icon_url": message.author.displayAvatarURL(), - "text": footerTxt + " | Something went wrong! :(" - } - }; - message.channel.send({ embed }); -// End Command Handler - } + "footer": { + "icon_url": message.author.displayAvatarURL(), + "text": config.footerTxt + }, + }}); + } }); -client.login(token); \ No newline at end of file +client.login(config.token); \ No newline at end of file