From e6da80d72f17d3d02190c887a6a73f9a6aa71c10 Mon Sep 17 00:00:00 2001 From: jateute Date: Mon, 10 Oct 2022 12:49:02 +0200 Subject: [PATCH 1/4] feat(economy-system): Added ability to make command-replies public --- .../economy-system/commands/economy-system.js | 68 +++++++++---------- modules/economy-system/configs/config.json | 10 +++ 2 files changed, 44 insertions(+), 34 deletions(-) diff --git a/modules/economy-system/commands/economy-system.js b/modules/economy-system/commands/economy-system.js index 9ed72234..4e8f60f0 100644 --- a/modules/economy-system/commands/economy-system.js +++ b/modules/economy-system/commands/economy-system.js @@ -43,16 +43,16 @@ async function cooldown (command, duration, userId, client) { module.exports.subcommands = { 'work': async function (interaction) { - if (!await cooldown('work', interaction.config['workCooldown'] * 60000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: true })); + if (!await cooldown('work', interaction.config['workCooldown'] * 60000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: interaction.config['PublicCommandReplies'] })); const moneyToAdd = randomIntFromInterval(parseInt(interaction.config['maxWorkMoney']), parseInt(interaction.config['minWorkMoney'])); await editBalance(interaction.client, interaction.user.id, 'add', moneyToAdd); - interaction.reply(embedType(randomElementFromArray(interaction.str['workSuccess']), {'%earned%': `${moneyToAdd} ${interaction.config['currencySymbol']}`}, { ephemeral: true })); + interaction.reply(embedType(randomElementFromArray(interaction.str['workSuccess']), {'%earned%': `${moneyToAdd} ${interaction.config['currencySymbol']}`}, { ephemeral: interaction.config['PublicCommandReplies'] })); createleaderboard(interaction.client); interaction.client.logger.info('[economy-system] ' + localize('economy-system', 'work-earned-money', {u: interaction.user.tag, m: moneyToAdd, c: interaction.config['currencySymbol']})); if (interaction.client.logChannel) interaction.client.logChannel.send('[economy-system] ' + localize('economy-system', 'work-earned-money', {u: interaction.user.tag, m: moneyToAdd, c: interaction.config['currencySymbol']})); }, 'crime': async function (interaction) { - if (!await cooldown('crime', interaction.config['crimeCooldown'] * 60000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: true })); + if (!await cooldown('crime', interaction.config['crimeCooldown'] * 60000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: interaction.config['PublicCommandReplies'] })); if (Math.floor(Math.random() * 2) === 0) { const user = await interaction.client.models['economy-system']['Balance'].findOne({ where: { @@ -61,13 +61,13 @@ module.exports.subcommands = { }); money = user.balance / 2; await editBalance(interaction.client, interaction.user.id, 'remove', money); - interaction.reply(embedType(randomElementFromArray(interaction.str['crimeFail']), {'%loose%': `${money} ${interaction.config['currencySymbol']}`}, { ephemeral: true })); + interaction.reply(embedType(randomElementFromArray(interaction.str['crimeFail']), {'%loose%': `${money} ${interaction.config['currencySymbol']}`}, { ephemeral: interaction.config['PublicCommandReplies'] })); interaction.client.logger.info('[economy-system] ' + localize('economy-system', 'crime-loose-money', {u: interaction.user.tag, m: money, c: interaction.config['currencySymbol']})); if (interaction.client.logChannel) interaction.client.logChannel.send('[economy-system] ' + localize('economy-system', 'crime-loose-money', {u: interaction.user.tag, m: money, c: interaction.config['currencySymbol']})); } else { const money = randomIntFromInterval(parseInt(interaction.config['maxCrimeMoney']), parseInt(interaction.config['minCrimeMoney'])); await editBalance(interaction.client, interaction.user.id, 'add', money); - interaction.reply(embedType(randomElementFromArray(interaction.str['crimeSuccess']), {'%earned%': `${money} ${interaction.config['currencySymbol']}`}, { ephemeral: true })); + interaction.reply(embedType(randomElementFromArray(interaction.str['crimeSuccess']), {'%earned%': `${money} ${interaction.config['currencySymbol']}`}, { ephemeral: interaction.config['PublicCommandReplies'] })); createleaderboard(interaction.client); interaction.client.logger.info('[economy-system] ' + localize('economy-system', 'crime-earned-money', {u: interaction.user.tag, m: money, c: interaction.config['currencySymbol']})); if (interaction.client.logChannel) interaction.client.logChannel.send('[economy-system] ' + localize('economy-system', 'crime-earned-money', {u: interaction.user.tag, m: money, c: interaction.config['currencySymbol']})); @@ -80,82 +80,82 @@ module.exports.subcommands = { id: user.id } }); - if (!robbedUser) return interaction.reply(embedType(interaction.str['userNotFound']), {'%user%': `${interaction.user.username}#${interaction.user.discriminator}`}, { ephemeral: true }); - if (!await cooldown('rob', interaction.config['robCooldown'] * 60000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: true })); + if (!robbedUser) return interaction.reply(embedType(interaction.str['userNotFound']), {'%user%': `${interaction.user.username}#${interaction.user.discriminator}`}, { ephemeral: interaction.config['PublicCommandReplies'] }); + if (!await cooldown('rob', interaction.config['robCooldown'] * 60000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: interaction.config['PublicCommandReplies'] })); let toRob = parseInt(robbedUser.balance) * (parseInt(interaction.config['robPercent']) / 100); if (toRob >= parseInt(interaction.config['maxRobAmount'])) toRob = parseInt(interaction.config['maxRobAmount']); await editBalance(interaction.client, interaction.user.id, 'add', toRob); await editBalance(interaction.client, user.id, 'remove', toRob); - interaction.reply(embedType(interaction.str['robSuccess'], {'%earned%': `${toRob} ${interaction.config['currencySymbol']}`, '%user%': `<@${user.id}>`}, { ephemeral: true })); + interaction.reply(embedType(interaction.str['robSuccess'], {'%earned%': `${toRob} ${interaction.config['currencySymbol']}`, '%user%': `<@${user.id}>`}, { ephemeral: interaction.config['PublicCommandReplies'] })); createleaderboard(interaction.client); interaction.client.logger.info('[economy-system] ' + localize('economy-system', 'crime-earned-money', {u: interaction.user.tag, v: user.tag, m: toRob, c: interaction.config['currencySymbol']})); if (interaction.client.logChannel) interaction.client.logChannel.send('[economy-system] ' + localize('economy-system', 'crime-earned-money', {v: user.tag, u: interaction.user.tag, m: toRob, c: interaction.config['currencySymbol']})); }, 'add': async function (interaction) { - if (!interaction.client.configurations['economy-system']['config']['admins'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) return interaction.reply(embedType(interaction.client.strings['not_enough_permissions'], {}, { ephemeral: true })); + if (!interaction.client.configurations['economy-system']['config']['admins'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) return interaction.reply(embedType(interaction.client.strings['not_enough_permissions'], {}, { ephemeral: interaction.config['PublicCommandReplies'] })); console.log(interaction.options.getUser('user').id); console.log(interaction.user.id); if (interaction.options.getUser('user').id === interaction.user.id && !interaction.client.configurations['economy-system']['config']['selfBalance']) { if (interaction.client.logChannel) interaction.client.logChannel.send(localize('economy-system', 'admin-self-abuse')); return interaction.reply({ content: localize('economy-system', 'admin-self-abuse-answer'), - ephemeral: true + ephemeral: interaction.config['PublicCommandReplies'] }); } await editBalance(interaction.client, await interaction.options.getUser('user').id, 'add', parseInt(interaction.options.get('amount')['value'])); interaction.reply({ content: localize('economy-system', 'added-money', {i: interaction.options.get('amount')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.options.getUser('user').tag}), - ephemeral: true + ephemeral: interaction.config['PublicCommandReplies'] }); interaction.client.logger.info(`[economy-system] ` + localize('economy-system', 'added-money-log', {v: interaction.options.getUser('user').tag, i: interaction.options.get('amount')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.user.tag})); if (interaction.client.logChannel) interaction.client.logChannel.send(`[economy-system] ` + localize('economy-system', 'added-money-log', {v: interaction.options.getUser('user').tag, i: interaction.options.get('amount')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.user.tag})); }, 'remove': async function (interaction) { - if (!interaction.client.configurations['economy-system']['config']['admins'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) return interaction.reply(embedType(interaction.client.strings['not_enough_permissions'], {}, { ephemeral: true })); + if (!interaction.client.configurations['economy-system']['config']['admins'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) return interaction.reply(embedType(interaction.client.strings['not_enough_permissions'], {}, { ephemeral: interaction.config['PublicCommandReplies'] })); if (interaction.options.getUser('user').id === interaction.user.id && !interaction.client.configurations['economy-system']['config']['selfBalance']) { if (interaction.client.logChannel) interaction.client.logChannel.send(localize('economy-system', 'admin-self-abuse')); return interaction.reply({ content: localize('economy-system', 'admin-self-abuse-answer'), - ephemeral: true + ephemeral: interaction.config['PublicCommandReplies'] }); } await editBalance(interaction.client, interaction.options.getUser('user').id, 'remove', parseInt(interaction.options.get('amount')['value'])); interaction.reply({ content: localize('economy-system', 'removed-money', {i: interaction.options.get('amount')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.options.getUser('user').tag}), - ephemeral: true + ephemeral: interaction.config['PublicCommandReplies'] }); interaction.client.logger.info(`[economy-system] ` + localize('economy-system', 'removed-money-log', {v: interaction.options.getUser('user').tag, i: interaction.options.get('amount')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.user.tag})); if (interaction.client.logChannel) interaction.client.logChannel.send(`[economy-system] ` + localize('economy-system', 'removed-money-log', {v: interaction.options.getUser('user').tag, i: interaction.options.get('amount')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.user.tag})); }, 'set': async function (interaction) { - if (!interaction.client.configurations['economy-system']['config']['admins'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) return interaction.reply(embedType(interaction.client.strings['not_enough_permissions'], {}, { ephemeral: true })); + if (!interaction.client.configurations['economy-system']['config']['admins'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) return interaction.reply(embedType(interaction.client.strings['not_enough_permissions'], {}, { ephemeral: interaction.config['PublicCommandReplies'] })); if (interaction.options.getUser('user').id === interaction.user.id && !interaction.client.configurations['economy-system']['config']['selfBalance']) { if (interaction.client.logChannel) interaction.client.logChannel.send(localize('economy-system', 'admin-self-abuse')); return interaction.reply({ content: localize('economy-system', 'admin-self-abuse-answer'), - ephemeral: true + ephemeral: interaction.config['PublicCommandReplies'] }); } await editBalance(interaction.client, interaction.options.getUser('user').id, 'set', parseInt(interaction.options.get('balance')['value'])); interaction.reply({ content: localize('economy-system', 'set-money', {i: interaction.options.get('balance')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.options.getUser('user').tag}), - ephemeral: true + ephemeral: interaction.config['PublicCommandReplies'] }); interaction.client.logger.info(`[economy-system] ` + localize('economy-system', 'set-money-log', {v: interaction.options.getUser('user').tag, i: interaction.options.get('balance')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.user.tag})); if (interaction.client.logChannel) interaction.client.logChannel.send(`[economy-system] ` + localize('economy-system', 'set-money-log', {v: interaction.options.getUser('user').tag, i: interaction.options.get('balance')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.user.tag})); }, 'daily': async function (interaction) { - if (!await cooldown('daily', 86400000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: true })); + if (!await cooldown('daily', 86400000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: interaction.config['PublicCommandReplies'] })); await editBalance(interaction.client, interaction.user.id, 'add', parseInt(interaction.client.configurations['economy-system']['config']['dailyReward'])); - interaction.reply(embedType(interaction.str['dailyReward'], {'%earned%': `${interaction.client.configurations['economy-system']['config']['dailyReward']} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`}, { ephemeral: true })); + interaction.reply(embedType(interaction.str['dailyReward'], {'%earned%': `${interaction.client.configurations['economy-system']['config']['dailyReward']} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`}, { ephemeral: interaction.config['PublicCommandReplies'] })); interaction.client.logger.info(`[economy-system] ` + localize('economy-system', 'daily-earned-money', {u: interaction.user.tag, m: interaction.client.configurations['economy-system']['config']['dailyReward'], c: interaction.client.configurations['economy-system']['config']['currencySymbol']})); if (interaction.client.logChannel) interaction.client.logChannel.send(`[economy-system] ` + localize('economy-system', 'daily-earned-money', {u: interaction.user.tag, m: interaction.client.configurations['economy-system']['config']['dailyReward'], c: interaction.client.configurations['economy-system']['config']['currencySymbol']})); }, 'weekly': async function (interaction) { - if (!await cooldown('weekly', 604800000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: true })); + if (!await cooldown('weekly', 604800000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: interaction.config['PublicCommandReplies'] })); await editBalance(interaction.client, interaction.user.id, 'add', parseInt(interaction.client.configurations['economy-system']['config']['weeklyReward'])); - interaction.reply(embedType(interaction.str['weeklyReward'], {'%earned%': `${interaction.client.configurations['economy-system']['config']['weeklyReward']} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`}, { ephemeral: true })); + interaction.reply(embedType(interaction.str['weeklyReward'], {'%earned%': `${interaction.client.configurations['economy-system']['config']['weeklyReward']} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`}, { ephemeral: interaction.config['PublicCommandReplies'] })); interaction.client.logger.info(`[economy-system] ` + localize('economy-system', 'weekly-earned-money', {u: interaction.user.tag, m: interaction.client.configurations['economy-system']['config']['dailyReward'], c: interaction.client.configurations['economy-system']['config']['currencySymbol']})); if (interaction.client.logChannel) interaction.client.logChannel.send(`[economy-system] ` + localize('economy-system', 'weekly-earned-money', {u: interaction.user.tag, m: interaction.client.configurations['economy-system']['config']['dailyReward'], c: interaction.client.configurations['economy-system']['config']['currencySymbol']})); }, @@ -167,8 +167,8 @@ module.exports.subcommands = { id: user.id } }); - if (!balanceV) return interaction.reply(embedType(interaction.str['userNotFound']), {'%user%': `${interaction.user.username}#${interaction.user.discriminator}`}, { ephemeral: true }); - interaction.reply(embedType(interaction.str['balanceReply'], {'%user%': `${user.username}#${user.discriminator}`, '%balance%': `${balanceV['balance']} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`, '%bank%': `${balanceV['bank']} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`, '%total%': `${parseInt(balanceV['balance']) + parseInt(balanceV['bank'])} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`}, { ephemeral: true })); + if (!balanceV) return interaction.reply(embedType(interaction.str['userNotFound']), {'%user%': `${interaction.user.username}#${interaction.user.discriminator}`}, { ephemeral: interaction.config['PublicCommandReplies'] }); + interaction.reply(embedType(interaction.str['balanceReply'], {'%user%': `${user.username}#${user.discriminator}`, '%balance%': `${balanceV['balance']} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`, '%bank%': `${balanceV['bank']} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`, '%total%': `${parseInt(balanceV['balance']) + parseInt(balanceV['bank'])} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`}, { ephemeral: interaction.config['PublicCommandReplies'] })); }, 'deposit': async function (interaction) { let amount = interaction.options.get('amount')['value']; @@ -178,9 +178,9 @@ module.exports.subcommands = { } }); if (amount === 'all') amount = user.balance; - if (isNaN(amount)) return interaction.reply(embedType(interaction.str['NaN'], {'%input%': amount}, { ephemeral: true })); + if (isNaN(amount)) return interaction.reply(embedType(interaction.str['NaN'], {'%input%': amount}, { ephemeral: interaction.config['PublicCommandReplies'] })); await editBank(interaction.client, interaction.user.id, 'deposit', amount); - interaction.reply(embedType(interaction.str['depositMsg'], {'%amount%': amount}, { ephemeral: true })); + interaction.reply(embedType(interaction.str['depositMsg'], {'%amount%': amount}, { ephemeral: interaction.config['PublicCommandReplies'] })); }, 'withdraw': async function (interaction) { let amount = interaction.options.get('amount')['value']; @@ -190,9 +190,9 @@ module.exports.subcommands = { } }); if (amount === 'all') amount = user.bank; - if (isNaN(amount)) return interaction.reply(embedType(interaction.str['NaN'], {'%input%': amount}, { ephemeral: true })); + if (isNaN(amount)) return interaction.reply(embedType(interaction.str['NaN'], {'%input%': amount}, { ephemeral: interaction.config['PublicCommandReplies'] })); await editBank(interaction.client, interaction.user.id, 'withdraw', amount); - interaction.reply(embedType(interaction.str['withdrawMsg'], {'%amount%': amount}, { ephemeral: true })); + interaction.reply(embedType(interaction.str['withdrawMsg'], {'%amount%': amount}, { ephemeral: interaction.config['PublicCommandReplies'] })); }, 'msg_drop_msg': { 'enable': async function (interaction) { @@ -201,9 +201,9 @@ module.exports.subcommands = { id: interaction.user.id } }); - if (!user) return interaction.reply(embedType(interaction.str['msgDropAlreadyEnabled'], {}, { ephemeral: true })); + if (!user) return interaction.reply(embedType(interaction.str['msgDropAlreadyEnabled'], {}, { ephemeral: interaction.config['PublicCommandReplies'] })); await user.destroy(); - interaction.reply(embedType(interaction.str['msgDropEnabled'], {}, { ephemeral: true })); + interaction.reply(embedType(interaction.str['msgDropEnabled'], {}, { ephemeral: interaction.config['PublicCommandReplies'] })); }, 'disable': async function (interaction) { const user = await interaction.client.models['economy-system']['dropMsg'].findOne({ @@ -211,22 +211,22 @@ module.exports.subcommands = { id: interaction.user.id } }); - if (user) return interaction.reply(embedType(interaction.str['msgDropAlreadyDisabled'], {}, { ephemeral: true })); + if (user) return interaction.reply(embedType(interaction.str['msgDropAlreadyDisabled'], {}, { ephemeral: interaction.config['PublicCommandReplies'] })); await interaction.client.models['economy-system']['dropMsg'].create({ id: interaction.user.id }); - interaction.reply(embedType(interaction.str['msgDropDisabled'], {}, { ephemeral: true })); + interaction.reply(embedType(interaction.str['msgDropDisabled'], {}, { ephemeral: interaction.config['PublicCommandReplies'] })); } }, 'destroy': async function (interaction) { - if (!interaction.client.configurations['economy-system']['config']['admins'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) return interaction.reply(embedType(interaction.client.strings['not_enough_permissions'], {}, { ephemeral: true })); + if (!interaction.client.configurations['economy-system']['config']['admins'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) return interaction.reply(embedType(interaction.client.strings['not_enough_permissions'], {}, { ephemeral: interaction.config['PublicCommandReplies'] })); if (!interaction.options.getBoolean('confirm')) return interaction.reply({ content: localize('economy-system', 'destroy-cancel-reply'), - ephemeral: true + ephemeral: interaction.config['PublicCommandReplies'] }); interaction.reply({ content: localize('economy-system', 'destroy-reply'), - ephemeral: true + ephemeral: interaction.config['PublicCommandReplies'] }); interaction.client.logger.info(`[economy-system] Destroying the whole economy, as requested by ${interaction.user.username}#${interaction.user.discriminator}`); if (interaction.client.logChannel) interaction.client.logChannel.send(`[economy-system] Destroying the whole economy, as requested by ${interaction.user.username}#${interaction.user.discriminator}`); diff --git a/modules/economy-system/configs/config.json b/modules/economy-system/configs/config.json index 69b246e3..42e6aad3 100644 --- a/modules/economy-system/configs/config.json +++ b/modules/economy-system/configs/config.json @@ -196,6 +196,16 @@ "default": 100, "type": "integer", "description": "The weekly reward" + }, + { + "field_name": "PublicCommandReplies", + "humanname-de": "Öffentliche Command-Antworten", + "humanname-en": "Public Command-Replies", + "default": false, + "type": "boolean", + "description-de": "Sollen die Command-Antworten für alle angezeigt werden?", + "description-en": "Should the Command-replies be displayed for everyone?", + "elementToggle": true } ] } \ No newline at end of file From 815269b9b95d676987bf362e0b11a2e71ee68d31 Mon Sep 17 00:00:00 2001 From: jateute Date: Tue, 11 Oct 2022 11:42:44 +0200 Subject: [PATCH 2/4] fix(economy-system): Updated config to start with lowercase --- modules/economy-system/configs/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/economy-system/configs/config.json b/modules/economy-system/configs/config.json index 42e6aad3..32e16d5a 100644 --- a/modules/economy-system/configs/config.json +++ b/modules/economy-system/configs/config.json @@ -198,7 +198,7 @@ "description": "The weekly reward" }, { - "field_name": "PublicCommandReplies", + "field_name": "publicCommandReplies", "humanname-de": "Öffentliche Command-Antworten", "humanname-en": "Public Command-Replies", "default": false, From 4358859486178bd4243f5003dcc5d399e387113b Mon Sep 17 00:00:00 2001 From: jateute Date: Tue, 11 Oct 2022 11:49:02 +0200 Subject: [PATCH 3/4] fix(economy-system): Should work with the new Config now --- .../economy-system/commands/economy-system.js | 68 +++++++++---------- modules/economy-system/commands/shop.js | 14 ++-- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/modules/economy-system/commands/economy-system.js b/modules/economy-system/commands/economy-system.js index 4e8f60f0..917f1aae 100644 --- a/modules/economy-system/commands/economy-system.js +++ b/modules/economy-system/commands/economy-system.js @@ -43,16 +43,16 @@ async function cooldown (command, duration, userId, client) { module.exports.subcommands = { 'work': async function (interaction) { - if (!await cooldown('work', interaction.config['workCooldown'] * 60000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: interaction.config['PublicCommandReplies'] })); + if (!await cooldown('work', interaction.config['workCooldown'] * 60000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: interaction.config['publicCommandReplies'] })); const moneyToAdd = randomIntFromInterval(parseInt(interaction.config['maxWorkMoney']), parseInt(interaction.config['minWorkMoney'])); await editBalance(interaction.client, interaction.user.id, 'add', moneyToAdd); - interaction.reply(embedType(randomElementFromArray(interaction.str['workSuccess']), {'%earned%': `${moneyToAdd} ${interaction.config['currencySymbol']}`}, { ephemeral: interaction.config['PublicCommandReplies'] })); + interaction.reply(embedType(randomElementFromArray(interaction.str['workSuccess']), {'%earned%': `${moneyToAdd} ${interaction.config['currencySymbol']}`}, { ephemeral: interaction.config['publicCommandReplies'] })); createleaderboard(interaction.client); interaction.client.logger.info('[economy-system] ' + localize('economy-system', 'work-earned-money', {u: interaction.user.tag, m: moneyToAdd, c: interaction.config['currencySymbol']})); if (interaction.client.logChannel) interaction.client.logChannel.send('[economy-system] ' + localize('economy-system', 'work-earned-money', {u: interaction.user.tag, m: moneyToAdd, c: interaction.config['currencySymbol']})); }, 'crime': async function (interaction) { - if (!await cooldown('crime', interaction.config['crimeCooldown'] * 60000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: interaction.config['PublicCommandReplies'] })); + if (!await cooldown('crime', interaction.config['crimeCooldown'] * 60000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: interaction.config['publicCommandReplies'] })); if (Math.floor(Math.random() * 2) === 0) { const user = await interaction.client.models['economy-system']['Balance'].findOne({ where: { @@ -61,13 +61,13 @@ module.exports.subcommands = { }); money = user.balance / 2; await editBalance(interaction.client, interaction.user.id, 'remove', money); - interaction.reply(embedType(randomElementFromArray(interaction.str['crimeFail']), {'%loose%': `${money} ${interaction.config['currencySymbol']}`}, { ephemeral: interaction.config['PublicCommandReplies'] })); + interaction.reply(embedType(randomElementFromArray(interaction.str['crimeFail']), {'%loose%': `${money} ${interaction.config['currencySymbol']}`}, { ephemeral: interaction.config['publicCommandReplies'] })); interaction.client.logger.info('[economy-system] ' + localize('economy-system', 'crime-loose-money', {u: interaction.user.tag, m: money, c: interaction.config['currencySymbol']})); if (interaction.client.logChannel) interaction.client.logChannel.send('[economy-system] ' + localize('economy-system', 'crime-loose-money', {u: interaction.user.tag, m: money, c: interaction.config['currencySymbol']})); } else { const money = randomIntFromInterval(parseInt(interaction.config['maxCrimeMoney']), parseInt(interaction.config['minCrimeMoney'])); await editBalance(interaction.client, interaction.user.id, 'add', money); - interaction.reply(embedType(randomElementFromArray(interaction.str['crimeSuccess']), {'%earned%': `${money} ${interaction.config['currencySymbol']}`}, { ephemeral: interaction.config['PublicCommandReplies'] })); + interaction.reply(embedType(randomElementFromArray(interaction.str['crimeSuccess']), {'%earned%': `${money} ${interaction.config['currencySymbol']}`}, { ephemeral: interaction.config['publicCommandReplies'] })); createleaderboard(interaction.client); interaction.client.logger.info('[economy-system] ' + localize('economy-system', 'crime-earned-money', {u: interaction.user.tag, m: money, c: interaction.config['currencySymbol']})); if (interaction.client.logChannel) interaction.client.logChannel.send('[economy-system] ' + localize('economy-system', 'crime-earned-money', {u: interaction.user.tag, m: money, c: interaction.config['currencySymbol']})); @@ -80,82 +80,82 @@ module.exports.subcommands = { id: user.id } }); - if (!robbedUser) return interaction.reply(embedType(interaction.str['userNotFound']), {'%user%': `${interaction.user.username}#${interaction.user.discriminator}`}, { ephemeral: interaction.config['PublicCommandReplies'] }); - if (!await cooldown('rob', interaction.config['robCooldown'] * 60000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: interaction.config['PublicCommandReplies'] })); + if (!robbedUser) return interaction.reply(embedType(interaction.str['userNotFound']), {'%user%': `${interaction.user.username}#${interaction.user.discriminator}`}, { ephemeral: interaction.config['publicCommandReplies'] }); + if (!await cooldown('rob', interaction.config['robCooldown'] * 60000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: interaction.config['publicCommandReplies'] })); let toRob = parseInt(robbedUser.balance) * (parseInt(interaction.config['robPercent']) / 100); if (toRob >= parseInt(interaction.config['maxRobAmount'])) toRob = parseInt(interaction.config['maxRobAmount']); await editBalance(interaction.client, interaction.user.id, 'add', toRob); await editBalance(interaction.client, user.id, 'remove', toRob); - interaction.reply(embedType(interaction.str['robSuccess'], {'%earned%': `${toRob} ${interaction.config['currencySymbol']}`, '%user%': `<@${user.id}>`}, { ephemeral: interaction.config['PublicCommandReplies'] })); + interaction.reply(embedType(interaction.str['robSuccess'], {'%earned%': `${toRob} ${interaction.config['currencySymbol']}`, '%user%': `<@${user.id}>`}, { ephemeral: interaction.config['publicCommandReplies'] })); createleaderboard(interaction.client); interaction.client.logger.info('[economy-system] ' + localize('economy-system', 'crime-earned-money', {u: interaction.user.tag, v: user.tag, m: toRob, c: interaction.config['currencySymbol']})); if (interaction.client.logChannel) interaction.client.logChannel.send('[economy-system] ' + localize('economy-system', 'crime-earned-money', {v: user.tag, u: interaction.user.tag, m: toRob, c: interaction.config['currencySymbol']})); }, 'add': async function (interaction) { - if (!interaction.client.configurations['economy-system']['config']['admins'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) return interaction.reply(embedType(interaction.client.strings['not_enough_permissions'], {}, { ephemeral: interaction.config['PublicCommandReplies'] })); + if (!interaction.client.configurations['economy-system']['config']['admins'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) return interaction.reply(embedType(interaction.client.strings['not_enough_permissions'], {}, { ephemeral: interaction.config['publicCommandReplies'] })); console.log(interaction.options.getUser('user').id); console.log(interaction.user.id); if (interaction.options.getUser('user').id === interaction.user.id && !interaction.client.configurations['economy-system']['config']['selfBalance']) { if (interaction.client.logChannel) interaction.client.logChannel.send(localize('economy-system', 'admin-self-abuse')); return interaction.reply({ content: localize('economy-system', 'admin-self-abuse-answer'), - ephemeral: interaction.config['PublicCommandReplies'] + ephemeral: interaction.config['publicCommandReplies'] }); } await editBalance(interaction.client, await interaction.options.getUser('user').id, 'add', parseInt(interaction.options.get('amount')['value'])); interaction.reply({ content: localize('economy-system', 'added-money', {i: interaction.options.get('amount')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.options.getUser('user').tag}), - ephemeral: interaction.config['PublicCommandReplies'] + ephemeral: interaction.config['publicCommandReplies'] }); interaction.client.logger.info(`[economy-system] ` + localize('economy-system', 'added-money-log', {v: interaction.options.getUser('user').tag, i: interaction.options.get('amount')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.user.tag})); if (interaction.client.logChannel) interaction.client.logChannel.send(`[economy-system] ` + localize('economy-system', 'added-money-log', {v: interaction.options.getUser('user').tag, i: interaction.options.get('amount')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.user.tag})); }, 'remove': async function (interaction) { - if (!interaction.client.configurations['economy-system']['config']['admins'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) return interaction.reply(embedType(interaction.client.strings['not_enough_permissions'], {}, { ephemeral: interaction.config['PublicCommandReplies'] })); + if (!interaction.client.configurations['economy-system']['config']['admins'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) return interaction.reply(embedType(interaction.client.strings['not_enough_permissions'], {}, { ephemeral: interaction.config['publicCommandReplies'] })); if (interaction.options.getUser('user').id === interaction.user.id && !interaction.client.configurations['economy-system']['config']['selfBalance']) { if (interaction.client.logChannel) interaction.client.logChannel.send(localize('economy-system', 'admin-self-abuse')); return interaction.reply({ content: localize('economy-system', 'admin-self-abuse-answer'), - ephemeral: interaction.config['PublicCommandReplies'] + ephemeral: interaction.config['publicCommandReplies'] }); } await editBalance(interaction.client, interaction.options.getUser('user').id, 'remove', parseInt(interaction.options.get('amount')['value'])); interaction.reply({ content: localize('economy-system', 'removed-money', {i: interaction.options.get('amount')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.options.getUser('user').tag}), - ephemeral: interaction.config['PublicCommandReplies'] + ephemeral: interaction.config['publicCommandReplies'] }); interaction.client.logger.info(`[economy-system] ` + localize('economy-system', 'removed-money-log', {v: interaction.options.getUser('user').tag, i: interaction.options.get('amount')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.user.tag})); if (interaction.client.logChannel) interaction.client.logChannel.send(`[economy-system] ` + localize('economy-system', 'removed-money-log', {v: interaction.options.getUser('user').tag, i: interaction.options.get('amount')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.user.tag})); }, 'set': async function (interaction) { - if (!interaction.client.configurations['economy-system']['config']['admins'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) return interaction.reply(embedType(interaction.client.strings['not_enough_permissions'], {}, { ephemeral: interaction.config['PublicCommandReplies'] })); + if (!interaction.client.configurations['economy-system']['config']['admins'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) return interaction.reply(embedType(interaction.client.strings['not_enough_permissions'], {}, { ephemeral: interaction.config['publicCommandReplies'] })); if (interaction.options.getUser('user').id === interaction.user.id && !interaction.client.configurations['economy-system']['config']['selfBalance']) { if (interaction.client.logChannel) interaction.client.logChannel.send(localize('economy-system', 'admin-self-abuse')); return interaction.reply({ content: localize('economy-system', 'admin-self-abuse-answer'), - ephemeral: interaction.config['PublicCommandReplies'] + ephemeral: interaction.config['publicCommandReplies'] }); } await editBalance(interaction.client, interaction.options.getUser('user').id, 'set', parseInt(interaction.options.get('balance')['value'])); interaction.reply({ content: localize('economy-system', 'set-money', {i: interaction.options.get('balance')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.options.getUser('user').tag}), - ephemeral: interaction.config['PublicCommandReplies'] + ephemeral: interaction.config['publicCommandReplies'] }); interaction.client.logger.info(`[economy-system] ` + localize('economy-system', 'set-money-log', {v: interaction.options.getUser('user').tag, i: interaction.options.get('balance')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.user.tag})); if (interaction.client.logChannel) interaction.client.logChannel.send(`[economy-system] ` + localize('economy-system', 'set-money-log', {v: interaction.options.getUser('user').tag, i: interaction.options.get('balance')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.user.tag})); }, 'daily': async function (interaction) { - if (!await cooldown('daily', 86400000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: interaction.config['PublicCommandReplies'] })); + if (!await cooldown('daily', 86400000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: interaction.config['publicCommandReplies'] })); await editBalance(interaction.client, interaction.user.id, 'add', parseInt(interaction.client.configurations['economy-system']['config']['dailyReward'])); - interaction.reply(embedType(interaction.str['dailyReward'], {'%earned%': `${interaction.client.configurations['economy-system']['config']['dailyReward']} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`}, { ephemeral: interaction.config['PublicCommandReplies'] })); + interaction.reply(embedType(interaction.str['dailyReward'], {'%earned%': `${interaction.client.configurations['economy-system']['config']['dailyReward']} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`}, { ephemeral: interaction.config['publicCommandReplies'] })); interaction.client.logger.info(`[economy-system] ` + localize('economy-system', 'daily-earned-money', {u: interaction.user.tag, m: interaction.client.configurations['economy-system']['config']['dailyReward'], c: interaction.client.configurations['economy-system']['config']['currencySymbol']})); if (interaction.client.logChannel) interaction.client.logChannel.send(`[economy-system] ` + localize('economy-system', 'daily-earned-money', {u: interaction.user.tag, m: interaction.client.configurations['economy-system']['config']['dailyReward'], c: interaction.client.configurations['economy-system']['config']['currencySymbol']})); }, 'weekly': async function (interaction) { - if (!await cooldown('weekly', 604800000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: interaction.config['PublicCommandReplies'] })); + if (!await cooldown('weekly', 604800000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: interaction.config['publicCommandReplies'] })); await editBalance(interaction.client, interaction.user.id, 'add', parseInt(interaction.client.configurations['economy-system']['config']['weeklyReward'])); - interaction.reply(embedType(interaction.str['weeklyReward'], {'%earned%': `${interaction.client.configurations['economy-system']['config']['weeklyReward']} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`}, { ephemeral: interaction.config['PublicCommandReplies'] })); + interaction.reply(embedType(interaction.str['weeklyReward'], {'%earned%': `${interaction.client.configurations['economy-system']['config']['weeklyReward']} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`}, { ephemeral: interaction.config['publicCommandReplies'] })); interaction.client.logger.info(`[economy-system] ` + localize('economy-system', 'weekly-earned-money', {u: interaction.user.tag, m: interaction.client.configurations['economy-system']['config']['dailyReward'], c: interaction.client.configurations['economy-system']['config']['currencySymbol']})); if (interaction.client.logChannel) interaction.client.logChannel.send(`[economy-system] ` + localize('economy-system', 'weekly-earned-money', {u: interaction.user.tag, m: interaction.client.configurations['economy-system']['config']['dailyReward'], c: interaction.client.configurations['economy-system']['config']['currencySymbol']})); }, @@ -167,8 +167,8 @@ module.exports.subcommands = { id: user.id } }); - if (!balanceV) return interaction.reply(embedType(interaction.str['userNotFound']), {'%user%': `${interaction.user.username}#${interaction.user.discriminator}`}, { ephemeral: interaction.config['PublicCommandReplies'] }); - interaction.reply(embedType(interaction.str['balanceReply'], {'%user%': `${user.username}#${user.discriminator}`, '%balance%': `${balanceV['balance']} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`, '%bank%': `${balanceV['bank']} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`, '%total%': `${parseInt(balanceV['balance']) + parseInt(balanceV['bank'])} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`}, { ephemeral: interaction.config['PublicCommandReplies'] })); + if (!balanceV) return interaction.reply(embedType(interaction.str['userNotFound']), {'%user%': `${interaction.user.username}#${interaction.user.discriminator}`}, { ephemeral: interaction.config['publicCommandReplies'] }); + interaction.reply(embedType(interaction.str['balanceReply'], {'%user%': `${user.username}#${user.discriminator}`, '%balance%': `${balanceV['balance']} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`, '%bank%': `${balanceV['bank']} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`, '%total%': `${parseInt(balanceV['balance']) + parseInt(balanceV['bank'])} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`}, { ephemeral: interaction.config['publicCommandReplies'] })); }, 'deposit': async function (interaction) { let amount = interaction.options.get('amount')['value']; @@ -178,9 +178,9 @@ module.exports.subcommands = { } }); if (amount === 'all') amount = user.balance; - if (isNaN(amount)) return interaction.reply(embedType(interaction.str['NaN'], {'%input%': amount}, { ephemeral: interaction.config['PublicCommandReplies'] })); + if (isNaN(amount)) return interaction.reply(embedType(interaction.str['NaN'], {'%input%': amount}, { ephemeral: interaction.config['publicCommandReplies'] })); await editBank(interaction.client, interaction.user.id, 'deposit', amount); - interaction.reply(embedType(interaction.str['depositMsg'], {'%amount%': amount}, { ephemeral: interaction.config['PublicCommandReplies'] })); + interaction.reply(embedType(interaction.str['depositMsg'], {'%amount%': amount}, { ephemeral: interaction.config['publicCommandReplies'] })); }, 'withdraw': async function (interaction) { let amount = interaction.options.get('amount')['value']; @@ -190,9 +190,9 @@ module.exports.subcommands = { } }); if (amount === 'all') amount = user.bank; - if (isNaN(amount)) return interaction.reply(embedType(interaction.str['NaN'], {'%input%': amount}, { ephemeral: interaction.config['PublicCommandReplies'] })); + if (isNaN(amount)) return interaction.reply(embedType(interaction.str['NaN'], {'%input%': amount}, { ephemeral: interaction.config['publicCommandReplies'] })); await editBank(interaction.client, interaction.user.id, 'withdraw', amount); - interaction.reply(embedType(interaction.str['withdrawMsg'], {'%amount%': amount}, { ephemeral: interaction.config['PublicCommandReplies'] })); + interaction.reply(embedType(interaction.str['withdrawMsg'], {'%amount%': amount}, { ephemeral: interaction.config['publicCommandReplies'] })); }, 'msg_drop_msg': { 'enable': async function (interaction) { @@ -201,9 +201,9 @@ module.exports.subcommands = { id: interaction.user.id } }); - if (!user) return interaction.reply(embedType(interaction.str['msgDropAlreadyEnabled'], {}, { ephemeral: interaction.config['PublicCommandReplies'] })); + if (!user) return interaction.reply(embedType(interaction.str['msgDropAlreadyEnabled'], {}, { ephemeral: interaction.config['publicCommandReplies'] })); await user.destroy(); - interaction.reply(embedType(interaction.str['msgDropEnabled'], {}, { ephemeral: interaction.config['PublicCommandReplies'] })); + interaction.reply(embedType(interaction.str['msgDropEnabled'], {}, { ephemeral: interaction.config['publicCommandReplies'] })); }, 'disable': async function (interaction) { const user = await interaction.client.models['economy-system']['dropMsg'].findOne({ @@ -211,22 +211,22 @@ module.exports.subcommands = { id: interaction.user.id } }); - if (user) return interaction.reply(embedType(interaction.str['msgDropAlreadyDisabled'], {}, { ephemeral: interaction.config['PublicCommandReplies'] })); + if (user) return interaction.reply(embedType(interaction.str['msgDropAlreadyDisabled'], {}, { ephemeral: interaction.config['publicCommandReplies'] })); await interaction.client.models['economy-system']['dropMsg'].create({ id: interaction.user.id }); - interaction.reply(embedType(interaction.str['msgDropDisabled'], {}, { ephemeral: interaction.config['PublicCommandReplies'] })); + interaction.reply(embedType(interaction.str['msgDropDisabled'], {}, { ephemeral: interaction.config['publicCommandReplies'] })); } }, 'destroy': async function (interaction) { - if (!interaction.client.configurations['economy-system']['config']['admins'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) return interaction.reply(embedType(interaction.client.strings['not_enough_permissions'], {}, { ephemeral: interaction.config['PublicCommandReplies'] })); + if (!interaction.client.configurations['economy-system']['config']['admins'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) return interaction.reply(embedType(interaction.client.strings['not_enough_permissions'], {}, { ephemeral: interaction.config['publicCommandReplies'] })); if (!interaction.options.getBoolean('confirm')) return interaction.reply({ content: localize('economy-system', 'destroy-cancel-reply'), - ephemeral: interaction.config['PublicCommandReplies'] + ephemeral: interaction.config['publicCommandReplies'] }); interaction.reply({ content: localize('economy-system', 'destroy-reply'), - ephemeral: interaction.config['PublicCommandReplies'] + ephemeral: interaction.config['publicCommandReplies'] }); interaction.client.logger.info(`[economy-system] Destroying the whole economy, as requested by ${interaction.user.username}#${interaction.user.discriminator}`); if (interaction.client.logChannel) interaction.client.logChannel.send(`[economy-system] Destroying the whole economy, as requested by ${interaction.user.username}#${interaction.user.discriminator}`); diff --git a/modules/economy-system/commands/shop.js b/modules/economy-system/commands/shop.js index 13738fc9..ccdc7bcb 100644 --- a/modules/economy-system/commands/shop.js +++ b/modules/economy-system/commands/shop.js @@ -7,7 +7,7 @@ module.exports.subcommands = { if (!interaction.client.configurations['economy-system']['config']['shopManagers'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) { return await interaction.reply({ content: interaction.client.strings['not_enough_permissions'], - ephemeral: true + ephemeral: interaction.client.configurations['economy-system']['config']['publicCommandReplies'] }); } const item = await interaction.options.get('item'); @@ -18,7 +18,7 @@ module.exports.subcommands = { '%item%': item['value'], '%price%': price, '%role%': role.name - }, {ephemeral: true})); + }, {ephemeral: interaction.client.configurations['economy-system']['config']['publicCommandReplies']})); interaction.client.logger.info(`[economy-system] ` + localize('economy-system', 'created-item', { u: interaction.user.tag, i: item['value'] @@ -38,7 +38,7 @@ module.exports.subcommands = { if (!item) { interaction.reply({ content: interaction.client.configurations['economy-system']['strings']['notFound'], - ephemeral: true + ephemeral: interaction.client.configurations['economy-system']['config']['publicCommandReplies'] }); } const user = await interaction.client.models['economy-system']['Balance'].findOne({ @@ -48,12 +48,12 @@ module.exports.subcommands = { }); if (user.balance < item.price) return interaction.reply({ content: interaction.client.configurations['economy-system']['strings']['notEnoughMoney'], - ephemeral: true + ephemeral: interaction.client.configurations['economy-system']['config']['publicCommandReplies'] }); await editBalance(interaction.client, interaction.user.id, 'remove', item.price); await interaction.member.roles.add(item.role); createleaderboard(interaction.client); - interaction.reply(embedType(interaction.client.configurations['economy-system']['strings']['buyMsg'], {'%item%': itemName['value']}, {ephemeral: true})); + interaction.reply(embedType(interaction.client.configurations['economy-system']['strings']['buyMsg'], {'%item%': itemName['value']}, {ephemeral: interaction.client.configurations['economy-system']['config']['publicCommandReplies']})); interaction.client.logger.info(`[economy-system] ` + localize('economy-system', 'user-purchase', { u: interaction.user.tag, i: item['value'], @@ -73,12 +73,12 @@ module.exports.subcommands = { if (!interaction.client.configurations['economy-system']['config']['shopManagers'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) { return await interaction.reply({ content: interaction.client.strings['not_enough_permissions'], - ephemeral: true + ephemeral: interaction.client.configurations['economy-system']['config']['publicCommandReplies'] }); } const item = interaction.options.get('item'); await deleteShopItem(item['value'], interaction.client); - interaction.reply(embedType(interaction.client.configurations['economy-system']['strings']['itemDelete'], {'%item%': item['value']}, {ephemeral: true})); + interaction.reply(embedType(interaction.client.configurations['economy-system']['strings']['itemDelete'], {'%item%': item['value']}, {ephemeral: interaction.client.configurations['economy-system']['config']['publicCommandReplies']})); interaction.client.logger.info(`[economy-system] ` + localize('economy-system', 'delete-item', { u: interaction.user.tag, i: item['value'] From cb29b70c249cad210e753d4d119d45305f3637a3 Mon Sep 17 00:00:00 2001 From: jateute Date: Tue, 11 Oct 2022 12:26:46 +0200 Subject: [PATCH 4/4] fix(economy-system): Fixed a few things --- .../economy-system/commands/economy-system.js | 68 +++++++++---------- modules/economy-system/commands/shop.js | 14 ++-- modules/economy-system/configs/config.json | 3 +- 3 files changed, 42 insertions(+), 43 deletions(-) diff --git a/modules/economy-system/commands/economy-system.js b/modules/economy-system/commands/economy-system.js index 917f1aae..06e5b0fd 100644 --- a/modules/economy-system/commands/economy-system.js +++ b/modules/economy-system/commands/economy-system.js @@ -43,16 +43,16 @@ async function cooldown (command, duration, userId, client) { module.exports.subcommands = { 'work': async function (interaction) { - if (!await cooldown('work', interaction.config['workCooldown'] * 60000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: interaction.config['publicCommandReplies'] })); + if (!await cooldown('work', interaction.config['workCooldown'] * 60000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: !interaction.config['publicCommandReplies'] })); const moneyToAdd = randomIntFromInterval(parseInt(interaction.config['maxWorkMoney']), parseInt(interaction.config['minWorkMoney'])); await editBalance(interaction.client, interaction.user.id, 'add', moneyToAdd); - interaction.reply(embedType(randomElementFromArray(interaction.str['workSuccess']), {'%earned%': `${moneyToAdd} ${interaction.config['currencySymbol']}`}, { ephemeral: interaction.config['publicCommandReplies'] })); + interaction.reply(embedType(randomElementFromArray(interaction.str['workSuccess']), {'%earned%': `${moneyToAdd} ${interaction.config['currencySymbol']}`}, { ephemeral: !interaction.config['publicCommandReplies'] })); createleaderboard(interaction.client); interaction.client.logger.info('[economy-system] ' + localize('economy-system', 'work-earned-money', {u: interaction.user.tag, m: moneyToAdd, c: interaction.config['currencySymbol']})); if (interaction.client.logChannel) interaction.client.logChannel.send('[economy-system] ' + localize('economy-system', 'work-earned-money', {u: interaction.user.tag, m: moneyToAdd, c: interaction.config['currencySymbol']})); }, 'crime': async function (interaction) { - if (!await cooldown('crime', interaction.config['crimeCooldown'] * 60000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: interaction.config['publicCommandReplies'] })); + if (!await cooldown('crime', interaction.config['crimeCooldown'] * 60000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: !interaction.config['publicCommandReplies'] })); if (Math.floor(Math.random() * 2) === 0) { const user = await interaction.client.models['economy-system']['Balance'].findOne({ where: { @@ -61,13 +61,13 @@ module.exports.subcommands = { }); money = user.balance / 2; await editBalance(interaction.client, interaction.user.id, 'remove', money); - interaction.reply(embedType(randomElementFromArray(interaction.str['crimeFail']), {'%loose%': `${money} ${interaction.config['currencySymbol']}`}, { ephemeral: interaction.config['publicCommandReplies'] })); + interaction.reply(embedType(randomElementFromArray(interaction.str['crimeFail']), {'%loose%': `${money} ${interaction.config['currencySymbol']}`}, { ephemeral: !interaction.config['publicCommandReplies'] })); interaction.client.logger.info('[economy-system] ' + localize('economy-system', 'crime-loose-money', {u: interaction.user.tag, m: money, c: interaction.config['currencySymbol']})); if (interaction.client.logChannel) interaction.client.logChannel.send('[economy-system] ' + localize('economy-system', 'crime-loose-money', {u: interaction.user.tag, m: money, c: interaction.config['currencySymbol']})); } else { const money = randomIntFromInterval(parseInt(interaction.config['maxCrimeMoney']), parseInt(interaction.config['minCrimeMoney'])); await editBalance(interaction.client, interaction.user.id, 'add', money); - interaction.reply(embedType(randomElementFromArray(interaction.str['crimeSuccess']), {'%earned%': `${money} ${interaction.config['currencySymbol']}`}, { ephemeral: interaction.config['publicCommandReplies'] })); + interaction.reply(embedType(randomElementFromArray(interaction.str['crimeSuccess']), {'%earned%': `${money} ${interaction.config['currencySymbol']}`}, { ephemeral: !interaction.config['publicCommandReplies'] })); createleaderboard(interaction.client); interaction.client.logger.info('[economy-system] ' + localize('economy-system', 'crime-earned-money', {u: interaction.user.tag, m: money, c: interaction.config['currencySymbol']})); if (interaction.client.logChannel) interaction.client.logChannel.send('[economy-system] ' + localize('economy-system', 'crime-earned-money', {u: interaction.user.tag, m: money, c: interaction.config['currencySymbol']})); @@ -80,82 +80,82 @@ module.exports.subcommands = { id: user.id } }); - if (!robbedUser) return interaction.reply(embedType(interaction.str['userNotFound']), {'%user%': `${interaction.user.username}#${interaction.user.discriminator}`}, { ephemeral: interaction.config['publicCommandReplies'] }); - if (!await cooldown('rob', interaction.config['robCooldown'] * 60000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: interaction.config['publicCommandReplies'] })); + if (!robbedUser) return interaction.reply(embedType(interaction.str['userNotFound']), {'%user%': `${interaction.user.username}#${interaction.user.discriminator}`}, { ephemeral: !interaction.config['publicCommandReplies'] }); + if (!await cooldown('rob', interaction.config['robCooldown'] * 60000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: !interaction.config['publicCommandReplies'] })); let toRob = parseInt(robbedUser.balance) * (parseInt(interaction.config['robPercent']) / 100); if (toRob >= parseInt(interaction.config['maxRobAmount'])) toRob = parseInt(interaction.config['maxRobAmount']); await editBalance(interaction.client, interaction.user.id, 'add', toRob); await editBalance(interaction.client, user.id, 'remove', toRob); - interaction.reply(embedType(interaction.str['robSuccess'], {'%earned%': `${toRob} ${interaction.config['currencySymbol']}`, '%user%': `<@${user.id}>`}, { ephemeral: interaction.config['publicCommandReplies'] })); + interaction.reply(embedType(interaction.str['robSuccess'], {'%earned%': `${toRob} ${interaction.config['currencySymbol']}`, '%user%': `<@${user.id}>`}, { ephemeral: !interaction.config['publicCommandReplies'] })); createleaderboard(interaction.client); interaction.client.logger.info('[economy-system] ' + localize('economy-system', 'crime-earned-money', {u: interaction.user.tag, v: user.tag, m: toRob, c: interaction.config['currencySymbol']})); if (interaction.client.logChannel) interaction.client.logChannel.send('[economy-system] ' + localize('economy-system', 'crime-earned-money', {v: user.tag, u: interaction.user.tag, m: toRob, c: interaction.config['currencySymbol']})); }, 'add': async function (interaction) { - if (!interaction.client.configurations['economy-system']['config']['admins'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) return interaction.reply(embedType(interaction.client.strings['not_enough_permissions'], {}, { ephemeral: interaction.config['publicCommandReplies'] })); + if (!interaction.client.configurations['economy-system']['config']['admins'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) return interaction.reply(embedType(interaction.client.strings['not_enough_permissions'], {}, { ephemeral: !interaction.config['publicCommandReplies'] })); console.log(interaction.options.getUser('user').id); console.log(interaction.user.id); if (interaction.options.getUser('user').id === interaction.user.id && !interaction.client.configurations['economy-system']['config']['selfBalance']) { if (interaction.client.logChannel) interaction.client.logChannel.send(localize('economy-system', 'admin-self-abuse')); return interaction.reply({ content: localize('economy-system', 'admin-self-abuse-answer'), - ephemeral: interaction.config['publicCommandReplies'] + ephemeral: !interaction.config['publicCommandReplies'] }); } await editBalance(interaction.client, await interaction.options.getUser('user').id, 'add', parseInt(interaction.options.get('amount')['value'])); interaction.reply({ content: localize('economy-system', 'added-money', {i: interaction.options.get('amount')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.options.getUser('user').tag}), - ephemeral: interaction.config['publicCommandReplies'] + ephemeral: !interaction.config['publicCommandReplies'] }); interaction.client.logger.info(`[economy-system] ` + localize('economy-system', 'added-money-log', {v: interaction.options.getUser('user').tag, i: interaction.options.get('amount')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.user.tag})); if (interaction.client.logChannel) interaction.client.logChannel.send(`[economy-system] ` + localize('economy-system', 'added-money-log', {v: interaction.options.getUser('user').tag, i: interaction.options.get('amount')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.user.tag})); }, 'remove': async function (interaction) { - if (!interaction.client.configurations['economy-system']['config']['admins'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) return interaction.reply(embedType(interaction.client.strings['not_enough_permissions'], {}, { ephemeral: interaction.config['publicCommandReplies'] })); + if (!interaction.client.configurations['economy-system']['config']['admins'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) return interaction.reply(embedType(interaction.client.strings['not_enough_permissions'], {}, { ephemeral: !interaction.config['publicCommandReplies'] })); if (interaction.options.getUser('user').id === interaction.user.id && !interaction.client.configurations['economy-system']['config']['selfBalance']) { if (interaction.client.logChannel) interaction.client.logChannel.send(localize('economy-system', 'admin-self-abuse')); return interaction.reply({ content: localize('economy-system', 'admin-self-abuse-answer'), - ephemeral: interaction.config['publicCommandReplies'] + ephemeral: !interaction.config['publicCommandReplies'] }); } await editBalance(interaction.client, interaction.options.getUser('user').id, 'remove', parseInt(interaction.options.get('amount')['value'])); interaction.reply({ content: localize('economy-system', 'removed-money', {i: interaction.options.get('amount')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.options.getUser('user').tag}), - ephemeral: interaction.config['publicCommandReplies'] + ephemeral: !interaction.config['publicCommandReplies'] }); interaction.client.logger.info(`[economy-system] ` + localize('economy-system', 'removed-money-log', {v: interaction.options.getUser('user').tag, i: interaction.options.get('amount')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.user.tag})); if (interaction.client.logChannel) interaction.client.logChannel.send(`[economy-system] ` + localize('economy-system', 'removed-money-log', {v: interaction.options.getUser('user').tag, i: interaction.options.get('amount')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.user.tag})); }, 'set': async function (interaction) { - if (!interaction.client.configurations['economy-system']['config']['admins'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) return interaction.reply(embedType(interaction.client.strings['not_enough_permissions'], {}, { ephemeral: interaction.config['publicCommandReplies'] })); + if (!interaction.client.configurations['economy-system']['config']['admins'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) return interaction.reply(embedType(interaction.client.strings['not_enough_permissions'], {}, { ephemeral: !interaction.config['publicCommandReplies'] })); if (interaction.options.getUser('user').id === interaction.user.id && !interaction.client.configurations['economy-system']['config']['selfBalance']) { if (interaction.client.logChannel) interaction.client.logChannel.send(localize('economy-system', 'admin-self-abuse')); return interaction.reply({ content: localize('economy-system', 'admin-self-abuse-answer'), - ephemeral: interaction.config['publicCommandReplies'] + ephemeral: !interaction.config['publicCommandReplies'] }); } await editBalance(interaction.client, interaction.options.getUser('user').id, 'set', parseInt(interaction.options.get('balance')['value'])); interaction.reply({ content: localize('economy-system', 'set-money', {i: interaction.options.get('balance')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.options.getUser('user').tag}), - ephemeral: interaction.config['publicCommandReplies'] + ephemeral: !interaction.config['publicCommandReplies'] }); interaction.client.logger.info(`[economy-system] ` + localize('economy-system', 'set-money-log', {v: interaction.options.getUser('user').tag, i: interaction.options.get('balance')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.user.tag})); if (interaction.client.logChannel) interaction.client.logChannel.send(`[economy-system] ` + localize('economy-system', 'set-money-log', {v: interaction.options.getUser('user').tag, i: interaction.options.get('balance')['value'], c: interaction.client.configurations['economy-system']['config']['currencySymbol'], u: interaction.user.tag})); }, 'daily': async function (interaction) { - if (!await cooldown('daily', 86400000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: interaction.config['publicCommandReplies'] })); + if (!await cooldown('daily', 86400000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: !interaction.config['publicCommandReplies'] })); await editBalance(interaction.client, interaction.user.id, 'add', parseInt(interaction.client.configurations['economy-system']['config']['dailyReward'])); - interaction.reply(embedType(interaction.str['dailyReward'], {'%earned%': `${interaction.client.configurations['economy-system']['config']['dailyReward']} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`}, { ephemeral: interaction.config['publicCommandReplies'] })); + interaction.reply(embedType(interaction.str['dailyReward'], {'%earned%': `${interaction.client.configurations['economy-system']['config']['dailyReward']} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`}, { ephemeral: !interaction.config['publicCommandReplies'] })); interaction.client.logger.info(`[economy-system] ` + localize('economy-system', 'daily-earned-money', {u: interaction.user.tag, m: interaction.client.configurations['economy-system']['config']['dailyReward'], c: interaction.client.configurations['economy-system']['config']['currencySymbol']})); if (interaction.client.logChannel) interaction.client.logChannel.send(`[economy-system] ` + localize('economy-system', 'daily-earned-money', {u: interaction.user.tag, m: interaction.client.configurations['economy-system']['config']['dailyReward'], c: interaction.client.configurations['economy-system']['config']['currencySymbol']})); }, 'weekly': async function (interaction) { - if (!await cooldown('weekly', 604800000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: interaction.config['publicCommandReplies'] })); + if (!await cooldown('weekly', 604800000, interaction.user.id, interaction.client)) return interaction.reply(embedType(interaction.str['cooldown'], {}, { ephemeral: !interaction.config['publicCommandReplies'] })); await editBalance(interaction.client, interaction.user.id, 'add', parseInt(interaction.client.configurations['economy-system']['config']['weeklyReward'])); - interaction.reply(embedType(interaction.str['weeklyReward'], {'%earned%': `${interaction.client.configurations['economy-system']['config']['weeklyReward']} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`}, { ephemeral: interaction.config['publicCommandReplies'] })); + interaction.reply(embedType(interaction.str['weeklyReward'], {'%earned%': `${interaction.client.configurations['economy-system']['config']['weeklyReward']} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`}, { ephemeral: !interaction.config['publicCommandReplies'] })); interaction.client.logger.info(`[economy-system] ` + localize('economy-system', 'weekly-earned-money', {u: interaction.user.tag, m: interaction.client.configurations['economy-system']['config']['dailyReward'], c: interaction.client.configurations['economy-system']['config']['currencySymbol']})); if (interaction.client.logChannel) interaction.client.logChannel.send(`[economy-system] ` + localize('economy-system', 'weekly-earned-money', {u: interaction.user.tag, m: interaction.client.configurations['economy-system']['config']['dailyReward'], c: interaction.client.configurations['economy-system']['config']['currencySymbol']})); }, @@ -167,8 +167,8 @@ module.exports.subcommands = { id: user.id } }); - if (!balanceV) return interaction.reply(embedType(interaction.str['userNotFound']), {'%user%': `${interaction.user.username}#${interaction.user.discriminator}`}, { ephemeral: interaction.config['publicCommandReplies'] }); - interaction.reply(embedType(interaction.str['balanceReply'], {'%user%': `${user.username}#${user.discriminator}`, '%balance%': `${balanceV['balance']} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`, '%bank%': `${balanceV['bank']} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`, '%total%': `${parseInt(balanceV['balance']) + parseInt(balanceV['bank'])} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`}, { ephemeral: interaction.config['publicCommandReplies'] })); + if (!balanceV) return interaction.reply(embedType(interaction.str['userNotFound']), {'%user%': `${interaction.user.username}#${interaction.user.discriminator}`}, { ephemeral: !interaction.config['publicCommandReplies'] }); + interaction.reply(embedType(interaction.str['balanceReply'], {'%user%': `${user.username}#${user.discriminator}`, '%balance%': `${balanceV['balance']} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`, '%bank%': `${balanceV['bank']} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`, '%total%': `${parseInt(balanceV['balance']) + parseInt(balanceV['bank'])} ${interaction.client.configurations['economy-system']['config']['currencySymbol']}`}, { ephemeral: !interaction.config['publicCommandReplies'] })); }, 'deposit': async function (interaction) { let amount = interaction.options.get('amount')['value']; @@ -178,9 +178,9 @@ module.exports.subcommands = { } }); if (amount === 'all') amount = user.balance; - if (isNaN(amount)) return interaction.reply(embedType(interaction.str['NaN'], {'%input%': amount}, { ephemeral: interaction.config['publicCommandReplies'] })); + if (isNaN(amount)) return interaction.reply(embedType(interaction.str['NaN'], {'%input%': amount}, { ephemeral: !interaction.config['publicCommandReplies'] })); await editBank(interaction.client, interaction.user.id, 'deposit', amount); - interaction.reply(embedType(interaction.str['depositMsg'], {'%amount%': amount}, { ephemeral: interaction.config['publicCommandReplies'] })); + interaction.reply(embedType(interaction.str['depositMsg'], {'%amount%': amount}, { ephemeral: !interaction.config['publicCommandReplies'] })); }, 'withdraw': async function (interaction) { let amount = interaction.options.get('amount')['value']; @@ -190,9 +190,9 @@ module.exports.subcommands = { } }); if (amount === 'all') amount = user.bank; - if (isNaN(amount)) return interaction.reply(embedType(interaction.str['NaN'], {'%input%': amount}, { ephemeral: interaction.config['publicCommandReplies'] })); + if (isNaN(amount)) return interaction.reply(embedType(interaction.str['NaN'], {'%input%': amount}, { ephemeral: !interaction.config['publicCommandReplies'] })); await editBank(interaction.client, interaction.user.id, 'withdraw', amount); - interaction.reply(embedType(interaction.str['withdrawMsg'], {'%amount%': amount}, { ephemeral: interaction.config['publicCommandReplies'] })); + interaction.reply(embedType(interaction.str['withdrawMsg'], {'%amount%': amount}, { ephemeral: !interaction.config['publicCommandReplies'] })); }, 'msg_drop_msg': { 'enable': async function (interaction) { @@ -201,9 +201,9 @@ module.exports.subcommands = { id: interaction.user.id } }); - if (!user) return interaction.reply(embedType(interaction.str['msgDropAlreadyEnabled'], {}, { ephemeral: interaction.config['publicCommandReplies'] })); + if (!user) return interaction.reply(embedType(interaction.str['msgDropAlreadyEnabled'], {}, { ephemeral: !interaction.config['publicCommandReplies'] })); await user.destroy(); - interaction.reply(embedType(interaction.str['msgDropEnabled'], {}, { ephemeral: interaction.config['publicCommandReplies'] })); + interaction.reply(embedType(interaction.str['msgDropEnabled'], {}, { ephemeral: !interaction.config['publicCommandReplies'] })); }, 'disable': async function (interaction) { const user = await interaction.client.models['economy-system']['dropMsg'].findOne({ @@ -211,22 +211,22 @@ module.exports.subcommands = { id: interaction.user.id } }); - if (user) return interaction.reply(embedType(interaction.str['msgDropAlreadyDisabled'], {}, { ephemeral: interaction.config['publicCommandReplies'] })); + if (user) return interaction.reply(embedType(interaction.str['msgDropAlreadyDisabled'], {}, { ephemeral: !interaction.config['publicCommandReplies'] })); await interaction.client.models['economy-system']['dropMsg'].create({ id: interaction.user.id }); - interaction.reply(embedType(interaction.str['msgDropDisabled'], {}, { ephemeral: interaction.config['publicCommandReplies'] })); + interaction.reply(embedType(interaction.str['msgDropDisabled'], {}, { ephemeral: !interaction.config['publicCommandReplies'] })); } }, 'destroy': async function (interaction) { - if (!interaction.client.configurations['economy-system']['config']['admins'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) return interaction.reply(embedType(interaction.client.strings['not_enough_permissions'], {}, { ephemeral: interaction.config['publicCommandReplies'] })); + if (!interaction.client.configurations['economy-system']['config']['admins'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) return interaction.reply(embedType(interaction.client.strings['not_enough_permissions'], {}, { ephemeral: !interaction.config['publicCommandReplies'] })); if (!interaction.options.getBoolean('confirm')) return interaction.reply({ content: localize('economy-system', 'destroy-cancel-reply'), - ephemeral: interaction.config['publicCommandReplies'] + ephemeral: !interaction.config['publicCommandReplies'] }); interaction.reply({ content: localize('economy-system', 'destroy-reply'), - ephemeral: interaction.config['publicCommandReplies'] + ephemeral: !interaction.config['publicCommandReplies'] }); interaction.client.logger.info(`[economy-system] Destroying the whole economy, as requested by ${interaction.user.username}#${interaction.user.discriminator}`); if (interaction.client.logChannel) interaction.client.logChannel.send(`[economy-system] Destroying the whole economy, as requested by ${interaction.user.username}#${interaction.user.discriminator}`); diff --git a/modules/economy-system/commands/shop.js b/modules/economy-system/commands/shop.js index ccdc7bcb..b7efa2ed 100644 --- a/modules/economy-system/commands/shop.js +++ b/modules/economy-system/commands/shop.js @@ -7,7 +7,7 @@ module.exports.subcommands = { if (!interaction.client.configurations['economy-system']['config']['shopManagers'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) { return await interaction.reply({ content: interaction.client.strings['not_enough_permissions'], - ephemeral: interaction.client.configurations['economy-system']['config']['publicCommandReplies'] + ephemeral: !interaction.client.configurations['economy-system']['config']['publicCommandReplies'] }); } const item = await interaction.options.get('item'); @@ -18,7 +18,7 @@ module.exports.subcommands = { '%item%': item['value'], '%price%': price, '%role%': role.name - }, {ephemeral: interaction.client.configurations['economy-system']['config']['publicCommandReplies']})); + }, {ephemeral: !interaction.client.configurations['economy-system']['config']['publicCommandReplies']})); interaction.client.logger.info(`[economy-system] ` + localize('economy-system', 'created-item', { u: interaction.user.tag, i: item['value'] @@ -38,7 +38,7 @@ module.exports.subcommands = { if (!item) { interaction.reply({ content: interaction.client.configurations['economy-system']['strings']['notFound'], - ephemeral: interaction.client.configurations['economy-system']['config']['publicCommandReplies'] + ephemeral: !interaction.client.configurations['economy-system']['config']['publicCommandReplies'] }); } const user = await interaction.client.models['economy-system']['Balance'].findOne({ @@ -48,12 +48,12 @@ module.exports.subcommands = { }); if (user.balance < item.price) return interaction.reply({ content: interaction.client.configurations['economy-system']['strings']['notEnoughMoney'], - ephemeral: interaction.client.configurations['economy-system']['config']['publicCommandReplies'] + ephemeral: !interaction.client.configurations['economy-system']['config']['publicCommandReplies'] }); await editBalance(interaction.client, interaction.user.id, 'remove', item.price); await interaction.member.roles.add(item.role); createleaderboard(interaction.client); - interaction.reply(embedType(interaction.client.configurations['economy-system']['strings']['buyMsg'], {'%item%': itemName['value']}, {ephemeral: interaction.client.configurations['economy-system']['config']['publicCommandReplies']})); + interaction.reply(embedType(interaction.client.configurations['economy-system']['strings']['buyMsg'], {'%item%': itemName['value']}, {ephemeral: !interaction.client.configurations['economy-system']['config']['publicCommandReplies']})); interaction.client.logger.info(`[economy-system] ` + localize('economy-system', 'user-purchase', { u: interaction.user.tag, i: item['value'], @@ -73,12 +73,12 @@ module.exports.subcommands = { if (!interaction.client.configurations['economy-system']['config']['shopManagers'].includes(interaction.user.id) && !interaction.client.config['botOperators'].includes(interaction.user.id)) { return await interaction.reply({ content: interaction.client.strings['not_enough_permissions'], - ephemeral: interaction.client.configurations['economy-system']['config']['publicCommandReplies'] + ephemeral: !interaction.client.configurations['economy-system']['config']['publicCommandReplies'] }); } const item = interaction.options.get('item'); await deleteShopItem(item['value'], interaction.client); - interaction.reply(embedType(interaction.client.configurations['economy-system']['strings']['itemDelete'], {'%item%': item['value']}, {ephemeral: interaction.client.configurations['economy-system']['config']['publicCommandReplies']})); + interaction.reply(embedType(interaction.client.configurations['economy-system']['strings']['itemDelete'], {'%item%': item['value']}, {ephemeral: !interaction.client.configurations['economy-system']['config']['publicCommandReplies']})); interaction.client.logger.info(`[economy-system] ` + localize('economy-system', 'delete-item', { u: interaction.user.tag, i: item['value'] diff --git a/modules/economy-system/configs/config.json b/modules/economy-system/configs/config.json index 32e16d5a..bbbb6898 100644 --- a/modules/economy-system/configs/config.json +++ b/modules/economy-system/configs/config.json @@ -204,8 +204,7 @@ "default": false, "type": "boolean", "description-de": "Sollen die Command-Antworten für alle angezeigt werden?", - "description-en": "Should the Command-replies be displayed for everyone?", - "elementToggle": true + "description-en": "Should the Command-replies be displayed for everyone?" } ] } \ No newline at end of file