Merge upstream changed into Foxi's dev build

This commit is contained in:
Nathaniel Mason 2022-04-21 17:36:03 +01:00
parent 2189417343
commit fb3f26cdd4
17 changed files with 49 additions and 49 deletions

View File

@ -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",

View File

@ -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": "<a:SylvBonk:801185845847130113> Bonk",

View File

@ -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: [{

34
commands/contributors.js Normal file
View File

@ -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)"
}
]
}]});
}
}

View File

@ -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",

View File

@ -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: [{

View File

@ -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: [{

View File

@ -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: [{

View File

@ -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: [{

View File

@ -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: [{

View File

@ -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! ❤"
}
]
}]});
}
}

View File

@ -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: [{

View File

@ -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: [{

View File

@ -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",

View File

@ -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",

View File

@ -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: [{

View File

@ -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": [