diff --git a/commands/money.js b/commands/money.js index f2c8e2d..a6a55b4 100644 --- a/commands/money.js +++ b/commands/money.js @@ -1,5 +1,6 @@ const { EmbedBuilder } = require('discord.js'); const { Bank, addBank } = require('../structures/bank'); +const bitfieldCalculator = require('discord-bitfield-calculator'); module.exports = { name: "money", @@ -13,29 +14,50 @@ module.exports = { }, options: [ { - name: "add_or_remove", - description: "Add or remove money from a user", - value: "add_or_remove", - type: 3, - required: true, - choices: [ - { name: "add", value: "add" }, { name: "remove", value: "remove" }, + name: "add", + description: "Add money to user", + value: "add", + type: 1, + options: [ + { + name: "amount", + description: "The amount to add to balance", + value: "amount", + type: 10, + min_value: 0.01, + required: true, + }, + { + name: "to", + description: "User to alter balance", + value: "to", + type: 6, + required: true, + }, ] }, { - name: "amount", - description: "The amount to add to balance", - value: "amount", - type: 10, - min_value: 0.01, - required: true, - }, - { - name: "from", - description: "User to alter balance", - value: "from", - type: 6, - required: true, + name: "remove", + description: "Remove or remove money from a user", + value: "remove", + type: 1, + options: [ + { + name: "amount", + description: "The amount to add to balance", + value: "amount", + type: 10, + min_value: 0.01, + required: true, + }, + { + name: "from", + description: "User to alter balance", + value: "from", + type: 6, + required: true, + }, + ] }, ], SlashCommand: { @@ -54,7 +76,7 @@ module.exports = { if (client.exists(GuildDB.botAdmin) && interaction.member.roles.includes(GuildDB.botAdmin)) canUseCommand = true; if (!canUseCommand) return interaction.send({ content: 'You don\'t have the permissions to use this command.' }); - const targetUserID = args[2].value.replace('<@!', '').replace('>', ''); + const targetUserID = args[0].options[1].value.replace('<@!', '').replace('>', ''); let banking = await client.dbo.collection("banks").findOne({"banking.userID": targetUserID}).then(banking => banking); if (!banking) { @@ -84,16 +106,16 @@ module.exports = { if (!success) return client.sendInternalError('Failed to add bank'); } - const newBalance = args[0] == 'add' - ? banking.guilds[GuildDB.serverID].account.balance + args[1].value - : banking.guilds[GuildDB.serverID].account.balance - args[1].value; + const newBalance = args[0].name == 'add' + ? banking.guilds[GuildDB.serverID].account.balance + args[0].options[1].value + : banking.guilds[GuildDB.serverID].account.balance - args[0].options[1].value; client.dbo.collection("banks").updateOne({"banking.userID":targetUserID},{$set:{[`banking.guilds.${GuildDB.serverID}.account.balance`]:newBalance}}, function(err, res) { if (err) return client.sendInternalError(err); }); const successEmbed = new EmbedBuilder() - .setDescription(`Successfully ${args[0] == 'add' ? 'added' : 'removed'} $${args[0].options[1].value.toFixed(2)} ${args[0] == 'add' ? 'to' : 'from'} <@${targetUserID}>'s balance`) + .setDescription(`Successfully ${args[0] == 'add' ? 'added' : 'removed'} $${args[0].options[0].value.toFixed(2)} ${args[0] == 'add' ? 'to' : 'from'} <@${targetUserID}>'s balance`) .setColor(client.config.Colors.Green); return interaction.send({ embeds: [successEmbed] }); diff --git a/config/config.js b/config/config.js index 12593db..e5e7502 100644 --- a/config/config.js +++ b/config/config.js @@ -2,7 +2,7 @@ require('dotenv').config(); module.exports = { Dev: "PROD.", - Version: "12.8.1", // (major).(feature).(revision/bug/refactoring) + Version: "12.8.2", // (major).(feature).(revision/bug/refactoring) Admins: ["362791661274660874", "329371697570381824"], // Admins of the bot DefaultPrefix: "?", ServerID: "955668596745461830",