From 67b126ccff7dd0e77788f7dae0c9759a1d7f1328 Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Wed, 10 Aug 2022 17:18:59 -0500 Subject: [PATCH 1/5] Add .env to Gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index dc2fb20..a703372 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ node_modules/ .vscode package-lock.json releasenotes.txt -config.json \ No newline at end of file +config.json +.env From b7c4cb011e32f96173e41953fd7af60585146978 Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Wed, 10 Aug 2022 22:27:17 -0500 Subject: [PATCH 2/5] Fix errors when running with arguments | I don't trust this to not break again, xD --- commands/help.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/commands/help.js b/commands/help.js index 6b98b22..d8d9ce2 100644 --- a/commands/help.js +++ b/commands/help.js @@ -22,6 +22,7 @@ module.exports = { if (!command) { return { embeds: [{ + color: 9442302, title: `:question: SEYMOUR! THE ${client.user.username} IS ON FIRE!`, description: `Run ${config.prefix}help for more information on each command.`, footer: { @@ -35,12 +36,11 @@ module.exports = { }; } - // const cmdName = args[0].toLowerCase(); const cmdName = command; const cmd = client.commands.get(cmdName); - console.log(cmd.options.map(option => option.required)); + console.log(cmd.options.map); if (!cmd) { - return client.generateErrorMessage(`${cmdName} is not a valid command! Run ${config.prefix}help for a command list.`); + return client.generateErrorMessage(`${cmdName} is not a valid command. Run ${config.prefix}help for a command list!`); } return { embeds: [{ @@ -55,8 +55,8 @@ module.exports = { { name: 'Command Name', value: `${cmdName}`, inline: true }, { name: 'Command Description', value: cmd.description, inline: true }, { name: 'Command Options', value: cmd.options.map(option => option.name).join('\n') || 'None', inline: true }, - { name: 'Command Option Description', value: cmd.options.map(option => option.description) || 'None', inline: true } -// { name: 'Command Option Required?', value: cmd.options.map(option => option.required) ? 'Yes' : 'No' } + { name: 'Command Option Description', value: cmd.options.map(option => option.description).join('\n') || 'None', inline: true } + // { name: 'Command Option Required?', value: cmd.options.map(option => option.required) ? 'Yes' : 'No' } ] }] }; From 3a5f1ce2d2ce3c3cb3402fac6876466eeb39bf66 Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Wed, 10 Aug 2022 22:27:57 -0500 Subject: [PATCH 3/5] Remove unneccessary comments --- functions/uptime.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/functions/uptime.js b/functions/uptime.js index ba0a557..2133dab 100644 --- a/functions/uptime.js +++ b/functions/uptime.js @@ -5,8 +5,6 @@ module.exports = (uptime) => { const tHrs = parseInt((tSeconds % 86400) / 3600); const tMins = parseInt((tSeconds % 3600) / 60); const tSecs = parseInt(tSeconds % 60); - // We can probably just return tSeconds (totalSeconds) instead of parsing. - // So that was a fucking lie. const days = tDays + (tDays === 1 ? ' day' : ' days'); const hours = tHrs + (tHrs === 1 ? ' hour' : ' hours'); From 95a7df98b3f8f4534635a5abe4715c497afadaaa Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Thu, 11 Aug 2022 16:11:43 -0500 Subject: [PATCH 4/5] Mention source and self-hosting, Clean up embed code --- commands/invite.js | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/commands/invite.js b/commands/invite.js index f918bfa..a809d75 100644 --- a/commands/invite.js +++ b/commands/invite.js @@ -26,18 +26,10 @@ module.exports = { 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)' - } + { 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: 'Anitrox Dev, Self hosting and more!', value: 'Self-host your own Anitrox (including dev!), Contribute, and more! The possibilites are endless. [Anitrox Source](https://github.com/IDeletedSystem64/anitrox)' }, + { name: 'Need help?', value: 'Come join the Anitrox Support Server, for support and much more!\n [Anitrox Support Server](https://discord.gg/grebRGsBZ3)' } ] }] }; From ca3e1dd37e83e4530f1551eedb6fe694274a43d5 Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Thu, 11 Aug 2022 16:38:30 -0500 Subject: [PATCH 5/5] Mostly finish help refactor. Check desc for more info The embed design could be hell of a lot more organized, but unfortunately I don't really want to spend the time to set up how I want to do categories for this release, so hopefully 1.4 this will be more organized. --- commands/help.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/commands/help.js b/commands/help.js index d8d9ce2..1b9eb6d 100644 --- a/commands/help.js +++ b/commands/help.js @@ -6,7 +6,7 @@ module.exports = { description: 'Get help on anything from commands, to what the bot does! just not your homework..', options: [{ name: 'help', - description: 'View Information about this command', + description: 'The command you want information on', required: false, type: Constants.ApplicationCommandOptionTypes.STRING }], @@ -30,7 +30,7 @@ module.exports = { text: config.footerTxt }, fields: [ - { name: 'Commands', value: client.commands.map(command => command.name).join('\n') } + { name: 'Commands', value: client.commands.map(command => command.name).join(', ') } ] }] };