diff --git a/src/commands/credits/addons/balance.js b/src/commands/credits/addons/balance.js index a917e2c..a52446f 100644 --- a/src/commands/credits/addons/balance.js +++ b/src/commands/credits/addons/balance.js @@ -8,13 +8,9 @@ module.exports = async (interaction) => { try { const user = await interaction.options.getUser('user'); - console.log(interaction.member.guild.id); - await credits .findOne({ userId: user ? user.id : interaction.user.id, guildId: interaction.member.guild.id }) .then(async (data) => { - console.log(data); - if (!data) { const embed = { title: 'Balance', diff --git a/src/commands/credits/addons/transfer.js b/src/commands/credits/addons/transfer.js index 235e0ef..efa318a 100644 --- a/src/commands/credits/addons/transfer.js +++ b/src/commands/credits/addons/transfer.js @@ -20,31 +20,21 @@ module.exports = async (interaction) => { const from = await interaction.options.getUser('from'); const to = await interaction.options.getUser('to'); const amount = await interaction.options.getInteger('amount'); - const data = await credits.findOne({ userId: from.id, guildId: interaction.member.guild.id }); - - if (amount <= 0) { - const embed = { - title: 'Transfer failed', - description: "You can't transfer zero or below.", - color: 0xbb2124, - timestamp: new Date(), - footer: { iconURL: config.footer.icon, text: config.footer.text }, - }; - return await interaction.editReply({ embeds: [embed], ephemeral: true }); - } - if (data.balance < amount) { - const embed = { - title: 'Transfer', - description: `${from.username} has insufficient credits. ${from.username} balance is ${data.balance}`, - color: 0xbb2124, - timestamp: new Date(), - footer: { iconURL: config.footer.icon, text: config.footer.text }, - }; - return await interaction.editReply({ embeds: [embed], ephemeral: true }); - } + // eslint-disable-next-line max-len const fromUser = await credits.findOne({ userId: from.id, guildId: interaction.member.guild.id }); const toUser = await credits.findOne({ userId: to.id, guildId: interaction.member.guild.id }); + if (!fromUser) { + const embed = { + title: 'Transfer', + description: 'That user has no credits, I can not transfer credits from the user', + color: config.colors.error, + timestamp: new Date(), + footer: { iconURL: config.footer.icon, text: config.footer.text }, + }; + return interaction.editReply({ embeds: [embed], ephemeral: true }); + } + if (!toUser) { const embed = { title: 'Transfer', @@ -56,15 +46,25 @@ module.exports = async (interaction) => { return interaction.editReply({ embeds: [embed], ephemeral: true }); } - if (!fromUser) { + if (amount <= 0) { const embed = { - title: 'Transfer', - description: 'That user has no credits, I can not transfer credits from the user', - color: config.colors.error, + title: 'Transfer failed', + description: "You can't transfer zero or below.", + color: 0xbb2124, timestamp: new Date(), footer: { iconURL: config.footer.icon, text: config.footer.text }, }; - return interaction.editReply({ embeds: [embed], ephemeral: true }); + return await interaction.editReply({ embeds: [embed], ephemeral: true }); + } + if (fromUser.balance < amount) { + const embed = { + title: 'Transfer', + description: `${from.username} has insufficient credits. ${from.username} balance is ${fromUser.balance}`, + color: 0xbb2124, + timestamp: new Date(), + footer: { iconURL: config.footer.icon, text: config.footer.text }, + }; + return await interaction.editReply({ embeds: [embed], ephemeral: true }); } fromUser.balance -= amount; @@ -87,7 +87,7 @@ module.exports = async (interaction) => { await logger.debug(`Gift sent from: ${interaction.user.username} to: ${to.username}`); return await interaction.editReply({ embeds: [embed], ephemeral: true }); } catch { - await logger.error(); + logger.error(); } return true; }; diff --git a/src/events/guildCreate.js b/src/events/guildCreate.js index 1239644..3d3cc15 100644 --- a/src/events/guildCreate.js +++ b/src/events/guildCreate.js @@ -9,7 +9,5 @@ module.exports = { const guildExist = await guilds.findOne({ guildId: guild.id }); if (!guildExist) { await guilds.create({ guildId: guild.id }); } - - console.log(guildExist); }, }; diff --git a/src/events/interactionCreate.js b/src/events/interactionCreate.js index 6066b56..64092cf 100644 --- a/src/events/interactionCreate.js +++ b/src/events/interactionCreate.js @@ -16,8 +16,6 @@ module.exports = { if (!guildExist) { await guilds.create({ guildId: interaction.member.guild.id }); } - console.log(guildExist); - try { await interaction.deferReply({ embeds: [