From 9208a4b0b8a1419622e69357aa04e8fc2651c6d6 Mon Sep 17 00:00:00 2001 From: AnxietyisReal <96593068+AnxietyisReal@users.noreply.github.com> Date: Wed, 30 Nov 2022 19:34:53 +1100 Subject: [PATCH] combine both embeds into one command --- src/commands/statistics.ts | 131 +++++++++++++++++-------------------- 1 file changed, 60 insertions(+), 71 deletions(-) diff --git a/src/commands/statistics.ts b/src/commands/statistics.ts index 5ab4c4b..4b2ba02 100644 --- a/src/commands/statistics.ts +++ b/src/commands/statistics.ts @@ -6,81 +6,70 @@ import { versionMajorMinor } from 'typescript'; import { VERSION } from 'ts-node'; export default { async run(client: TClient, interaction: Discord.ChatInputCommandInteraction<'cached'>){ - switch (interaction.options.getSubcommand()) { - case 'commands': - const columns = ['Command name', 'Count']; - const includedCommands = client.commands.filter(x=>x.uses).sort((a,b)=>b.uses - a.uses); - if (includedCommands.size == 0) return interaction.reply(`No commands have been used yet.\nUptime: ${client.formatTime(client.uptime as number, 2, {longNames: true, commas: true})}`); - const nameLength = Math.max(...includedCommands.map(x=>x.default.data.name.length), columns[0].length) + 2; - const amountLength = Math.max(...includedCommands.map(x=>x.uses.toLocaleString().length), columns[1].length) + 1; - const rows = [`${columns[0] + ' '.repeat(nameLength - columns[0].length)}|${' '.repeat(amountLength - columns[1].length) + columns[1]}\n`, '-'.repeat(nameLength) + '-'.repeat(amountLength) + '\n']; - includedCommands.forEach(command=>{ - const name = command.default.data.name; - const count = command.uses.toString(); - rows.push(`${name + ' '.repeat(nameLength - name.length)}${' '.repeat(amountLength - count.length) + count}\n`); + await interaction.deferReply(); + const columns = ['Command name', 'Count']; + const includedCommands = client.commands.filter(x=>x.uses).sort((a,b)=>b.uses - a.uses); + if (includedCommands.size == 0) return interaction.reply(`No commands have been used yet.\nUptime: ${client.formatTime(client.uptime as number, 2, {longNames: true, commas: true})}`); + const nameLength = Math.max(...includedCommands.map(x=>x.default.data.name.length), columns[0].length) + 2; + const amountLength = Math.max(...includedCommands.map(x=>x.uses.toLocaleString().length), columns[1].length) + 1; + const rows = [`${columns[0] + ' '.repeat(nameLength - columns[0].length)}|${' '.repeat(amountLength - columns[1].length) + columns[1]}\n`, '-'.repeat(nameLength) + '-'.repeat(amountLength) + '\n']; + includedCommands.forEach(command=>{ + const name = command.default.data.name; + const count = command.uses.toString(); + rows.push(`${name + ' '.repeat(nameLength - name.length)}${' '.repeat(amountLength - count.length) + count}\n`); + }); + const embed = new client.embed().setColor(client.config.embedColor).setTitle('Statistics: Command Usage') + .setDescription([ + 'List of commands that have been used in this session, ordered by amount of use. Table contains command name and amount of uses.', + `Total amount of commands used in this session: ${client.commands.filter(x=>x.uses).map(x=>x.uses).reduce((a,b)=>a+b, 0)}` + ].join('\n')) + if (rows.join('').length > 1024){ + let fieldValue = ''; + rows.forEach(row=>{ + if (fieldValue.length + row.length > 1024){ + embed.addFields({name: '\u200b', value: `\`\`\`\n${fieldValue}\`\`\``}); + fieldValue = row; + } else { + fieldValue += row; + } }); - const embed = new client.embed().setColor(client.config.embedColor).setTitle('Statistics: Command Usage') - .setDescription([ - 'List of commands that have been used in this session, ordered by amount of use. Table contains command name and amount of uses.', - `Total amount of commands used in this session: ${client.commands.filter(x=>x.uses).map(x=>x.uses).reduce((a,b)=>a+b, 0)}` - ].join('\n')) - if (rows.join('').length > 1024){ - let fieldValue = ''; - rows.forEach(row=>{ - if (fieldValue.length + row.length > 1024){ - embed.addFields({name: '\u200b', value: `\`\`\`\n${fieldValue}\`\`\``}); - fieldValue = row; - } else { - fieldValue += row; - } - }); - embed.addFields({name: '\u200b', value: `\`\`\`\n${fieldValue}\`\`\``}); - } else { - embed.addFields({name: '\u200b', value: `\`\`\`\n${rows.join('')}\`\`\``}) - }; - interaction.reply({embeds: [embed]}) - break; - case 'host': - // Bytes conversion - function formatBytes(bytes, decimals = 2) { - if (bytes === 0) return '0 Bytes'; - const k = 1024; - const dm = decimals < 0 ? 0 : decimals; - const sizes = ['Bytes', 'KB', 'MB', 'GB']; - const i = Math.floor(Math.log(bytes) / Math.log(k)); - return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i]; - } - await interaction.deferReply(); - const cpu = await si.cpu(); - const ram = await si.mem(); - const osInfo = await si.osInfo(); - const currentLoad = await si.currentLoad(); - const embed1 = new client.embed().setColor(client.config.embedColor).setTitle('Statistics: Host Info').setDescription([ - `> __Dependencies__`, - `**TypeScript:** ${versionMajorMinor}`, - `**TS-Node:** ${VERSION}`, - `**NodeJS:** ${process.version}`, - `**DiscordJS:** ${version}`, - `> __Host__`, - `**Operating System:** ${osInfo.distro + ' ' + osInfo.release}`, - `**CPU:** ${cpu.manufacturer, cpu.brand}`, - `**Memory:** ${formatBytes(ram.used)}/${formatBytes(ram.total)}`, - `**NodeJS:** ${formatBytes(process.memoryUsage().heapUsed)}/${formatBytes(process.memoryUsage().heapTotal)}`, - `**Load Usage:**\nUser: ${currentLoad.currentLoadUser.toFixed(1)}%\nSystem: ${currentLoad.currentLoadSystem.toFixed(1)}%`, - `**Uptime:**\nHost: ${client.formatTime((os.uptime()*1000), 2, {longNames: true, commas: true})}\nBot: ${client.formatTime(client.uptime as number, 2, {commas: true, longNames: true})}` - ].join('\n')) - .setFooter({text: `Load time: ${Date.now() - interaction.createdTimestamp}ms`}); - interaction.editReply({embeds: [embed1]}); - } + embed.addFields({name: '\u200b', value: `\`\`\`\n${fieldValue}\`\`\``}); + } else { + embed.addFields({name: '\u200b', value: `\`\`\`\n${rows.join('')}\`\`\``}) + }; + + // Bytes conversion + function formatBytes(bytes, decimals = 2) { + if (bytes === 0) return '0 Bytes'; + const k = 1024; + const dm = decimals < 0 ? 0 : decimals; + const sizes = ['Bytes', 'KB', 'MB', 'GB']; + const i = Math.floor(Math.log(bytes) / Math.log(k)); + return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i]; + } + const cpu = await si.cpu(); + const ram = await si.mem(); + const osInfo = await si.osInfo(); + const currentLoad = await si.currentLoad(); + const embed1 = new client.embed().setColor(client.config.embedColor).setTitle('Statistics: Host Info').setDescription([ + `> __Dependencies__`, + `**TypeScript:** ${versionMajorMinor}`, + `**TS-Node:** ${VERSION}`, + `**NodeJS:** ${process.version}`, + `**DiscordJS:** ${version}`, + `> __Host__`, + `**Operating System:** ${osInfo.distro + ' ' + osInfo.release}`, + `**CPU:** ${cpu.manufacturer, cpu.brand}`, + `**Memory:** ${formatBytes(ram.used)}/${formatBytes(ram.total)}`, + `**NodeJS:** ${formatBytes(process.memoryUsage().heapUsed)}/${formatBytes(process.memoryUsage().heapTotal)}`, + `**Load Usage:**\nUser: ${currentLoad.currentLoadUser.toFixed(1)}%\nSystem: ${currentLoad.currentLoadSystem.toFixed(1)}%`, + `**Uptime:**\nHost: ${client.formatTime((os.uptime()*1000), 2, {longNames: true, commas: true})}\nBot: ${client.formatTime(client.uptime as number, 2, {commas: true, longNames: true})}` + ].join('\n')) + .setFooter({text: `Load time: ${Date.now() - interaction.createdTimestamp}ms`}); + interaction.editReply({embeds: [embed, embed1]}); }, data: new SlashCommandBuilder() .setName('statistics') .setDescription('See a list of commands ordered by their usage or bot stats') .setDMPermission(false) - .addSubcommand((opt)=>opt - .setName('commands') - .setDescription('View command usage stats')) - .addSubcommand((opt)=>opt - .setName('host') - .setDescription('View host stats')) } \ No newline at end of file