Update PTB to 1.3ptb_final

Pull latest commits into PTB.
This commit is contained in:
Sophie Marie 2022-08-11 23:06:39 -05:00 committed by GitHub
commit ba8643b537
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 22 deletions

3
.gitignore vendored
View File

@ -2,4 +2,5 @@ node_modules/
.vscode
package-lock.json
releasenotes.txt
config.json
config.json
.env

View File

@ -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
}],
@ -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: {
@ -29,18 +30,17 @@ 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(', ') }
]
}]
};
}
// 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' }
]
}]
};

View File

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

View File

@ -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');