diff --git a/bot/commands/Bot/about.js b/bot/commands/Bot/about.js index 9efa5ae..7ee86c5 100644 --- a/bot/commands/Bot/about.js +++ b/bot/commands/Bot/about.js @@ -1,5 +1,5 @@ const Command = require('../../base/Command.js'); -const { version, ActionRowBuilder, ButtonBuilder, ButtonStyle } = require('discord.js'); +const { version } = require('discord.js'); const moment = require('moment'); require('moment-duration-format'); @@ -15,44 +15,34 @@ module.exports = class About extends Command { async run (client, interaction, data) { //eslint-disable-line no-unused-vars const uptime = moment.duration(client.uptime).format(' D [days], H [hrs], m [mins], s [secs]'); - const bot = await interaction.guild.members.fetch(client.user.id, {force: true}); - const userCount = await client.db.countUsers(); - let build = 'prod'; + let build = 'production'; + if (client.config.developmentMode === true) { - build = 'dev'; + build = 'development'; } - const links = new ActionRowBuilder() - .addComponents( - new ButtonBuilder() - .setURL('https://discord.gg/HCF8mdv') - .setLabel('Support') - .setStyle(ButtonStyle.Link), - new ButtonBuilder() - .setURL('https://gitdab.com/embee/woomy') - .setLabel('Source') - .setStyle(ButtonStyle.Link), - ); - const embed = new client.EmbedBuilder() - .setTitle('About me') - .setThumbnail(client.user.avatarURL({format: 'png'})) - .setColor(bot.user.hexAccentColor ?? bot.displayHexColor) + .setThumbnail(client.user.avatarURL({format: "png"})) + .setTitle('About me!') .addFields([ { name: 'General', - value: `• Users: \`${userCount}\`\n• Servers: \`${client.guilds.cache.size}\`\n• Commands: \`${client.commands.size}\`\n• Uptime: \`${uptime}\``, + value: `• users: \`${client.users.cache.size}\`\n• channels: \`${client.channels.cache.size}\`\n• servers: \`${client.guilds.cache.size}\`\n• commands: \`${client.commands.size}\`\n• uptime: \`${uptime}\``, inline: true }, { name: 'Technical', - value: `• RAM Usage: \`${(process.memoryUsage().heapUsed / 1024 / 1024).toFixed(2)} MB\`\n• Woomy version: \`v${client.version} ${build}\`\n• discord.js version: \`v${version}\`\n• node.js version: \`${process.version}\``, + value: `• RAM Usage: \`${(process.memoryUsage().heapUsed / 1024 / 1024).toFixed(2)} MB\`\n• Host OS: \`${require("os").type}\`\n• bot version: \`${client.version.number} (${build})\`\n• discord.js version: \`v${version}\`\n• node.js version: \`${process.version}\``, inline: true + }, + { + name: 'Links', + value: '[Support](https://discord.gg/HCF8mdv) | [Git](https://gitdab.com/embee/woomy)' } - ]) - .setFooter({ text: 'Made in Australia'}); + ]); + interaction.reply({embeds: embed}); - return interaction.reply({ embeds: [embed], components: [links] }); + } }; \ No newline at end of file diff --git a/bot/util/database.js b/bot/util/database.js index 74c3d8d..eb4fd14 100644 --- a/bot/util/database.js +++ b/bot/util/database.js @@ -161,21 +161,6 @@ class Database { const res = await this.pool.query('INSERT INTO users (user_id) VALUES ($1) RETURNING *;', [id]); return res.rows[0]; } - - async countGuilds () { - const res = await this.pool.query('SELECT COUNT(*) FROM guilds;'); - return res.rows[0].count; - } - - async countMembers () { - const res = await this.pool.query('SELECT COUNT(*) FROM members;'); - return res.rows[0].count; - } - - async countUsers () { - const res = await this.pool.query('SELECT COUNT(*) FROM users;'); - return res.rows[0].count; - } } module.exports = Database; \ No newline at end of file