diff options
Diffstat (limited to 'src/commands/moulberry-bush')
| -rw-r--r-- | src/commands/moulberry-bush/capePerms.ts | 13 | ||||
| -rw-r--r-- | src/commands/moulberry-bush/giveawayPing.ts | 7 | ||||
| -rw-r--r-- | src/commands/moulberry-bush/rule.ts | 8 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/commands/moulberry-bush/capePerms.ts b/src/commands/moulberry-bush/capePerms.ts index 7eb90c5..380ed2d 100644 --- a/src/commands/moulberry-bush/capePerms.ts +++ b/src/commands/moulberry-bush/capePerms.ts @@ -1,9 +1,9 @@ import { ApplicationCommandOptionType } from 'discord-api-types'; import { Message, MessageEmbed } from 'discord.js'; import got from 'got'; +import { SlashCommandOption } from '../../lib/extensions/BushClientUtil'; import { BushCommand } from '../../lib/extensions/BushCommand'; import { BushInteractionMessage } from '../../lib/extensions/BushInteractionMessage'; -import { SlashCommandOption } from '../../lib/extensions/Util'; interface Capeperms { success: boolean; @@ -57,7 +57,7 @@ export default class CapePermissionsCommand extends BushCommand { type: 'string', prompt: { start: 'Who would you like to see the cape permissions of?', - retry: '<:error:837123021016924261> Choose someone to see the capes their available capes.', + retry: '{error} Choose someone to see the capes their available capes.', optional: false } } @@ -79,7 +79,7 @@ export default class CapePermissionsCommand extends BushCommand { try { uuid = await this.client.util.mcUUID(user); } catch (e) { - return { content: `<:error:837123021016924261> \`${user}\` doesn't appear to be a valid username.` }; + return { content: `${this.client.util.emojis.error} \`${user}\` doesn't appear to be a valid username.` }; } try { @@ -88,11 +88,12 @@ export default class CapePermissionsCommand extends BushCommand { capeperms = null; } if (capeperms == null) { - return { content: `<:error:837123021016924261> There was an error finding cape perms for \`${user}\`.` }; + return { content: `${this.client.util.emojis.error} There was an error finding cape perms for \`${user}\`.` }; } else { if (capeperms?.perms) { const foundUser = capeperms.perms.find((u) => u._id === uuid); - if (foundUser == null) return { content: `<:error:837123021016924261> \`${user}\` does not appear to have any capes.` }; + if (foundUser == null) + return { content: `${this.client.util.emojis.error} \`${user}\` does not appear to have any capes.` }; const userPerm: string[] = foundUser.perms; const embed = this.client.util .createEmbed(this.client.util.colors.default) @@ -100,7 +101,7 @@ export default class CapePermissionsCommand extends BushCommand { .setDescription(userPerm.join('\n')); return { embeds: [embed] }; } else { - return { content: `<:error:837123021016924261> There was an error finding cape perms for ${user}.` }; + return { content: `${this.client.util.emojis.error} There was an error finding cape perms for ${user}.` }; } } } diff --git a/src/commands/moulberry-bush/giveawayPing.ts b/src/commands/moulberry-bush/giveawayPing.ts index 9a03140..d308602 100644 --- a/src/commands/moulberry-bush/giveawayPing.ts +++ b/src/commands/moulberry-bush/giveawayPing.ts @@ -24,9 +24,9 @@ export default class GiveawayPingCommand extends BushCommand { } public async exec(message: Message): Promise<unknown> { if (message.guild.id !== '516977525906341928') - return message.reply("<:error:837123021016924261> This command may only be run in Moulberry's Bush."); + return message.reply(`${this.client.util.emojis.error} This command may only be run in Moulberry's Bush.`); if (!['767782084981817344', '833855738501267456'].includes(message.channel.id)) - return message.reply('<:error:837123021016924261> This command may only be run in giveaway channels.'); + return message.reply(`${this.client.util.emojis.error} This command may only be run in giveaway channels.`); await message.delete().catch(() => undefined); const webhooks = await (message.channel as TextChannel | NewsChannel).fetchWebhooks(); let webhookClient: WebhookClient; @@ -38,8 +38,7 @@ export default class GiveawayPingCommand extends BushCommand { webhookClient = new WebhookClient(webhook.id, webhook.token); } return webhookClient.send({ - content: - '🎉 <@&767782793261875210> Giveaway.\n\n<:mad:783046135392239626> Spamming, line breaking, gibberish etc. disqualifies you from winning. We can and will ban you from giveaways. Winners will all be checked and rerolled if needed.', + content: `🎉 <@&767782793261875210> Giveaway.\n\n${this.client.util.emojis.mad} Spamming, line breaking, gibberish etc. disqualifies you from winning. We can and will ban you from giveaways. Winners will all be checked and rerolled if needed.`, username: `${message.member.nickname || message.author.username}`, avatarURL: message.author.avatarURL({ dynamic: true }), allowedMentions: AllowedMentions.roles() diff --git a/src/commands/moulberry-bush/rule.ts b/src/commands/moulberry-bush/rule.ts index b71b42f..674b776 100644 --- a/src/commands/moulberry-bush/rule.ts +++ b/src/commands/moulberry-bush/rule.ts @@ -1,9 +1,9 @@ import { Argument } from 'discord-akairo'; import { ApplicationCommandOptionType } from 'discord-api-types'; import { CommandInteraction, Message, MessageEmbed, User } from 'discord.js'; +import { SlashCommandOption } from '../../lib/extensions/BushClientUtil'; import { BushCommand } from '../../lib/extensions/BushCommand'; import { BushInteractionMessage } from '../../lib/extensions/BushInteractionMessage'; -import { SlashCommandOption } from '../../lib/extensions/Util'; export default class RuleCommand extends BushCommand { private rules = [ @@ -80,7 +80,7 @@ export default class RuleCommand extends BushCommand { type: Argument.range('number', 1, 12, true), prompt: { start: 'What rule would you like to have cited?', - retry: '<:no:787549684196704257> Choose a valid rule.', + retry: '{error} Choose a valid rule.', optional: true }, default: undefined @@ -90,7 +90,7 @@ export default class RuleCommand extends BushCommand { type: 'user', prompt: { start: 'What user would you like to mention?', - retry: '<:no:787549684196704257> Choose a valid user to mention.', + retry: '{error} Choose a valid user to mention.', optional: true }, default: undefined @@ -123,7 +123,7 @@ export default class RuleCommand extends BushCommand { message.guild.id !== '516977525906341928' && !this.client.ownerID.includes(message instanceof Message ? message.author.id : message.user.id) ) { - return { content: "<:no:787549684196704257> This command can only be run in Moulberry's Bush." }; + return { content: `${this.client.util.emojis.error} This command can only be run in Moulberry's Bush.` }; } let rulesEmbed = new MessageEmbed().setColor('ef3929'); if (message instanceof Message) { |