diff options
Diffstat (limited to 'src/commands/utilities/calculator.ts')
| -rw-r--r-- | src/commands/utilities/calculator.ts | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/src/commands/utilities/calculator.ts b/src/commands/utilities/calculator.ts index a318a79..75d63a1 100644 --- a/src/commands/utilities/calculator.ts +++ b/src/commands/utilities/calculator.ts @@ -1,4 +1,13 @@ -import { AllowedMentions, BushCommand, type CommandMessage, type SlashMessage } from '#lib'; +import { + AllowedMentions, + BushCommand, + clientSendAndPermCheck, + colors, + emojis, + inspectCleanRedactCodeblock, + type CommandMessage, + type SlashMessage +} from '#lib'; import assert from 'assert'; import { ApplicationCommandOptionType, EmbedBuilder } from 'discord.js'; import { evaluate } from 'mathjs'; @@ -25,7 +34,7 @@ export default class CalculatorCommand extends BushCommand { } ], slash: true, - clientPermissions: (m) => util.clientSendAndPermCheck(m), + clientPermissions: (m) => clientSendAndPermCheck(m), userPermissions: [] }); } @@ -34,22 +43,20 @@ export default class CalculatorCommand extends BushCommand { const decodedEmbed = new EmbedBuilder().addFields([ { name: '📥 Input', - value: await util.inspectCleanRedactCodeblock(args.expression, 'mma') + value: await inspectCleanRedactCodeblock(args.expression, 'mma') } ]); try { const calculated = /^(9\s*?\+\s*?10)|(10\s*?\+\s*?9)$/.test(args.expression) ? '21' : evaluate(args.expression); decodedEmbed - .setTitle(`${util.emojis.successFull} Successfully Calculated Expression`) - .setColor(util.colors.success) - .addFields([{ name: '📤 Output', value: await util.inspectCleanRedactCodeblock(calculated.toString(), 'mma') }]); + .setTitle(`${emojis.successFull} Successfully Calculated Expression`) + .setColor(colors.success) + .addFields([{ name: '📤 Output', value: await inspectCleanRedactCodeblock(calculated.toString(), 'mma') }]); } catch (error) { decodedEmbed - .setTitle(`${util.emojis.errorFull} Unable to Calculate Expression`) - .setColor(util.colors.error) - .addFields([ - { name: `📤 Error`, value: await util.inspectCleanRedactCodeblock(`${error.name}: ${error.message}`, 'js') } - ]); + .setTitle(`${emojis.errorFull} Unable to Calculate Expression`) + .setColor(colors.error) + .addFields([{ name: `📤 Error`, value: await inspectCleanRedactCodeblock(`${error.name}: ${error.message}`, 'js') }]); } return await message.util.reply({ embeds: [decodedEmbed], allowedMentions: AllowedMentions.none() }); } |