diff --git a/README.md b/README.md index 34a8bf6..02df974 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ -# Anitrox Dev -# aka anitrox_unstable -This is for the dev branch of the bot, The bot can be used in the Support/Development server. +# Anitrox Dev Branch +# anitrox_unstable +This is for the ultra-fresh builds of Anitrox and is **very** unstable. It is only avaliable in Anitrox Central. +# These builds are UNSUPPORTED and you will not be able to recieve support if there's a problem. It's best you wait for a new build if you're having a problem. diff --git a/commands/8ball.js b/commands/8ball.js index 4c324d1..94c73fd 100644 --- a/commands/8ball.js +++ b/commands/8ball.js @@ -25,7 +25,7 @@ module.exports = { "color": 13632027, "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" + "text": "Made with ❤ in Illinois | Anitrox by IDeletedSystem64" } } } diff --git a/commands/addstatus.js b/commands/addstatus.js new file mode 100644 index 0000000..2469412 --- /dev/null +++ b/commands/addstatus.js @@ -0,0 +1,26 @@ +const { Message } = require('discord.js'); +const fs = require('fs'); +module.exports = { + name: 'addstatus', + description: 'Adds a new custom status to Anitrox', + async execute(message, args) { + const embed = { + "title": "<:AnitroxSuccess:809651936819019796> Status Added", + "color": 3585665, + "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": "Successfully added status!", + "value": "Added status " + args.slice(0,2) + } + ] + }; + const statuses = JSON.parse((await fs.promises.readFile('./statuses.json')).toString()) + statuses.push(args.slice(0,2)) + await fs.promises.writeFile('./statuses.json', JSON.stringify(ranges)); + Message.channel.send( {embed} ) + } + } \ No newline at end of file diff --git a/commands/avatar.js b/commands/avatar.js index 6703783..061104c 100644 --- a/commands/avatar.js +++ b/commands/avatar.js @@ -9,8 +9,8 @@ module.exports = { "description": "Here is " + user.username + "'s avatar!", "color": 9442302, "footer": { - "icon_url": "https://cdn.discordapp.com/embed/avatars/0.png", - "text": "Made with <3 in Illinois | Anitrox (C) 2018-2021 IDeletedSystem64" + "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png", + "text": "Made with ❤ in Illinois | Anitrox © IDeletedSystem64 2018-2021" }, "image": { "url": user.displayAvatarURL() diff --git a/commands/bonk.js b/commands/bonk.js index 6daa809..11e0fea 100644 --- a/commands/bonk.js +++ b/commands/bonk.js @@ -10,7 +10,7 @@ module.exports = { "color": 13632027, "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" + "text": "Made with ❤ in Illinois | Anitrox by IDeletedSystem64" }, "fields": [ { diff --git a/commands/cheese.js b/commands/cheese.js index 2dff733..6f78914 100644 --- a/commands/cheese.js +++ b/commands/cheese.js @@ -20,7 +20,7 @@ module.exports = { "color": 16312092, "footer": { "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png", - "text": "Made with ❤ in Illinois | Anitrox © IDeletedSystem64 2018-2021" + "text": "Made with ❤ in Illinois | Anitrox by IDeletedSystem64" }, "image": { "url": "https://cdn.discordapp.com/attachments/803658122299572255/812867714368536636/R06325af354168febcafd96b8328b7590.png" diff --git a/commands/cuddle.js b/commands/cuddle.js index a151285..4f08ccf 100644 --- a/commands/cuddle.js +++ b/commands/cuddle.js @@ -26,7 +26,7 @@ module.exports = { "color": 9442302, "footer": { "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png", - "text": "Made with ❤ in Illinois | Anitrox © IDeletedSystem64 2018-2021" + "text": "Made with ❤ in Illinois | Anitrox by IDeletedSystem64" }, "image": { "url": gif diff --git a/commands/help.js b/commands/help.js index 26b15e0..0cf7b16 100644 --- a/commands/help.js +++ b/commands/help.js @@ -10,20 +10,16 @@ const embed = { "color": 9442302, "description": "More commands are soon to come, stay tuned!", "footer": { - "text": "Some commands are hidden for dev-only. | Anitrox © IDeletedSystem64 2018-2021" + "text": "Made with ❤ in Illinois | Anitrox by IDeletedSystem64" }, "fields": [ { "name": "Utility Commands", "value": "`help` ``info`` ``userinfo`` ``ping`` ``invite`` ``avatar``" }, - { - "name": "Moderation Commands", - "value": "`ban`/`unban` `kick` `mute`/`unmute` " - }, { "name": "Server Management Commands", - "value": "`makerole`/`delrole`/`editrole` `setnick` `makechan`/`editchan`/`delchan` " + "value": "`setnick`" }, { "name": "Action Commands", @@ -36,9 +32,11 @@ const embed = { { "name": "**Or you can view the bot progress, known issues, and planned features!**", "value": "bit.ly/anitrox-trello" + }, + { + "name": "<:AnitroxInfo:809651936831733791> **The bot isn't yet fully finished. There's more to come! if I don't rewrite from scratch that is 😛**" } - ] }; message.channel.send({ embed }); diff --git a/commands/info.js b/commands/info.js index c051e9a..26ab987 100644 --- a/commands/info.js +++ b/commands/info.js @@ -33,7 +33,7 @@ module.exports = { "color": 9442302, "footer": { "icon_url": "https://cdn.discordapp.com/attachments/549707869138714635/793524910172667964/Screenshot_26.png", - "text": "Made with ❤ in Illinois | Anitrox © IDeletedSystem64 2018-2021 " + "text": "Made with ❤ in Illinois | Anitrox by IDeletedSystem64" }, "thumbnail": { "url": ("https://cdn.discordapp.com/avatars/576805923964715018/20f9b2815850dbbebd6d858308c90330.webp") diff --git a/commands/invite.js b/commands/invite.js index 1e5156b..77a02f1 100644 --- a/commands/invite.js +++ b/commands/invite.js @@ -10,7 +10,7 @@ module.exports = { "color": 9442302, "footer": { "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png", - "text": "Made with ❤ in Illinois | Anitrox © 2018-2021 IDeletedSystem64" + "text": "Made with ❤ in Illinois | Anitrox by IDeletedSystem64" }, "thumbnail": { "url": "https://cdn.discordapp.com/attachments/803658122299572255/814352905394061322/anitroxaddsrvr.png" diff --git a/commands/kiss.js b/commands/kiss.js index 2273463..b220904 100644 --- a/commands/kiss.js +++ b/commands/kiss.js @@ -23,7 +23,7 @@ module.exports = { "color": 13632027, "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" + "text": "Made with ❤ in Illinois | Anitrox by IDeletedSystem64" }, "fields": [ { diff --git a/commands/leskiss.js b/commands/leskiss.js index 5f83b2a..fa4982f 100644 --- a/commands/leskiss.js +++ b/commands/leskiss.js @@ -35,7 +35,7 @@ module.exports = { "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" + "text": "Made with ❤ in Illinois | Anitrox by IDeletedSystem64" }, "fields": [ { diff --git a/commands/nom.js b/commands/nom.js index 98f4961..b67fa75 100644 --- a/commands/nom.js +++ b/commands/nom.js @@ -23,7 +23,7 @@ module.exports = { "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" + "text": "Made with ❤ in Illinois | Anitrox by IDeletedSystem64" }, "fields": [ { diff --git a/commands/opensource.js b/commands/opensource.js new file mode 100644 index 0000000..946ecab --- /dev/null +++ b/commands/opensource.js @@ -0,0 +1,32 @@ +module.exports = { + name: 'opensource', + description: 'Attributions to open source components used by Anitrox', + execute(client, message, args){ + 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": "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" + }, + "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 diff --git a/commands/pat.js b/commands/pat.js index 54dc598..0e05524 100644 --- a/commands/pat.js +++ b/commands/pat.js @@ -22,7 +22,7 @@ module.exports = { "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" + "text": "Made with ❤ in Illinois | Anitrox by IDeletedSystem64" }, "fields": [ { diff --git a/commands/ping.js b/commands/ping.js index 17b350b..e8a4ac0 100644 --- a/commands/ping.js +++ b/commands/ping.js @@ -8,7 +8,7 @@ module.exports = { "fields": [ { "name": "Ping is " + client.ws.ping + " ms", - "value": "If this is more than 1500ms there may be a problem!" + "value": "If this is more than 350ms there may be a problem!" } ] }; diff --git a/commands/poke.js b/commands/poke.js index 1803d64..6b8ebd0 100644 --- a/commands/poke.js +++ b/commands/poke.js @@ -22,7 +22,7 @@ module.exports = { "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" + "text": "Made with ❤ in Illinois | Anitrox by IDeletedSystem64" }, "fields": [ { diff --git a/commands/reload.js b/commands/reload.js index a434e39..59af0ac 100644 --- a/commands/reload.js +++ b/commands/reload.js @@ -29,7 +29,7 @@ module.exports = { "color": 13632027, "footer": { "icon_url": "https://cdn.discordapp.com/attachments/549707869138714635/793524910172667964/Screenshot_26.png", - "text": "Anitrox © IDeletedSystem64 2018-2021 All Rights Reserved." + "text": "Made with ❤ in Illinois | Anitrox by IDeletedSystem64" }, "fields": [ { diff --git a/commands/setnick.js b/commands/setnick.js index 99afa6b..a828250 100644 --- a/commands/setnick.js +++ b/commands/setnick.js @@ -12,7 +12,7 @@ module.exports = { "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" + "text": "Made with ❤ in Illinois | Anitrox by IDeletedSystem64" }, "fields": [ { diff --git a/commands/slap.js b/commands/slap.js index 721acb8..94ebaa9 100644 --- a/commands/slap.js +++ b/commands/slap.js @@ -13,7 +13,7 @@ const errorembed = { "color": 13632027, "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" + "text": "Made with ❤ in Illinois | Anitrox by IDeletedSystem64" }, "fields": [ { diff --git a/commands/snuggle.js b/commands/snuggle.js index 4a5f982..3869711 100644 --- a/commands/snuggle.js +++ b/commands/snuggle.js @@ -23,7 +23,7 @@ module.exports = { "color": 9442302, "footer": { "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png", - "text": "Made with ❤ in Illinois | Anitrox © IDeletedSystem64 2018-2021" + "text": "Made with ❤ in Illinois | Anitrox by IDeletedSystem64" }, "image": { "url": gif diff --git a/commands/userinfo.js b/commands/userinfo.js index 71723c7..c8c05ed 100644 --- a/commands/userinfo.js +++ b/commands/userinfo.js @@ -25,7 +25,7 @@ module.exports = { "color": 9442302, "footer": { "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png", - "text": "Made with ❤ in Illinois | Anitrox © 2018-2021 IDeletedSystem64" + "text": "Made with ❤ in Illinois | Anitrox by IDeletedSystem644" }, "thumbnail": { diff --git a/config.json b/config.json index 258db82..264605b 100644 --- a/config.json +++ b/config.json @@ -1,8 +1,8 @@ { - "prefix": "n!", + "prefix": "np!", "token": "token", "ownerID": "309427567004483586", "release": "anitrox_ptb", - "build": "Anitrox Stable Release Canidiate 1" + "build": "Stable Release Canidiate 2, PSC3 " } diff --git a/package-lock.json b/package-lock.json index 60bb6db..69352da 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,65 +5,141 @@ "requires": true, "packages": { "": { - "name": "nyabotcanary", + "name": "projectanitrox", "version": "1.0.0", "license": "ISC", "dependencies": { - "discord.js": "^11.5.1", + "discord.js": "^12.5.1", "node-os-utils": "^1.3.2", "require-all": "^3.0.0" } }, - "node_modules/@discordjs/uws": { - "version": "10.149.0", - "resolved": "https://registry.npmjs.org/@discordjs/uws/-/uws-10.149.0.tgz", - "integrity": "sha512-N1wjoAD2DOgzevqzyTOWTgyO2divX03JWNQx4JHm/jQ/BRzZNkhwVRO3RC5Guww+srdgs4Tw4gwrzlJrlOhq/Q==", - "hasInstallScript": true, - "peer": true, + "node_modules/@discordjs/collection": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.1.6.tgz", + "integrity": "sha512-utRNxnd9kSS2qhyivo9lMlt5qgAUasH2gb7BEOn6p0efFh24gjGomHzWKMAPn2hEReOPQZCJaRKoURwRotKucQ==" + }, + "node_modules/@discordjs/form-data": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@discordjs/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-ZfFsbgEXW71Rw/6EtBdrP5VxBJy4dthyC0tpQKGKmYFImlmmrykO14Za+BiIVduwjte0jXEBlhSKf0MWbFp9Eg==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, "engines": { - "node": ">=6.0.0" + "node": ">= 6" } }, - "node_modules/async-limiter": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", - "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==" - }, - "node_modules/discord.js": { - "version": "11.6.4", - "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-11.6.4.tgz", - "integrity": "sha512-cK6rH1PuGjSjpmEQbnpuTxq1Yv8B89SotyKUFcr4RhnsiZnfBfDOev7DD7v5vhtEyyj51NuMWFoRJzgy/m08Uw==", + "node_modules/abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", "dependencies": { - "long": "^4.0.0", - "prism-media": "^0.0.4", - "snekfetch": "^3.6.4", - "tweetnacl": "^1.0.0", - "ws": "^6.0.0" + "event-target-shim": "^5.0.0" }, "engines": { - "node": ">=6.0.0" + "node": ">=6.5" + } + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/discord.js": { + "version": "12.5.3", + "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-12.5.3.tgz", + "integrity": "sha512-D3nkOa/pCkNyn6jLZnAiJApw2N9XrIsXUAdThf01i7yrEuqUmDGc7/CexVWwEcgbQR97XQ+mcnqJpmJ/92B4Aw==", + "dependencies": { + "@discordjs/collection": "^0.1.6", + "@discordjs/form-data": "^3.0.1", + "abort-controller": "^3.0.0", + "node-fetch": "^2.6.1", + "prism-media": "^1.2.9", + "setimmediate": "^1.0.5", + "tweetnacl": "^1.0.3", + "ws": "^7.4.4" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", + "engines": { + "node": ">=6" + } + }, + "node_modules/mime-db": { + "version": "1.48.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz", + "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.31", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz", + "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==", + "dependencies": { + "mime-db": "1.48.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/node-fetch": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", + "engines": { + "node": "4.x || >=6.0.0" + } + }, + "node_modules/node-os-utils": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/node-os-utils/-/node-os-utils-1.3.5.tgz", + "integrity": "sha512-bIJIlk+hA+7/ATnu3sQMtF697iw9T/JksDhKMe9uENG0OhzIG7hLM6fbcyu18bOuajlYWnSlj0IhDo2q7k0ebg==" + }, + "node_modules/prism-media": { + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-1.2.9.tgz", + "integrity": "sha512-UHCYuqHipbTR1ZsXr5eg4JUmHER8Ss4YEb9Azn+9zzJ7/jlTtD1h0lc4g6tNx3eMlB8Mp6bfll0LPMAV4R6r3Q==", "peerDependencies": { - "@discordjs/opus": "^0.1.0", - "@discordjs/uws": "^10.149.0", - "bufferutil": "^4.0.0", - "erlpack": "discordapp/erlpack", - "libsodium-wrappers": "^0.7.3", - "node-opus": "^0.2.7", - "opusscript": "^0.0.6", - "sodium": "^2.0.3" + "@discordjs/opus": "^0.5.0", + "ffmpeg-static": "^4.2.7 || ^3.0.0 || ^2.4.0", + "node-opus": "^0.3.3", + "opusscript": "^0.0.8" }, "peerDependenciesMeta": { "@discordjs/opus": { "optional": true }, - "bufferutil": { - "optional": true - }, - "erlpack": { - "optional": true - }, - "libsodium-wrappers": { + "ffmpeg-static": { "optional": true }, "node-opus": { @@ -71,30 +147,9 @@ }, "opusscript": { "optional": true - }, - "sodium": { - "optional": true - }, - "uws": { - "optional": true } } }, - "node_modules/long": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", - "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" - }, - "node_modules/node-os-utils": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/node-os-utils/-/node-os-utils-1.3.2.tgz", - "integrity": "sha512-wUo/q6u77y9+DBaXkn57IDyJlQuN7xP6VU9h6yeIGhKocc9rDQPyc3WmLgX+x5jf4WmbLcEaA3raM05+v5jW3g==" - }, - "node_modules/prism-media": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-0.0.4.tgz", - "integrity": "sha512-dG2w7WtovUa4SiYTdWn9H8Bd4JNdei2djtkP/Bk9fXq81j5Q15ZPHYSwhUVvBRbp5zMkGtu0Yk62HuMcly0pRw==" - }, "node_modules/require-all": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/require-all/-/require-all-3.0.0.tgz", @@ -103,11 +158,10 @@ "node": ">= 0.8" } }, - "node_modules/snekfetch": { - "version": "3.6.4", - "resolved": "https://registry.npmjs.org/snekfetch/-/snekfetch-3.6.4.tgz", - "integrity": "sha512-NjxjITIj04Ffqid5lqr7XdgwM7X61c/Dns073Ly170bPQHLm6jkmelye/eglS++1nfTWktpP6Y2bFXjdPlQqdw==", - "deprecated": "use node-fetch instead" + "node_modules/setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" }, "node_modules/tweetnacl": { "version": "1.0.3", @@ -115,62 +169,126 @@ "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==" }, "node_modules/ws": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", - "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", - "dependencies": { - "async-limiter": "~1.0.0" + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", + "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } } } }, "dependencies": { - "@discordjs/uws": { - "version": "10.149.0", - "resolved": "https://registry.npmjs.org/@discordjs/uws/-/uws-10.149.0.tgz", - "integrity": "sha512-N1wjoAD2DOgzevqzyTOWTgyO2divX03JWNQx4JHm/jQ/BRzZNkhwVRO3RC5Guww+srdgs4Tw4gwrzlJrlOhq/Q==", - "peer": true + "@discordjs/collection": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.1.6.tgz", + "integrity": "sha512-utRNxnd9kSS2qhyivo9lMlt5qgAUasH2gb7BEOn6p0efFh24gjGomHzWKMAPn2hEReOPQZCJaRKoURwRotKucQ==" }, - "async-limiter": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", - "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==" - }, - "discord.js": { - "version": "11.6.4", - "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-11.6.4.tgz", - "integrity": "sha512-cK6rH1PuGjSjpmEQbnpuTxq1Yv8B89SotyKUFcr4RhnsiZnfBfDOev7DD7v5vhtEyyj51NuMWFoRJzgy/m08Uw==", + "@discordjs/form-data": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@discordjs/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-ZfFsbgEXW71Rw/6EtBdrP5VxBJy4dthyC0tpQKGKmYFImlmmrykO14Za+BiIVduwjte0jXEBlhSKf0MWbFp9Eg==", "requires": { - "long": "^4.0.0", - "prism-media": "^0.0.4", - "snekfetch": "^3.6.4", - "tweetnacl": "^1.0.0", - "ws": "^6.0.0" + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" } }, - "long": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", - "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" + "abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "requires": { + "event-target-shim": "^5.0.0" + } + }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + }, + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "requires": { + "delayed-stream": "~1.0.0" + } + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + }, + "discord.js": { + "version": "12.5.3", + "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-12.5.3.tgz", + "integrity": "sha512-D3nkOa/pCkNyn6jLZnAiJApw2N9XrIsXUAdThf01i7yrEuqUmDGc7/CexVWwEcgbQR97XQ+mcnqJpmJ/92B4Aw==", + "requires": { + "@discordjs/collection": "^0.1.6", + "@discordjs/form-data": "^3.0.1", + "abort-controller": "^3.0.0", + "node-fetch": "^2.6.1", + "prism-media": "^1.2.9", + "setimmediate": "^1.0.5", + "tweetnacl": "^1.0.3", + "ws": "^7.4.4" + } + }, + "event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==" + }, + "mime-db": { + "version": "1.48.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz", + "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==" + }, + "mime-types": { + "version": "2.1.31", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz", + "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==", + "requires": { + "mime-db": "1.48.0" + } + }, + "node-fetch": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" }, "node-os-utils": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/node-os-utils/-/node-os-utils-1.3.2.tgz", - "integrity": "sha512-wUo/q6u77y9+DBaXkn57IDyJlQuN7xP6VU9h6yeIGhKocc9rDQPyc3WmLgX+x5jf4WmbLcEaA3raM05+v5jW3g==" + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/node-os-utils/-/node-os-utils-1.3.5.tgz", + "integrity": "sha512-bIJIlk+hA+7/ATnu3sQMtF697iw9T/JksDhKMe9uENG0OhzIG7hLM6fbcyu18bOuajlYWnSlj0IhDo2q7k0ebg==" }, "prism-media": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-0.0.4.tgz", - "integrity": "sha512-dG2w7WtovUa4SiYTdWn9H8Bd4JNdei2djtkP/Bk9fXq81j5Q15ZPHYSwhUVvBRbp5zMkGtu0Yk62HuMcly0pRw==" + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-1.2.9.tgz", + "integrity": "sha512-UHCYuqHipbTR1ZsXr5eg4JUmHER8Ss4YEb9Azn+9zzJ7/jlTtD1h0lc4g6tNx3eMlB8Mp6bfll0LPMAV4R6r3Q==", + "requires": {} }, "require-all": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/require-all/-/require-all-3.0.0.tgz", "integrity": "sha1-Rz1JcEvjEBFc4ST3c4Ox69hnExI=" }, - "snekfetch": { - "version": "3.6.4", - "resolved": "https://registry.npmjs.org/snekfetch/-/snekfetch-3.6.4.tgz", - "integrity": "sha512-NjxjITIj04Ffqid5lqr7XdgwM7X61c/Dns073Ly170bPQHLm6jkmelye/eglS++1nfTWktpP6Y2bFXjdPlQqdw==" + "setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" }, "tweetnacl": { "version": "1.0.3", @@ -178,12 +296,10 @@ "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==" }, "ws": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", - "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", - "requires": { - "async-limiter": "~1.0.0" - } + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", + "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", + "requires": {} } } } diff --git a/package.json b/package.json index 8918333..3676fe6 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "Discord Bot Based on Discord.JS", "main": "start.js", "dependencies": { - "discord.js": "^11.5.1", + "discord.js": "^12.5.1", "node-os-utils": "^1.3.2", "require-all": "^3.0.0" }, diff --git a/releasenotes.txt b/releasenotes.txt new file mode 100644 index 0000000..9238212 --- /dev/null +++ b/releasenotes.txt @@ -0,0 +1,14 @@ +:anitroxaddserver: **Anitrox has been updated.** +**Old Version: Anitrox Stable Release Canidiate 1, Build 500** +**New Version: Stable Release Canidiate 2, Version PR3** +This new major release brings new features, and bug fixes to Anitrox and paves the way towards Stable release. + +**What's New** +Anitrox Source code has been released to the public, If ya want to poke around or make contributions either run ``np!opensource`` and select "Anitrox Project" +Reduced the amount of statuses that Anitrox uses, it used more lines than actual code I think >w>. Also added some new ones! +Changed the footer +Localization updates-nahjk (maybe one day? 🤔) +Simplified error message +Patched a security vulnerbility in one of the dependencies, I forget what it was but Dependabot gave me a heads up about it soo ¯\_(ツ)_ +Probably a bunch of other stuff I've forgot about 🙃 +https://www.youtube.com/watch?v=_WW2JWIv6G8 diff --git a/start.js b/start.js index f460495..8a2eaa2 100644 --- a/start.js +++ b/start.js @@ -1,42 +1,30 @@ -console.log('Preparing to start!') +console.log('(Info) Preparing to start!') const fs = require('fs'); +console.log('(Info) Loaded Filesystem successfully!') const Discord = require('discord.js'); +console.log('(Info) Loaded Discord successfully!') const { build, release, prefix, token } = require('./config.json'); const { denied, error, info, success, warning } = require('./icons.json'); const os = require("os"); +console.log('(Info) Loaded OS successfully!') const activities_list = [ "with np!help", - "Where am I?", - "with Sylveons!", - "on my host's hard disk", - "with Sophie", - "HAAAAAAAAPPPPPPPYYYYYYYYYYYYYYYYYYYY", - "Running on " + process.platform + " / " + os.version() + "!", - "with the tea machine", - "with Borked Computers", - "on Sophie's main PC- wait shoot she's coming", - "btw I use Debian linux", - "Watching you", - "Running " + release + " Version " + build, - "in Incognito Mode- wait what", - "uwu", - "Team Fortress 2 with Sophie", - "videos on Hulu", - "American Truck Simulator", - "with my users!", - "with Sophies skirt", - "Euro Truck Simulator 2", - "with a screwdriver", - "Found new hardware.", - "@everyone" + "with Sophie!", + "Trans Rights!", + "in your computer", + "with my internet router", + "ssh: system64@borkeonv2", + "YouTube", + "with source code", + "Visual Studio Code" ]; console.log('Starting! This should only take a moment.') const client = new Discord.Client(); client.commands = new Discord.Collection(); const footicon = "https://cdn.discordapp.com/attachments/803658122299572255/805506708352008232/system64.png" -const footer = "Made with ❤ in Illinois | Anitrox © 2018-2021 IDeletedSystem64" +const footer = "Made with ❤ in Illinois | Anitrox, by IDeletedSystem64" const commandFiles = fs.readdirSync('./commands').filter(file => file.endsWith('.js')); @@ -55,8 +43,8 @@ client.once('ready', () => { console.log(' / /| | / __ \/ / __/ ___/ __ \| |/_/'); console.log(' / ___ |/ / / / / /_/ / / /_/ /> < '); console.log('/_/ |_/_/ /_/_/\__/_/ \____/_/|_| ') - console.log(release + " " + build) - console.log('All Systems Go. | Anitrox (C) 2021 IDeletedSystem64.'); + console.log(release + ", " + build) + console.log("All Systems Go. | Anitrox by IDeletedSystem64 | We're now open-source! Check it out at bit.ly/anitroxsource"); }); setInterval(() => { const index = Math.floor(Math.random() * (activities_list.length - 1) + 1); @@ -74,13 +62,13 @@ client.on('message', message => { try { client.commands.get(command).execute(client, message, args, Discord); } catch (error) { - console.error + console.stack const embed = { "title": "<:AnitroxError:809651936563429416> **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." + "text": footer }, "fields": [ {