diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/commands/dev/superUser.ts | 4 | ||||
| -rw-r--r-- | src/commands/dev/syncAutomod.ts | 2 | ||||
| -rw-r--r-- | src/commands/moderation/ban.ts | 6 | ||||
| -rw-r--r-- | src/lib/common/ConfirmationPrompt.ts | 4 | ||||
| -rw-r--r-- | src/lib/extensions/discord-akairo/BushClientUtil.ts | 4 | ||||
| -rw-r--r-- | src/lib/extensions/discord.js/BushGuild.ts | 3 | ||||
| -rw-r--r-- | src/lib/utils/BushConstants.ts | 19 |
7 files changed, 32 insertions, 10 deletions
diff --git a/src/commands/dev/superUser.ts b/src/commands/dev/superUser.ts index 9cdac4a..7b75672 100644 --- a/src/commands/dev/superUser.ts +++ b/src/commands/dev/superUser.ts @@ -4,8 +4,8 @@ import { ArgumentTypeCasterReturn } from 'discord-akairo/dist/src/struct/command export default class SuperUserCommand extends BushCommand { public constructor() { - super('superuser', { - aliases: ['superuser', 'su'], + super('superUser', { + aliases: ['super-user', 'su'], category: 'dev', description: 'A command to manage superusers.', usage: ['superuser <add/remove> <user>'], diff --git a/src/commands/dev/syncAutomod.ts b/src/commands/dev/syncAutomod.ts index 523a624..4d4a6d7 100644 --- a/src/commands/dev/syncAutomod.ts +++ b/src/commands/dev/syncAutomod.ts @@ -5,7 +5,7 @@ import { NodeVM } from 'vm2'; export default class SyncAutomodCommand extends BushCommand { public constructor() { - super('sync-automod', { + super('syncAutomod', { aliases: ['sync-automod'], category: 'dev', description: 'Syncs automod info with the github repository.', diff --git a/src/commands/moderation/ban.ts b/src/commands/moderation/ban.ts index 209397c..5e3350f 100644 --- a/src/commands/moderation/ban.ts +++ b/src/commands/moderation/ban.ts @@ -16,7 +16,7 @@ export default class BanCommand extends BushCommand { aliases: ['ban', 'force-ban', 'dban'], category: 'moderation', description: 'Ban a member from the server.', - usage: ['ban <member> [reasonAndDuration] [--delete]'], + usage: ['ban <member> [reasonAndDuration] [--days <days>]'], examples: ['ban ironm00n 1 day commands in #general --delete 7'], args: [ { @@ -40,7 +40,7 @@ export default class BanCommand extends BushCommand { { id: 'days', description: 'The number of days of messages to delete when the user is banned, defaults to 0.', - flag: '--days', + flag: ['--days', '--delete'], match: 'option', prompt: "How many days of the user's messages would you like to delete?", retry: '{error} Choose between 0 and 7 days to delete messages from the user for.', @@ -95,8 +95,6 @@ export default class BanCommand extends BushCommand { if (message.util.parsed?.alias === 'dban' && !args.days) args.days = 1; if (!Number.isInteger(args.days) || args.days! < 0 || args.days! > 7) { - client.console.debug(args.days); - return message.util.reply(`${util.emojis.error} The delete days must be an integer between 0 and 7.`); } diff --git a/src/lib/common/ConfirmationPrompt.ts b/src/lib/common/ConfirmationPrompt.ts index 97f18b3..bd11c5c 100644 --- a/src/lib/common/ConfirmationPrompt.ts +++ b/src/lib/common/ConfirmationPrompt.ts @@ -33,12 +33,12 @@ export class ConfirmationPrompt { new ButtonComponent() .setStyle(ButtonStyle.Primary) .setCustomId('confirmationPrompt_confirm') - .setEmoji({ id: util.emojis.successFull, name: 'successFull', animated: false }) + .setEmoji({ id: util.emojisRaw.successFull, name: 'successFull', animated: false }) .setLabel('Yes'), new ButtonComponent() .setStyle(ButtonStyle.Danger) .setCustomId('confirmationPrompt_cancel') - .setEmoji({ id: util.emojis.errorFull, name: 'errorFull', animated: false }) + .setEmoji({ id: util.emojisRaw.errorFull, name: 'errorFull', animated: false }) .setLabel('No') ) ]; diff --git a/src/lib/extensions/discord-akairo/BushClientUtil.ts b/src/lib/extensions/discord-akairo/BushClientUtil.ts index 7a4d5b0..09dd84d 100644 --- a/src/lib/extensions/discord-akairo/BushClientUtil.ts +++ b/src/lib/extensions/discord-akairo/BushClientUtil.ts @@ -195,6 +195,10 @@ export class BushClientUtil extends ClientUtil { return client.consts.emojis; } + get emojisRaw() { + return client.consts.emojisRaw; + } + /** * Fetches a user's uuid from the mojang api. * @param username The username to get the uuid of. diff --git a/src/lib/extensions/discord.js/BushGuild.ts b/src/lib/extensions/discord.js/BushGuild.ts index 83e024d..4aacc73 100644 --- a/src/lib/extensions/discord.js/BushGuild.ts +++ b/src/lib/extensions/discord.js/BushGuild.ts @@ -351,7 +351,8 @@ export class BushGuild extends Guild { const permissionOverwrites = channel.isThread() ? channel.parent!.permissionOverwrites : channel.permissionOverwrites; const perms = { - [channel.isThread() ? 'SendMessagesInThreads' : 'SendMessages']: options.unlock ? null : false + SendMessagesInThreads: options.unlock ? null : false, + SendMessages: options.unlock ? null : false }; const permsForMe = { [channel.isThread() ? 'SendMessagesInThreads' : 'SendMessages']: options.unlock ? null : true diff --git a/src/lib/utils/BushConstants.ts b/src/lib/utils/BushConstants.ts index 39f3299..4012054 100644 --- a/src/lib/utils/BushConstants.ts +++ b/src/lib/utils/BushConstants.ts @@ -65,6 +65,25 @@ export class BushConstants { check: '<:check:878320135297961995>' } as const); + public static emojisRaw = Object.freeze({ + success: '837109864101707807', + warn: '848726900876247050', + error: '837123021016924261', + successFull: '850118767576088646', + warnFull: '850118767391539312', + errorFull: '850118767295201350', + mad: '783046135392239626', + join: '850198029809614858', + leave: '850198048205307919', + loading: '853419254619963392', + offlineCircle: '787550565382750239', + dndCircle: '787550487633330176', + idleCircle: '787550520956551218', + onlineCircle: '787550449435803658', + cross: '878319362539421777', + check: '878320135297961995' + } as const); + public static colors = Object.freeze({ default: 0x1fd8f1, error: 0xef4947, |