From 1a6cd52d0660f43640a2ec8dd7e349a002a16851 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Thu, 9 Apr 2020 00:09:55 +1000 Subject: [PATCH] sans --- commands/help.js | 62 ++++++++------------------ file.log | 110 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 43 deletions(-) diff --git a/commands/help.js b/commands/help.js index 71fb776..3805e7e 100644 --- a/commands/help.js +++ b/commands/help.js @@ -11,8 +11,8 @@ exports.help = { name: 'help', category: 'General', description: 'Sends you a list of Woomy\'s commands.', - usage: '`help `\n`help all` - View full command list.', - params: '`` - The name of the command you want more information on.' + usage: '`help` - Lists all commands.\n`help ` - Receive more information on a command.', + examples: '`help`\n`help roleinfo`' } const Discord = require('discord.js') @@ -29,75 +29,51 @@ exports.run = (client, message, args, level, data) => { const categories = [] if (!args[0]) { - embed.setTitle('Woomy Help') - embed.setDescription(`• Prefixes: ${'`' + prefixes.join('`, `') + '`'}\n• Use \`help \` to recieve more information about a command!\n• Use \`help all\` to view hidden commands!\n• [Join my support server](https://discord.gg/HCF8mdv) if you have any issues/questions while using me!\n• [click here](https://discordapp.com/oauth2/authorize?client_id=435961704145485835&permissions=8&scope=bot) to add me to your own server!`) - const commands = message.guild ? client.commands.filter( - cmd => client.levelCache[cmd.conf.permLevel] <= level - ) : client.commands.filter( - cmd => client.levelCache[cmd.conf.permLevel] <= level && cmd.conf.guildOnly !== true - ) - - commands.forEach((cmd) => { - if (!categories.includes(cmd.help.category)) { - categories.push(cmd.help.category) - } - }) - - categories.sort().forEach((cat) => { - const filtered = commands.filter((cmd) => cmd.help.category === cat) - embed.addField(cat + ` [${filtered.size}]`, filtered.map((cmd) => '`' + cmd.help.name + '`').join(', '), true) - }) - - if (message.guild && data.guild.customCommands.length > 0) { - embed.addField('Custom', data.guild.customCommands.map((cmd) => '`' + cmd.name + '`').join(' ')) - } - - return message.channel.send(embed) - } else if (args[0].toLowerCase() === 'all') { - embed.setTitle('Woomy Help') - embed.setDescription(`• Prefixes: ${'`' + prefixes.join('`, `') + '`'}\n• Use \`help \` to recieve more information about a command!\n• [Join my support server](https://discord.gg/HCF8mdv) if you have any issues/questions while using me!\n• [click here](https://discordapp.com/oauth2/authorize?client_id=435961704145485835&permissions=8&scope=bot) to add me to your own server!`) + embed.setTitle('Woomy Commands') + embed.setDescription(`• Prefixes: ${'`' + prefixes.join('`, `') + '`'}\n• Use \`help \` to recieve more information about a command!\n• [Join my support server](https://discord.gg/HCF8mdv)`) const commands = client.commands commands.forEach((cmd) => { if (!categories.includes(cmd.help.category)) { + if (cmd.help.category === 'Developer' && !client.config.devs.includes('message.author.id')) { + return + } categories.push(cmd.help.category) } }) categories.sort().forEach((cat) => { const filtered = commands.filter((cmd) => cmd.help.category === cat) - embed.addField(cat + ` [${filtered.size}]`, filtered.map((cmd) => '`' + cmd.help.name + '`').join(' ')) + embed.addField(cat, filtered.map((cmd) => '`' + cmd.help.name + '`').join(', ')) }) if (message.guild && data.guild.customCommands.length > 0) { embed.addField('Custom', data.guild.customCommands.map((cmd) => '`' + cmd.name + '`').join(' ')) } + embed.addField('Invite', '[Invite](https://discordapp.com/oauth2/authorize?client_id=435961704145485835&permissions=8&scope=bot) | [Discord Server](https://discord.gg/HCF8mdv)') return message.channel.send(embed) - } else if (args[0]) { + } else { const command = args.shift().toLowerCase() const cmd = client.commands.get(command) || client.commands.get(client.aliases.get(command)) if (!cmd) { return message.channel.send('Command/alias doesn\'t exist') } - let aliases = '' + let desc = '' + if (cmd.conf.aliases.length > 0) { - aliases = cmd.conf.aliases.join(', ') + desc += `*(Aliases: ${cmd.conf.aliases.join(', ')})*\n\n` } + desc += cmd.help.description + `\n\n**You need the \`${cmd.conf.permLevel}\` rank to run this command! This command has a cooldown of \`${cmd.conf.cooldown / 1000}\` seconds per user.**` + embed.setTitle(cmd.help.category.toLowerCase() + ':' + cmd.help.name) - embed.setDescription(`*(Aliases: ${aliases})*\n\n${cmd.help.description}`) - embed.addField('**Usage:**', cmd.help.usage) - if (cmd.help.params.length > 0) { - embed.addField('**Parameters:**', cmd.help.params) + embed.setDescription(desc) + embed.addField('**Usage**', cmd.help.usage) + if (cmd.help.examples.length > 0) { + embed.addField('**Examples**', cmd.help.examples) } - if (aliases) { - embed.addField('**Aliases:**', aliases) - } - embed.addField('**Permission level:**', cmd.conf.permLevel, true) - embed.addField('**Server only**', cmd.conf.guildOnly, true) - embed.addField('**Cooldown**', cmd.conf.cooldown / 1000 + ' seconds', true) embed.setFooter('< > = optional, [ ] = required. Don\'t include the brackets in the command itself!') message.channel.send(embed) } diff --git a/file.log b/file.log index 5c41ad4..50fd9de 100644 --- a/file.log +++ b/file.log @@ -1436,3 +1436,113 @@ 2020-04-08T19:30:12 | info | index.js | Loading 7 events. 2020-04-08T19:30:12 | info | mongoose.js | Connected to the database. 2020-04-08T19:30:15 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T22:26:56 | info | index.js | Loading 5 commands. +2020-04-08T22:26:56 | info | index.js | Loading 7 events. +2020-04-08T22:26:56 | info | mongoose.js | Connected to the database. +2020-04-08T22:26:59 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T22:39:52 | log | message.js | Command ran: help +2020-04-08T22:40:35 | log | message.js | Command ran: help +2020-04-08T22:40:46 | log | message.js | Command ran: help +2020-04-08T22:40:52 | log | message.js | Command ran: help +2020-04-08T22:44:22 | info | index.js | Loading 5 commands. +2020-04-08T22:44:22 | info | index.js | Loading 7 events. +2020-04-08T22:44:23 | info | mongoose.js | Connected to the database. +2020-04-08T22:44:26 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T22:44:32 | log | message.js | Command ran: help +2020-04-08T22:44:37 | log | message.js | Command ran: help +2020-04-08T22:44:43 | log | message.js | Command ran: help +2020-04-08T22:49:00 | info | index.js | Loading 5 commands. +2020-04-08T22:49:00 | info | index.js | Loading 7 events. +2020-04-08T22:49:00 | info | mongoose.js | Connected to the database. +2020-04-08T22:49:03 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T22:49:03 | log | message.js | Command ran: help +2020-04-08T23:01:27 | info | index.js | Loading 5 commands. +2020-04-08T23:01:27 | info | index.js | Loading 7 events. +2020-04-08T23:01:27 | info | mongoose.js | Connected to the database. +2020-04-08T23:01:30 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:10:20 | info | index.js | Loading 5 commands. +2020-04-08T23:10:20 | info | index.js | Loading 7 events. +2020-04-08T23:10:20 | info | mongoose.js | Connected to the database. +2020-04-08T23:10:23 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:10:30 | log | message.js | Command ran: help +2020-04-08T23:10:44 | log | message.js | Command ran: help +2020-04-08T23:10:59 | info | index.js | Loading 5 commands. +2020-04-08T23:11:00 | info | index.js | Loading 7 events. +2020-04-08T23:11:00 | info | mongoose.js | Connected to the database. +2020-04-08T23:11:02 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:11:07 | log | message.js | Command ran: help +2020-04-08T23:13:14 | log | message.js | Command ran: help +2020-04-08T23:13:28 | info | index.js | Loading 5 commands. +2020-04-08T23:13:28 | info | index.js | Loading 7 events. +2020-04-08T23:13:28 | info | mongoose.js | Connected to the database. +2020-04-08T23:13:31 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:13:40 | info | index.js | Loading 5 commands. +2020-04-08T23:13:40 | info | index.js | Loading 7 events. +2020-04-08T23:13:40 | info | mongoose.js | Connected to the database. +2020-04-08T23:13:42 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:13:42 | log | message.js | Command ran: help +2020-04-08T23:13:46 | log | message.js | Command ran: help +2020-04-08T23:14:01 | info | index.js | Loading 5 commands. +2020-04-08T23:14:01 | info | index.js | Loading 7 events. +2020-04-08T23:14:02 | info | mongoose.js | Connected to the database. +2020-04-08T23:14:04 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:14:06 | log | message.js | Command ran: help +2020-04-08T23:14:39 | log | message.js | Command ran: help +2020-04-08T23:26:22 | info | index.js | Loading 5 commands. +2020-04-08T23:26:22 | info | index.js | Loading 7 events. +2020-04-08T23:26:22 | info | mongoose.js | Connected to the database. +2020-04-08T23:26:25 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:27:27 | info | index.js | Loading 5 commands. +2020-04-08T23:27:27 | info | index.js | Loading 7 events. +2020-04-08T23:27:27 | info | mongoose.js | Connected to the database. +2020-04-08T23:27:29 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:27:48 | log | message.js | Command ran: help +2020-04-08T23:28:53 | info | index.js | Loading 5 commands. +2020-04-08T23:28:53 | info | index.js | Loading 7 events. +2020-04-08T23:28:53 | info | mongoose.js | Connected to the database. +2020-04-08T23:28:56 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:28:56 | log | message.js | Command ran: help +2020-04-08T23:29:12 | info | index.js | Loading 5 commands. +2020-04-08T23:29:12 | info | index.js | Loading 7 events. +2020-04-08T23:29:12 | info | mongoose.js | Connected to the database. +2020-04-08T23:29:14 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:29:34 | info | index.js | Loading 5 commands. +2020-04-08T23:29:34 | info | index.js | Loading 7 events. +2020-04-08T23:29:34 | info | mongoose.js | Connected to the database. +2020-04-08T23:29:37 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:29:37 | log | message.js | Command ran: help +2020-04-08T23:30:14 | info | index.js | Loading 5 commands. +2020-04-08T23:30:14 | info | index.js | Loading 7 events. +2020-04-08T23:30:14 | info | mongoose.js | Connected to the database. +2020-04-08T23:30:16 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:30:18 | log | message.js | Command ran: help +2020-04-08T23:30:32 | info | index.js | Loading 5 commands. +2020-04-08T23:30:32 | info | index.js | Loading 7 events. +2020-04-08T23:30:32 | info | mongoose.js | Connected to the database. +2020-04-08T23:30:34 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:30:38 | log | message.js | Command ran: help +2020-04-08T23:34:18 | info | index.js | Loading 5 commands. +2020-04-08T23:34:18 | info | index.js | Loading 7 events. +2020-04-08T23:34:18 | info | mongoose.js | Connected to the database. +2020-04-08T23:34:21 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:34:23 | log | message.js | Command ran: help +2020-04-08T23:34:30 | log | message.js | Command ran: help +2020-04-08T23:35:00 | log | message.js | Command ran: help +2020-04-08T23:35:24 | info | index.js | Loading 5 commands. +2020-04-08T23:35:24 | info | index.js | Loading 7 events. +2020-04-08T23:35:24 | info | mongoose.js | Connected to the database. +2020-04-08T23:35:26 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:35:38 | info | index.js | Loading 5 commands. +2020-04-08T23:35:38 | info | index.js | Loading 7 events. +2020-04-08T23:35:38 | info | mongoose.js | Connected to the database. +2020-04-08T23:35:41 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:35:41 | log | message.js | Command ran: help +2020-04-08T23:39:05 | info | index.js | Loading 5 commands. +2020-04-08T23:39:05 | info | index.js | Loading 7 events. +2020-04-08T23:39:05 | info | mongoose.js | Connected to the database. +2020-04-08T23:39:07 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:39:15 | log | message.js | Command ran: help +2020-04-09T00:06:52 | info | index.js | Loading 5 commands. +2020-04-09T00:06:52 | info | index.js | Loading 7 events. +2020-04-09T00:06:53 | info | mongoose.js | Connected to the database. +2020-04-09T00:06:56 | ready | ready.js | Connected to Discord as WoomyDev#4547