diff options
Diffstat (limited to 'src/commands')
95 files changed, 237 insertions, 234 deletions
diff --git a/src/commands/_fake-command/ironmoon.ts b/src/commands/_fake-command/ironmoon.ts index cb50c7e..bb4fd88 100644 --- a/src/commands/_fake-command/ironmoon.ts +++ b/src/commands/_fake-command/ironmoon.ts @@ -1,6 +1,6 @@ -import { BushCommand, type CommandMessage, type SlashMessage } from '#lib'; +import { BotCommand, type CommandMessage, type SlashMessage } from '#lib'; -export default class IronmoonCommand extends BushCommand { +export default class IronmoonCommand extends BotCommand { public constructor() { super('ironmoon', { category: 'fake-commands', diff --git a/src/commands/admin/channelPermissions.ts b/src/commands/admin/channelPermissions.ts index 0b09e54..e17a85b 100644 --- a/src/commands/admin/channelPermissions.ts +++ b/src/commands/admin/channelPermissions.ts @@ -1,6 +1,6 @@ import { Arg, - BushCommand, + BotCommand, ButtonPaginator, clientSendAndPermCheck, emojis, @@ -12,7 +12,7 @@ import { import assert from 'assert/strict'; import { ApplicationCommandOptionType, EmbedBuilder, PermissionFlagsBits } from 'discord.js'; -export default class ChannelPermissionsCommand extends BushCommand { +export default class ChannelPermissionsCommand extends BotCommand { public constructor() { super('channelPermissions', { aliases: ['channel-perms', 'cperms', 'cperm', 'chanperms', 'chanperm', 'channel-permissions'], diff --git a/src/commands/admin/roleAll.ts b/src/commands/admin/roleAll.ts index dda536f..3675891 100644 --- a/src/commands/admin/roleAll.ts +++ b/src/commands/admin/roleAll.ts @@ -1,6 +1,6 @@ import { AllowedMentions, - BushCommand, + BotCommand, clientSendAndPermCheck, emojis, type ArgType, @@ -10,7 +10,7 @@ import { import assert from 'assert/strict'; import { ApplicationCommandOptionType, PermissionFlagsBits, type GuildMember } from 'discord.js'; -export default class RoleAllCommand extends BushCommand { +export default class RoleAllCommand extends BotCommand { public constructor() { super('roleAll', { aliases: ['role-all', 'rall'], diff --git a/src/commands/config/blacklist.ts b/src/commands/config/blacklist.ts index a098f9d..5419658 100644 --- a/src/commands/config/blacklist.ts +++ b/src/commands/config/blacklist.ts @@ -2,7 +2,7 @@ import { addOrRemoveFromArray, AllowedMentions, Arg, - BushCommand, + BotCommand, clientSendAndPermCheck, emojis, format, @@ -13,7 +13,7 @@ import { import assert from 'assert/strict'; import { ApplicationCommandOptionType, GuildMember, PermissionFlagsBits, User } from 'discord.js'; -export default class BlacklistCommand extends BushCommand { +export default class BlacklistCommand extends BotCommand { public constructor() { super('blacklist', { aliases: ['blacklist', 'unblacklist'], diff --git a/src/commands/config/config.ts b/src/commands/config/config.ts index 39a44d1..a37d67c 100644 --- a/src/commands/config/config.ts +++ b/src/commands/config/config.ts @@ -1,6 +1,6 @@ import { addOrRemoveFromArray, - BushCommand, + BotCommand, clientSendAndPermCheck, colors, emojis, @@ -47,7 +47,7 @@ export type Action = typeof allActions[number]; type SlashArgType = 'ROLE' | 'STRING' | 'CHANNEL' | 'USER'; type BaseSettingTypes = 'string' | 'channel' | 'role' | 'user' | 'custom'; -export default class ConfigCommand extends BushCommand { +export default class ConfigCommand extends BotCommand { public constructor() { super('config', { aliases: ['config', 'settings', 'setting', 'configure'], diff --git a/src/commands/config/disable.ts b/src/commands/config/disable.ts index f9abb4a..a4a876c 100644 --- a/src/commands/config/disable.ts +++ b/src/commands/config/disable.ts @@ -2,7 +2,7 @@ import { addOrRemoveFromArray, AllowedMentions, Arg, - BushCommand, + BotCommand, clientSendAndPermCheck, emojis, type ArgType, @@ -15,7 +15,7 @@ import { default as Fuse } from 'fuse.js'; assert(Fuse); -export default class DisableCommand extends BushCommand { +export default class DisableCommand extends BotCommand { private static blacklistedCommands = ['eval', 'disable']; public constructor() { @@ -72,7 +72,7 @@ export default class DisableCommand extends BushCommand { let action = (args.action ?? message.util?.parsed?.alias ?? 'toggle') as 'disable' | 'enable' | 'toggle'; const global = args.global && message.author.isOwner(); const commandID = - args.command instanceof BushCommand ? args.command.id : (await Arg.cast('commandAlias', message, args.command))?.id; + args.command instanceof BotCommand ? args.command.id : (await Arg.cast('commandAlias', message, args.command))?.id; if (!commandID) return await message.util.reply(`${emojis.error} Invalid command.`); diff --git a/src/commands/config/features.ts b/src/commands/config/features.ts index 0036349..55f99bd 100644 --- a/src/commands/config/features.ts +++ b/src/commands/config/features.ts @@ -1,5 +1,5 @@ import { - BushCommand, + BotCommand, clientSendAndPermCheck, colors, emojis, @@ -20,7 +20,7 @@ import { type SelectMenuInteraction } from 'discord.js'; -export default class FeaturesCommand extends BushCommand { +export default class FeaturesCommand extends BotCommand { public constructor() { super('features', { aliases: ['features'], diff --git a/src/commands/config/log.ts b/src/commands/config/log.ts index f79f60e..f058670 100644 --- a/src/commands/config/log.ts +++ b/src/commands/config/log.ts @@ -1,5 +1,5 @@ import { - BushCommand, + BotCommand, clientSendAndPermCheck, emojis, guildLogsArr, @@ -13,7 +13,7 @@ import assert from 'assert/strict'; import { ArgumentGeneratorReturn } from 'discord-akairo'; import { ApplicationCommandOptionType, ChannelType, PermissionFlagsBits } from 'discord.js'; -export default class LogCommand extends BushCommand { +export default class LogCommand extends BotCommand { public constructor() { super('log', { aliases: ['log', 'logging'], diff --git a/src/commands/dev/__template.ts b/src/commands/dev/__template.ts index df4d146..fbb88ac 100644 --- a/src/commands/dev/__template.ts +++ b/src/commands/dev/__template.ts @@ -1,5 +1,5 @@ import { - BushCommand, + BotCommand, clientSendAndPermCheck, emojis, type ArgType, @@ -9,7 +9,7 @@ import { } from '#lib'; import { ApplicationCommandOptionType } from 'discord.js'; -export default class TemplateCommand extends BushCommand { +export default class TemplateCommand extends BotCommand { public constructor() { super('template', { aliases: ['template'], diff --git a/src/commands/dev/dm.ts b/src/commands/dev/dm.ts index c1340b1..e51651e 100644 --- a/src/commands/dev/dm.ts +++ b/src/commands/dev/dm.ts @@ -1,7 +1,7 @@ -import { BushCommand, clientSendAndPermCheck, emojis, format, type ArgType, type CommandMessage, type SlashMessage } from '#lib'; +import { BotCommand, clientSendAndPermCheck, emojis, format, type ArgType, type CommandMessage, type SlashMessage } from '#lib'; import { ApplicationCommandOptionType } from 'discord.js'; -export default class DMCommand extends BushCommand { +export default class DMCommand extends BotCommand { public constructor() { super('dm', { aliases: ['dm'], diff --git a/src/commands/dev/eval.ts b/src/commands/dev/eval.ts index dd21454..3929f99 100644 --- a/src/commands/dev/eval.ts +++ b/src/commands/dev/eval.ts @@ -2,10 +2,10 @@ import { ActivePunishment, assertAll, - BushCommand, - BushInspectOptions, + BotCommand, CodeBlockLang, colors, + CustomInspectOptions, emojis, getMethods, Global, @@ -56,9 +56,9 @@ const { transpile } = ts, /* eslint-enable @typescript-eslint/no-unused-vars */ // prettier-ignore -assertAll(ActivePunishment, BushCommand, Global, Guild, Level, ModLog, Shared, StickyRole, Snowflake_, canvas, exec, ActionRow, ButtonComponent, ButtonInteraction, Collection, Collector, CommandInteraction, ContextMenuCommandInteraction, DMChannel, Embed, Emoji, InteractionCollector, Message, Attachment, MessageCollector, OAuth2Scopes, PermissionFlagsBits, PermissionsBitField, ReactionCollector, SelectMenuComponent, path, ts, fileURLToPath, promisify, assert, transpile, sh, SnowflakeUtil, __dirname); +assertAll(ActivePunishment, BotCommand, Global, Guild, Level, ModLog, Shared, StickyRole, Snowflake_, canvas, exec, ActionRow, ButtonComponent, ButtonInteraction, Collection, Collector, CommandInteraction, ContextMenuCommandInteraction, DMChannel, Embed, Emoji, InteractionCollector, Message, Attachment, MessageCollector, OAuth2Scopes, PermissionFlagsBits, PermissionsBitField, ReactionCollector, SelectMenuComponent, path, ts, fileURLToPath, promisify, assert, transpile, sh, SnowflakeUtil, __dirname); -export default class EvalCommand extends BushCommand { +export default class EvalCommand extends BotCommand { public constructor() { super('eval', { aliases: ['eval', 'ev', 'evaluate'], @@ -316,7 +316,7 @@ export default class EvalCommand extends BushCommand { } } -type CodeBlockOptions = BushInspectOptions & { inspectStrings?: boolean }; +type CodeBlockOptions = CustomInspectOptions & { inspectStrings?: boolean }; interface CodeBlockCustomOptions extends CodeBlockOptions { prototype?: boolean; methods?: boolean; diff --git a/src/commands/dev/javascript.ts b/src/commands/dev/javascript.ts index 12ad6f7..43ccf94 100644 --- a/src/commands/dev/javascript.ts +++ b/src/commands/dev/javascript.ts @@ -1,5 +1,5 @@ import { - BushCommand, + BotCommand, clientSendAndPermCheck, colors, emojis, @@ -13,7 +13,7 @@ import { ApplicationCommandOptionType, EmbedBuilder } from 'discord.js'; import { VM } from 'vm2'; assert(VM); -export default class JavascriptCommand extends BushCommand { +export default class JavascriptCommand extends BotCommand { public constructor() { super('javascript', { aliases: ['javascript', 'js'], diff --git a/src/commands/dev/reload.ts b/src/commands/dev/reload.ts index 8125015..2d5b9d9 100644 --- a/src/commands/dev/reload.ts +++ b/src/commands/dev/reload.ts @@ -1,6 +1,6 @@ -import { BushCommand, clientSendAndPermCheck, emojis, formatError, shell, type CommandMessage, type SlashMessage } from '#lib'; +import { BotCommand, clientSendAndPermCheck, emojis, formatError, shell, type CommandMessage, type SlashMessage } from '#lib'; -export default class ReloadCommand extends BushCommand { +export default class ReloadCommand extends BotCommand { public constructor() { super('reload', { aliases: ['reload'], diff --git a/src/commands/dev/say.ts b/src/commands/dev/say.ts index c7b3c40..22ad9ba 100644 --- a/src/commands/dev/say.ts +++ b/src/commands/dev/say.ts @@ -1,7 +1,7 @@ -import { AllowedMentions, BushCommand, emojis, type ArgType, type CommandMessage, type SlashMessage } from '#lib'; +import { AllowedMentions, BotCommand, emojis, type ArgType, type CommandMessage, type SlashMessage } from '#lib'; import { ApplicationCommandOptionType } from 'discord.js'; -export default class SayCommand extends BushCommand { +export default class SayCommand extends BotCommand { public constructor() { super('say', { aliases: ['say'], diff --git a/src/commands/dev/servers.ts b/src/commands/dev/servers.ts index ab66f1c..6bba93c 100644 --- a/src/commands/dev/servers.ts +++ b/src/commands/dev/servers.ts @@ -1,5 +1,5 @@ import { - BushCommand, + BotCommand, ButtonPaginator, chunk, clientSendAndPermCheck, @@ -11,7 +11,7 @@ import { import { stripIndent } from '#tags'; import { type APIEmbed, type Guild } from 'discord.js'; -export default class ServersCommand extends BushCommand { +export default class ServersCommand extends BotCommand { public constructor() { super('servers', { aliases: ['servers', 'guilds'], diff --git a/src/commands/dev/sh.ts b/src/commands/dev/sh.ts index 56a3b69..2d2a404 100644 --- a/src/commands/dev/sh.ts +++ b/src/commands/dev/sh.ts @@ -1,4 +1,4 @@ -import { ArgType, BushCommand, colors, emojis, formatError, type CommandMessage, type SlashMessage } from '#lib'; +import { ArgType, BotCommand, colors, emojis, formatError, type CommandMessage, type SlashMessage } from '#lib'; import assert from 'assert/strict'; import chalk from 'chalk'; import { exec } from 'child_process'; @@ -15,7 +15,7 @@ const clean = (text: string | any) => { } else return text; }; -export default class ShCommand extends BushCommand { +export default class ShCommand extends BotCommand { public constructor() { super('sh', { aliases: ['sh', 'shell', 'cmd'], diff --git a/src/commands/dev/superUser.ts b/src/commands/dev/superUser.ts index 24e8c9a..6a034bc 100644 --- a/src/commands/dev/superUser.ts +++ b/src/commands/dev/superUser.ts @@ -1,7 +1,7 @@ -import { BushCommand, clientSendAndPermCheck, emojis, format, type ArgType, type CommandMessage } from '#lib'; +import { BotCommand, clientSendAndPermCheck, emojis, format, type ArgType, type CommandMessage } from '#lib'; import { type ArgumentGeneratorReturn, type ArgumentTypeCasterReturn } from 'discord-akairo'; -export default class SuperUserCommand extends BushCommand { +export default class SuperUserCommand extends BotCommand { public constructor() { super('superUser', { aliases: ['super-user', 'su'], diff --git a/src/commands/dev/syncAutomod.ts b/src/commands/dev/syncAutomod.ts index d0fc5e5..7a0fb58 100644 --- a/src/commands/dev/syncAutomod.ts +++ b/src/commands/dev/syncAutomod.ts @@ -1,8 +1,8 @@ -import { BushCommand, clientSendAndPermCheck, emojis, Shared, type CommandMessage, type SlashMessage } from '#lib'; +import { BotCommand, clientSendAndPermCheck, emojis, Shared, type CommandMessage, type SlashMessage } from '#lib'; import typescript from 'typescript'; import { NodeVM } from 'vm2'; -export default class SyncAutomodCommand extends BushCommand { +export default class SyncAutomodCommand extends BotCommand { public constructor() { super('syncAutomod', { aliases: ['sync-automod'], diff --git a/src/commands/dev/test.ts b/src/commands/dev/test.ts index 0606497..cc32657 100644 --- a/src/commands/dev/test.ts +++ b/src/commands/dev/test.ts @@ -1,5 +1,5 @@ import { - BushCommand, + BotCommand, ButtonPaginator, clientSendAndPermCheck, colors, @@ -22,7 +22,7 @@ import badLinksSecretArray from '../../../lib/badlinks-secret.js'; import badLinksArray from '../../../lib/badlinks.js'; import badWords from '../../../lib/badwords.js'; -export default class TestCommand extends BushCommand { +export default class TestCommand extends BotCommand { public constructor() { super('test', { aliases: ['test'], diff --git a/src/commands/fun/coinFlip.ts b/src/commands/fun/coinFlip.ts index 3adf7f2..66b6016 100644 --- a/src/commands/fun/coinFlip.ts +++ b/src/commands/fun/coinFlip.ts @@ -1,6 +1,6 @@ -import { BushCommand, clientSendAndPermCheck, type CommandMessage, type SlashMessage } from '#lib'; +import { BotCommand, clientSendAndPermCheck, type CommandMessage, type SlashMessage } from '#lib'; -export default class CoinFlipCommand extends BushCommand { +export default class CoinFlipCommand extends BotCommand { public constructor() { super('coinFlip', { aliases: ['coin-flip', 'cf'], diff --git a/src/commands/fun/dice.ts b/src/commands/fun/dice.ts index e7e5927..5941564 100644 --- a/src/commands/fun/dice.ts +++ b/src/commands/fun/dice.ts @@ -1,6 +1,6 @@ -import { BushCommand, clientSendAndPermCheck, type CommandMessage, type SlashMessage } from '#lib'; +import { BotCommand, clientSendAndPermCheck, type CommandMessage, type SlashMessage } from '#lib'; -export default class DiceCommand extends BushCommand { +export default class DiceCommand extends BotCommand { public constructor() { super('dice', { aliases: ['dice', 'die'], diff --git a/src/commands/fun/eightBall.ts b/src/commands/fun/eightBall.ts index eb5aee8..be9c7b5 100644 --- a/src/commands/fun/eightBall.ts +++ b/src/commands/fun/eightBall.ts @@ -1,7 +1,7 @@ -import { BushCommand, clientSendAndPermCheck, type CommandMessage, type SlashMessage } from '#lib'; +import { BotCommand, clientSendAndPermCheck, type CommandMessage, type SlashMessage } from '#lib'; import { ApplicationCommandOptionType } from 'discord.js'; -export default class EightBallCommand extends BushCommand { +export default class EightBallCommand extends BotCommand { public constructor() { super('eightBall', { aliases: ['eightball', '8ball'], diff --git a/src/commands/fun/minesweeper.ts b/src/commands/fun/minesweeper.ts index f2db6ee..ec21b11 100644 --- a/src/commands/fun/minesweeper.ts +++ b/src/commands/fun/minesweeper.ts @@ -1,5 +1,5 @@ import { - BushCommand, + BotCommand, clientSendAndPermCheck, emojis, OptArgType, @@ -12,7 +12,7 @@ import assert from 'assert/strict'; import { ApplicationCommandOptionType } from 'discord.js'; assert(Minesweeper); -export default class MinesweeperCommand extends BushCommand { +export default class MinesweeperCommand extends BotCommand { public constructor() { super('minesweeper', { aliases: ['minesweeper'], diff --git a/src/commands/info/avatar.ts b/src/commands/info/avatar.ts index 3eae98c..b97364f 100644 --- a/src/commands/info/avatar.ts +++ b/src/commands/info/avatar.ts @@ -1,7 +1,7 @@ -import { Arg, BushCommand, clientSendAndPermCheck, colors, type CommandMessage, type OptArgType, type SlashMessage } from '#lib'; +import { Arg, BotCommand, clientSendAndPermCheck, colors, type CommandMessage, type OptArgType, type SlashMessage } from '#lib'; import { ApplicationCommandOptionType, EmbedBuilder, GuildMember, PermissionFlagsBits } from 'discord.js'; -export default class AvatarCommand extends BushCommand { +export default class AvatarCommand extends BotCommand { public constructor() { super('avatar', { aliases: ['avatar', 'av'], diff --git a/src/commands/info/botInfo.ts b/src/commands/info/botInfo.ts index d84fd4e..64ecf1d 100644 --- a/src/commands/info/botInfo.ts +++ b/src/commands/info/botInfo.ts @@ -1,5 +1,5 @@ import { - BushCommand, + BotCommand, clientSendAndPermCheck, colors, humanizeDuration, @@ -14,7 +14,7 @@ const { default: prettyBytes } = await import('pretty-bytes'); assert(prettyBytes); assert(os); -export default class BotInfoCommand extends BushCommand { +export default class BotInfoCommand extends BotCommand { public constructor() { super('botInfo', { aliases: ['bot-info', 'stats'], diff --git a/src/commands/info/color.ts b/src/commands/info/color.ts index 7601562..c139e1a 100644 --- a/src/commands/info/color.ts +++ b/src/commands/info/color.ts @@ -1,7 +1,7 @@ import { AllowedMentions, Arg, - BushCommand, + BotCommand, clientSendAndPermCheck, emojis, type ArgType, @@ -13,7 +13,7 @@ import { ApplicationCommandOptionType, EmbedBuilder, GuildMember, PermissionFlag import tinycolor from 'tinycolor2'; assert(tinycolor); -export default class ColorCommand extends BushCommand { +export default class ColorCommand extends BotCommand { public constructor() { super('color', { aliases: ['color'], diff --git a/src/commands/info/guildInfo.ts b/src/commands/info/guildInfo.ts index e67cdf4..97e4be3 100644 --- a/src/commands/info/guildInfo.ts +++ b/src/commands/info/guildInfo.ts @@ -1,7 +1,7 @@ import { akairo, Arg, - BushCommand, + BotCommand, clientSendAndPermCheck, colors, emojis, @@ -31,7 +31,7 @@ import { type Vanity } from 'discord.js'; -export default class GuildInfoCommand extends BushCommand { +export default class GuildInfoCommand extends BotCommand { public constructor() { super('guildInfo', { aliases: ['guild-info', 'serverinfo', 'guild', 'server', 'g'], @@ -222,9 +222,9 @@ export default class GuildInfoCommand extends BushCommand { const guildSecurity: string[] = []; guildSecurity.push( - `**Verification Level:** ${BushGuildVerificationLevel[guild.verificationLevel]}`, - `**Explicit Content Filter:** ${BushGuildExplicitContentFilter[guild.explicitContentFilter]}`, - `**Default Message Notifications:** ${BushGuildDefaultMessageNotifications[guild.defaultMessageNotifications]}`, + `**Verification Level:** ${MappedGuildVerificationLevel[guild.verificationLevel]}`, + `**Explicit Content Filter:** ${MappedGuildExplicitContentFilter[guild.explicitContentFilter]}`, + `**Default Message Notifications:** ${MappedGuildDefaultMessageNotifications[guild.defaultMessageNotifications]}`, `**2FA Required:** ${guild.mfaLevel === GuildMFALevel.Elevated ? 'True' : 'False'}` ); @@ -248,7 +248,7 @@ type RTCRegion = | 'india' | 'automatic'; -enum BushGuildVerificationLevel { +enum MappedGuildVerificationLevel { 'None' = GuildVerificationLevel.None, 'Low' = GuildVerificationLevel.Low, 'Medium' = GuildVerificationLevel.Medium, @@ -256,13 +256,13 @@ enum BushGuildVerificationLevel { 'Very High' = GuildVerificationLevel.VeryHigh } -enum BushGuildExplicitContentFilter { +enum MappedGuildExplicitContentFilter { 'Disabled' = GuildExplicitContentFilter.Disabled, 'Members Without Roles' = GuildExplicitContentFilter.MembersWithoutRoles, 'All Members' = GuildExplicitContentFilter.AllMembers } -enum BushGuildDefaultMessageNotifications { +enum MappedGuildDefaultMessageNotifications { 'All Messages' = GuildDefaultMessageNotifications.AllMessages, 'Only Mentions' = GuildDefaultMessageNotifications.OnlyMentions } diff --git a/src/commands/info/help.ts b/src/commands/info/help.ts index 70c8f20..6460b99 100644 --- a/src/commands/info/help.ts +++ b/src/commands/info/help.ts @@ -1,5 +1,5 @@ import { - BushCommand, + BotCommand, clientSendAndPermCheck, colors, format, @@ -26,7 +26,7 @@ import packageDotJSON from '../../../package.json' assert { type: 'json' }; assert(Fuse); assert(packageDotJSON); -export default class HelpCommand extends BushCommand { +export default class HelpCommand extends BotCommand { public constructor() { super('help', { aliases: ['help'], @@ -109,7 +109,7 @@ export default class HelpCommand extends BushCommand { return message.util.reply({ embeds: [embed], components: row.components.length ? [row] : undefined }); } - private helpIndividual(message: CommandMessage | SlashMessage, row: ActionRowBuilder<ButtonBuilder>, command: BushCommand) { + private helpIndividual(message: CommandMessage | SlashMessage, row: ActionRowBuilder<ButtonBuilder>, command: BotCommand) { const embed = new EmbedBuilder().setColor(colors.default).setTitle(`${command.id} Command`); let description = `${command.description ?? '*This command does not have a description.*'}`; @@ -127,7 +127,7 @@ export default class HelpCommand extends BushCommand { return message.util.reply(params); } - private addCommandUsage(embed: EmbedBuilder, command: BushCommand): void { + private addCommandUsage(embed: EmbedBuilder, command: BotCommand): void { if (command.usage?.length) { embed.addFields({ name: `» Usage${command.usage.length > 1 ? 's' : ''}`, @@ -136,7 +136,7 @@ export default class HelpCommand extends BushCommand { } } - private addCommandExamples(embed: EmbedBuilder, command: BushCommand): void { + private addCommandExamples(embed: EmbedBuilder, command: BotCommand): void { if (command.examples?.length) { embed.addFields({ name: `» Example${command.examples.length > 1 ? 's' : ''}`, @@ -145,7 +145,7 @@ export default class HelpCommand extends BushCommand { } } - private addCommandAliases(embed: EmbedBuilder, command: BushCommand): void { + private addCommandAliases(embed: EmbedBuilder, command: BotCommand): void { if (command.aliases?.length > 1) embed.addFields({ name: '» Aliases', @@ -153,7 +153,7 @@ export default class HelpCommand extends BushCommand { }); } - private addCommandArguments(embed: EmbedBuilder, command: BushCommand, isOwner = false, isSuperUser = false): void { + private addCommandArguments(embed: EmbedBuilder, command: BotCommand, isOwner = false, isSuperUser = false): void { const format = (id: string, req: boolean) => `${req ? '<' : '['}${id}${req ? '>' : ']'}`; const args = (command.argsInfo ?? []).filter((arg) => { if (arg.ownerOnly && !isOwner) return false; @@ -182,7 +182,7 @@ export default class HelpCommand extends BushCommand { } } - private addCommandRestrictions(embed: EmbedBuilder, command: BushCommand): void { + private addCommandRestrictions(embed: EmbedBuilder, command: BotCommand): void { if ( command.ownerOnly || command.superUserOnly || diff --git a/src/commands/info/icon.ts b/src/commands/info/icon.ts index b3434ec..71f02f9 100644 --- a/src/commands/info/icon.ts +++ b/src/commands/info/icon.ts @@ -1,8 +1,8 @@ -import { BushCommand, clientSendAndPermCheck, colors, type CommandMessage, type SlashMessage } from '#lib'; +import { BotCommand, clientSendAndPermCheck, colors, type CommandMessage, type SlashMessage } from '#lib'; import assert from 'assert/strict'; import { EmbedBuilder, escapeMarkdown, PermissionFlagsBits } from 'discord.js'; -export default class IconCommand extends BushCommand { +export default class IconCommand extends BotCommand { public constructor() { super('icon', { aliases: ['icon', 'guildavatar', 'severicon', 'guildicon'], diff --git a/src/commands/info/inviteInfo.ts b/src/commands/info/inviteInfo.ts index 5df86ad..590bf16 100644 --- a/src/commands/info/inviteInfo.ts +++ b/src/commands/info/inviteInfo.ts @@ -1,7 +1,7 @@ -import { Arg, ArgType, BushCommand, clientSendAndPermCheck, colors, type CommandMessage, type SlashMessage } from '#lib'; +import { Arg, ArgType, BotCommand, clientSendAndPermCheck, colors, type CommandMessage, type SlashMessage } from '#lib'; import { ApplicationCommandOptionType, EmbedBuilder, Invite, PermissionFlagsBits } from 'discord.js'; -export default class InviteInfoCommand extends BushCommand { +export default class InviteInfoCommand extends BotCommand { public constructor() { super('inviteInfo', { aliases: ['invite-info', 'ii'], diff --git a/src/commands/info/links.ts b/src/commands/info/links.ts index 8003c65..ecc09c8 100644 --- a/src/commands/info/links.ts +++ b/src/commands/info/links.ts @@ -1,11 +1,11 @@ -import { BushCommand, clientSendAndPermCheck, invite, type CommandMessage, type SlashMessage } from '#lib'; +import { BotCommand, clientSendAndPermCheck, invite, type CommandMessage, type SlashMessage } from '#lib'; import assert from 'assert/strict'; import { ActionRowBuilder, ButtonBuilder, ButtonStyle } from 'discord.js'; import packageDotJSON from '../../../package.json' assert { type: 'json' }; assert(packageDotJSON); -export default class LinksCommand extends BushCommand { +export default class LinksCommand extends BotCommand { public constructor() { super('links', { aliases: ['links', 'invite', 'inv', 'support', 'github', 'source', 'oss'], diff --git a/src/commands/info/ping.ts b/src/commands/info/ping.ts index 484c010..91bec1d 100644 --- a/src/commands/info/ping.ts +++ b/src/commands/info/ping.ts @@ -1,7 +1,7 @@ -import { BushCommand, clientSendAndPermCheck, colors, format, type CommandMessage, type SlashMessage } from '#lib'; +import { BotCommand, clientSendAndPermCheck, colors, format, type CommandMessage, type SlashMessage } from '#lib'; import { EmbedBuilder, PermissionFlagsBits, type Message } from 'discord.js'; -export default class PingCommand extends BushCommand { +export default class PingCommand extends BotCommand { public constructor() { super('ping', { aliases: ['ping'], diff --git a/src/commands/info/pronouns.ts b/src/commands/info/pronouns.ts index 0063f4c..47061fc 100644 --- a/src/commands/info/pronouns.ts +++ b/src/commands/info/pronouns.ts @@ -1,6 +1,6 @@ import { AllowedMentions, - BushCommand, + BotCommand, clientSendAndPermCheck, type CommandMessage, type OptArgType, @@ -8,7 +8,7 @@ import { } from '#lib'; import { ApplicationCommandOptionType, EmbedBuilder, escapeMarkdown, PermissionFlagsBits } from 'discord.js'; -export default class PronounsCommand extends BushCommand { +export default class PronounsCommand extends BotCommand { public constructor() { super('pronouns', { aliases: ['pronouns', 'pronoun'], diff --git a/src/commands/info/snowflake.ts b/src/commands/info/snowflake.ts index f30330a..deaf41c 100644 --- a/src/commands/info/snowflake.ts +++ b/src/commands/info/snowflake.ts @@ -1,5 +1,5 @@ import { - BushCommand, + BotCommand, clientSendAndPermCheck, colors, timestamp, @@ -19,7 +19,7 @@ import { type Snowflake } from 'discord.js'; -export default class SnowflakeCommand extends BushCommand { +export default class SnowflakeCommand extends BotCommand { public constructor() { super('snowflake', { aliases: ['snowflake', 'info', 'sf'], @@ -50,7 +50,7 @@ export default class SnowflakeCommand extends BushCommand { // Channel if (this.client.channels.cache.has(snowflake)) { const channel = this.client.channels.resolve(snowflake)!; - const channelInfo = [`**Type:** ${BushChannelType[channel.type] ?? ChannelType[channel.type]}`]; + const channelInfo = [`**Type:** ${MappedChannelType[channel.type] ?? ChannelType[channel.type]}`]; if (channel.type === ChannelType.DM) { channelInfo.push( `**Recipient:** ${escapeMarkdown(channel.recipient?.tag ?? '¯\\_(ツ)_/¯')} (${channel.recipient?.id ?? '¯\\_(ツ)_/¯'})` @@ -136,7 +136,7 @@ export default class SnowflakeCommand extends BushCommand { } } -enum BushChannelType { +enum MappedChannelType { 'Text' = 0, 'DM' = 1, 'Voice' = 2, diff --git a/src/commands/info/userInfo.ts b/src/commands/info/userInfo.ts index 1f139b5..52875ef 100644 --- a/src/commands/info/userInfo.ts +++ b/src/commands/info/userInfo.ts @@ -1,7 +1,7 @@ import { Arg, + BotCommand, bots, - BushCommand, clientSendAndPermCheck, colors, emojis, @@ -30,7 +30,7 @@ import { type User } from 'discord.js'; -export default class UserInfoCommand extends BushCommand { +export default class UserInfoCommand extends BotCommand { public constructor() { super('userInfo', { aliases: ['user-info', 'user', 'u'], diff --git a/src/commands/leveling/leaderboard.ts b/src/commands/leveling/leaderboard.ts index bb41a12..109f398 100644 --- a/src/commands/leveling/leaderboard.ts +++ b/src/commands/leveling/leaderboard.ts @@ -1,5 +1,5 @@ import { - BushCommand, + BotCommand, ButtonPaginator, chunk, clientSendAndPermCheck, @@ -12,7 +12,7 @@ import { import assert from 'assert/strict'; import { ApplicationCommandOptionType, EmbedBuilder, PermissionFlagsBits } from 'discord.js'; -export default class LeaderboardCommand extends BushCommand { +export default class LeaderboardCommand extends BotCommand { public constructor() { super('leaderboard', { aliases: ['leaderboard', 'lb'], diff --git a/src/commands/leveling/level.ts b/src/commands/leveling/level.ts index ea2a724..2547b06 100644 --- a/src/commands/leveling/level.ts +++ b/src/commands/leveling/level.ts @@ -1,6 +1,6 @@ import { AllowedMentions, - BushCommand, + BotCommand, CanvasProgressBar, clientSendAndPermCheck, emojis, @@ -16,7 +16,7 @@ import { ApplicationCommandOptionType, AttachmentBuilder, Guild, PermissionFlags assert(canvas); assert(SimplifyNumber); -export default class LevelCommand extends BushCommand { +export default class LevelCommand extends BotCommand { public constructor() { super('level', { aliases: ['level', 'rank', 'lvl'], diff --git a/src/commands/leveling/levelRoles.ts b/src/commands/leveling/levelRoles.ts index 312623c..4973b01 100644 --- a/src/commands/leveling/levelRoles.ts +++ b/src/commands/leveling/levelRoles.ts @@ -1,6 +1,6 @@ import { AllowedMentions, - BushCommand, + BotCommand, clientSendAndPermCheck, emojis, type ArgType, @@ -11,7 +11,7 @@ import { import assert from 'assert/strict'; import { ApplicationCommandOptionType, PermissionFlagsBits } from 'discord.js'; -export default class LevelRolesCommand extends BushCommand { +export default class LevelRolesCommand extends BotCommand { public constructor() { super('levelRole', { aliases: ['level-role', 'level-roles', 'lr'], diff --git a/src/commands/leveling/setLevel.ts b/src/commands/leveling/setLevel.ts index 8dc1cdf..cd30978 100644 --- a/src/commands/leveling/setLevel.ts +++ b/src/commands/leveling/setLevel.ts @@ -1,6 +1,6 @@ import { AllowedMentions, - BushCommand, + BotCommand, clientSendAndPermCheck, emojis, format, @@ -12,7 +12,7 @@ import { import assert from 'assert/strict'; import { ApplicationCommandOptionType, PermissionFlagsBits } from 'discord.js'; -export default class SetLevelCommand extends BushCommand { +export default class SetLevelCommand extends BotCommand { public constructor() { super('setLevel', { aliases: ['set-level'], diff --git a/src/commands/leveling/setXp.ts b/src/commands/leveling/setXp.ts index 5cd3a61..23f4463 100644 --- a/src/commands/leveling/setXp.ts +++ b/src/commands/leveling/setXp.ts @@ -1,6 +1,6 @@ import { AllowedMentions, - BushCommand, + BotCommand, clientSendAndPermCheck, emojis, format, @@ -12,7 +12,7 @@ import { import assert from 'assert/strict'; import { ApplicationCommandOptionType, PermissionFlagsBits } from 'discord.js'; -export default class SetXpCommand extends BushCommand { +export default class SetXpCommand extends BotCommand { public constructor() { super('setXp', { aliases: ['set-xp'], diff --git a/src/commands/moderation/_activePunishments.ts b/src/commands/moderation/_activePunishments.ts index 06e33f2..4ded902 100644 --- a/src/commands/moderation/_activePunishments.ts +++ b/src/commands/moderation/_activePunishments.ts @@ -1,6 +1,6 @@ // import { -// BushCommand, // clientSendAndPermCheck, +// CustomCommand, // emojis, // ModLog, // ModLogModel, @@ -14,7 +14,7 @@ // const punishmentTypes = ['ban', 'kick', 'mute', 'warn', 'role'] as const; -// export default class ActivePunishmentsCommand extends BushCommand { +// export default class ActivePunishmentsCommand extends CustomCommand { // public constructor() { // super('activePunishments', { // aliases: ['active-punishments', 'ap'], diff --git a/src/commands/moderation/ban.ts b/src/commands/moderation/ban.ts index 00fde01..fdb8033 100644 --- a/src/commands/moderation/ban.ts +++ b/src/commands/moderation/ban.ts @@ -2,7 +2,7 @@ import { AllowedMentions, Arg, banResponse, - BushCommand, + BotCommand, castDurationContent, emojis, format, @@ -16,7 +16,7 @@ import { import assert from 'assert/strict'; import { ApplicationCommandOptionType, PermissionFlagsBits, type User } from 'discord.js'; -export default class BanCommand extends BushCommand { +export default class BanCommand extends BotCommand { public constructor() { super('ban', { aliases: ['ban', 'force-ban', 'dban'], @@ -108,7 +108,7 @@ export default class BanCommand extends BushCommand { const opts = { reason: content, moderator: message.member, duration: duration, deleteDays: args.days }; - const responseCode = member ? await member.bushBan(opts) : await message.guild.bushBan({ user, ...opts }); + const responseCode = member ? await member.customBan(opts) : await message.guild.customBan({ user, ...opts }); return await message.util.reply({ content: BanCommand.formatCode(user, responseCode), diff --git a/src/commands/moderation/block.ts b/src/commands/moderation/block.ts index 00a1996..a3f7bc1 100644 --- a/src/commands/moderation/block.ts +++ b/src/commands/moderation/block.ts @@ -1,7 +1,7 @@ import { AllowedMentions, blockResponse, - BushCommand, + BotCommand, castDurationContent, clientSendAndPermCheck, emojis, @@ -17,7 +17,7 @@ import { import assert from 'assert/strict'; import { ApplicationCommandOptionType, PermissionFlagsBits, type GuildMember } from 'discord.js'; -export default class BlockCommand extends BushCommand { +export default class BlockCommand extends BotCommand { public constructor() { super('block', { aliases: ['block'], @@ -91,7 +91,7 @@ export default class BlockCommand extends BushCommand { return message.util.reply(canModerateResponse); } - const responseCode = await member.bushBlock({ + const responseCode = await member.customBlock({ reason: content, moderator: message.member, duration: duration, diff --git a/src/commands/moderation/evidence.ts b/src/commands/moderation/evidence.ts index d36000f..bc4cdb2 100644 --- a/src/commands/moderation/evidence.ts +++ b/src/commands/moderation/evidence.ts @@ -1,11 +1,12 @@ import { - BushCommand, + BotCommand, clientSendAndPermCheck, emojis, format, ModLog, OptArgType, regex, + TanzaniteEvent, userGuildPermCheck, type ArgType, type CommandMessage, @@ -15,7 +16,7 @@ import assert from 'assert/strict'; import { Argument, ArgumentGeneratorReturn } from 'discord-akairo'; import { ApplicationCommandOptionType, PermissionFlagsBits, type Message } from 'discord.js'; -export default class EvidenceCommand extends BushCommand { +export default class EvidenceCommand extends BotCommand { public constructor() { super('evidence', { aliases: ['evidence'], @@ -122,7 +123,7 @@ export default class EvidenceCommand extends BushCommand { entry.evidence = _evidence.trim(); await entry.save(); - this.client.emit('bushUpdateModlog', message.member!, entry.id, 'evidence', oldEntry, entry.evidence); + this.client.emit(TanzaniteEvent.UpdateModlog, message.member!, entry.id, 'evidence', oldEntry, entry.evidence); return message.util.reply(`${emojis.success} Successfully updated the evidence for case ${format.input(entry.id)}.`); } diff --git a/src/commands/moderation/hideCase.ts b/src/commands/moderation/hideCase.ts index 9bd1d24..ca87ea5 100644 --- a/src/commands/moderation/hideCase.ts +++ b/src/commands/moderation/hideCase.ts @@ -1,9 +1,10 @@ import { - BushCommand, + BotCommand, clientSendAndPermCheck, emojis, format, ModLog, + TanzaniteEvent, userGuildPermCheck, type CommandMessage, type SlashMessage @@ -11,7 +12,7 @@ import { import assert from 'assert/strict'; import { ApplicationCommandOptionType, PermissionFlagsBits } from 'discord.js'; -export default class HideCaseCommand extends BushCommand { +export default class HideCaseCommand extends BotCommand { public constructor() { super('hideCase', { aliases: ['hide-case', 'hide_case', 'show-case', 'show_case', 'cover-up-mod-abuse', 'cover_up_mod_abuse'], @@ -47,7 +48,7 @@ export default class HideCaseCommand extends BushCommand { entry.hidden = !entry.hidden; await entry.save(); - this.client.emit('bushUpdateModlog', message.member!, entry.id, 'hidden', oldEntry, entry.hidden); + this.client.emit(TanzaniteEvent.UpdateModlog, message.member!, entry.id, 'hidden', oldEntry, entry.hidden); return await message.util.reply(`${emojis.success} CaseID ${format.input(caseID)} is ${action}.`); } diff --git a/src/commands/moderation/kick.ts b/src/commands/moderation/kick.ts index 7807166..a5938f8 100644 --- a/src/commands/moderation/kick.ts +++ b/src/commands/moderation/kick.ts @@ -1,6 +1,6 @@ import { AllowedMentions, - BushCommand, + BotCommand, clientSendAndPermCheck, emojis, format, @@ -15,7 +15,7 @@ import { import assert from 'assert/strict'; import { ApplicationCommandOptionType, PermissionFlagsBits, type GuildMember } from 'discord.js'; -export default class KickCommand extends BushCommand { +export default class KickCommand extends BotCommand { public constructor() { super('kick', { aliases: ['kick'], @@ -77,7 +77,7 @@ export default class KickCommand extends BushCommand { return message.util.reply(canModerateResponse); } - const responseCode = await member.bushKick({ + const responseCode = await member.customKick({ reason, moderator: message.member }); diff --git a/src/commands/moderation/lockdown.ts b/src/commands/moderation/lockdown.ts index 0561767..57f9caf 100644 --- a/src/commands/moderation/lockdown.ts +++ b/src/commands/moderation/lockdown.ts @@ -1,6 +1,6 @@ import { AllowedMentions, - BushCommand, + BotCommand, clientSendAndPermCheck, colors, ConfirmationPrompt, @@ -23,7 +23,7 @@ import { VoiceChannel } from 'discord.js'; -export default class LockdownCommand extends BushCommand { +export default class LockdownCommand extends BotCommand { public constructor() { super('lockdown', { aliases: ['lockdown', 'lock'], diff --git a/src/commands/moderation/massBan.ts b/src/commands/moderation/massBan.ts index db50c44..4ba4f47 100644 --- a/src/commands/moderation/massBan.ts +++ b/src/commands/moderation/massBan.ts @@ -2,12 +2,13 @@ import { Arg, BanResponse, banResponse, - BushCommand, + BotCommand, clientSendAndPermCheck, colors, emojis, overflowEmbed, regex, + TanzaniteEvent, type ArgType, type CommandMessage, type OptArgType, @@ -16,7 +17,7 @@ import { import assert from 'assert/strict'; import { ApplicationCommandOptionType, Collection, PermissionFlagsBits } from 'discord.js'; -export default class MassBanCommand extends BushCommand { +export default class MassBanCommand extends BotCommand { public constructor() { super('massBan', { aliases: ['mass-ban', 'mass-dban'], @@ -96,7 +97,13 @@ export default class MassBanCommand extends BushCommand { const res = await Promise.all(promises); const map = new Collection(res.map((r, i) => [ids[i], r])); - this.client.emit('massBan', message.member!, message.guild!, args.reason ? args.reason.trim() : 'No reason provided.', map); + this.client.emit( + TanzaniteEvent.MassBan, + message.member!, + message.guild!, + args.reason ? args.reason.trim() : 'No reason provided.', + map + ); const success = (res: BanResponse): boolean => [banResponse.SUCCESS, banResponse.DM_ERROR].includes(res as any); diff --git a/src/commands/moderation/massEvidence.ts b/src/commands/moderation/massEvidence.ts index cecf273..b44060e 100644 --- a/src/commands/moderation/massEvidence.ts +++ b/src/commands/moderation/massEvidence.ts @@ -1,11 +1,12 @@ import { - BushCommand, + BotCommand, clientSendAndPermCheck, colors, emojis, ModLog, overflowEmbed, regex, + TanzaniteEvent, type ArgType, type CommandMessage, type OptArgType, @@ -15,7 +16,7 @@ import assert from 'assert/strict'; import { ApplicationCommandOptionType, PermissionFlagsBits } from 'discord.js'; import EvidenceCommand from './evidence.js'; -export default class MassEvidenceCommand extends BushCommand { +export default class MassEvidenceCommand extends BotCommand { public constructor() { super('massEvidence', { aliases: ['mass-evidence'], @@ -93,7 +94,7 @@ export default class MassEvidenceCommand extends BushCommand { return `${emojis.success} ${id} - ${case_.id}`; }); - this.client.emit('massEvidence', message.member!, message.guild, evidence, lines); + this.client.emit(TanzaniteEvent.MassEvidence, message.member!, message.guild, evidence, lines); const embeds = overflowEmbed( { diff --git a/src/commands/moderation/modlog.ts b/src/commands/moderation/modlog.ts index 527ba36..08e5397 100644 --- a/src/commands/moderation/modlog.ts +++ b/src/commands/moderation/modlog.ts @@ -1,6 +1,6 @@ import { Arg, - BushCommand, + BotCommand, ButtonPaginator, chunk, clientSendAndPermCheck, @@ -17,7 +17,7 @@ import { import assert from 'assert/strict'; import { ApplicationCommandOptionType, escapeMarkdown, PermissionFlagsBits, User } from 'discord.js'; -export default class ModlogCommand extends BushCommand { +export default class ModlogCommand extends BotCommand { public static separator = '\n━━━━━━━━━━━━━━━\n'; public constructor() { diff --git a/src/commands/moderation/mute.ts b/src/commands/moderation/mute.ts index 4627f2c..debcf03 100644 --- a/src/commands/moderation/mute.ts +++ b/src/commands/moderation/mute.ts @@ -1,6 +1,6 @@ import { AllowedMentions, - BushCommand, + BotCommand, castDurationContent, clientSendAndPermCheck, emojis, @@ -17,7 +17,7 @@ import { import assert from 'assert/strict'; import { ApplicationCommandOptionType, PermissionFlagsBits, type GuildMember } from 'discord.js'; -export default class MuteCommand extends BushCommand { +export default class MuteCommand extends BotCommand { public constructor() { super('mute', { aliases: ['mute'], @@ -86,7 +86,7 @@ export default class MuteCommand extends BushCommand { return message.util.reply(canModerateResponse); } - const responseCode = await member.bushMute({ + const responseCode = await member.customMute({ reason: content, moderator: message.member, duration diff --git a/src/commands/moderation/myLogs.ts b/src/commands/moderation/myLogs.ts index c1cc448..34ab8e0 100644 --- a/src/commands/moderation/myLogs.ts +++ b/src/commands/moderation/myLogs.ts @@ -1,5 +1,5 @@ import { - BushCommand, + BotCommand, ButtonPaginator, chunk, clientSendAndPermCheck, @@ -14,7 +14,7 @@ import { import { ApplicationCommandOptionType } from 'discord.js'; import { input, sanitizeInputForDiscord } from '../../../lib/utils/Format.js'; import ModlogCommand from './modlog.js'; -export default class MyLogsCommand extends BushCommand { +export default class MyLogsCommand extends BotCommand { public constructor() { super('myLogs', { aliases: ['my-logs', 'my-log', 'my-modlogs', 'my-modlog'], diff --git a/src/commands/moderation/purge.ts b/src/commands/moderation/purge.ts index 383c439..106f394 100644 --- a/src/commands/moderation/purge.ts +++ b/src/commands/moderation/purge.ts @@ -1,9 +1,10 @@ import { Arg, - BushCommand, + BotCommand, clientSendAndPermCheck, emojis, OptArgType, + TanzaniteEvent, type ArgType, type CommandMessage, type SlashMessage @@ -11,7 +12,7 @@ import { import assert from 'assert/strict'; import { ApplicationCommandOptionType, Collection, PermissionFlagsBits, type Message } from 'discord.js'; -export default class PurgeCommand extends BushCommand { +export default class PurgeCommand extends BotCommand { public constructor() { super('purge', { aliases: ['purge', 'clear'], @@ -83,7 +84,7 @@ export default class PurgeCommand extends BushCommand { const purged = await message.channel!.bulkDelete(messages, true).catch(() => null); if (!purged) return message.util.reply(`${emojis.error} Failed to purge messages.`).catch(() => null); else { - this.client.emit('bushPurge', message.author, message.guild, message.channel!, messages); + this.client.emit(TanzaniteEvent.Purge, message.author, message.guild, message.channel!, messages); await message.util.send(`${emojis.success} Successfully purged **${purged.size}** messages.`); /* .then(async (purgeMessage) => { if (!message.util.isSlashMessage(message)) { diff --git a/src/commands/moderation/removeReactionEmoji.ts b/src/commands/moderation/removeReactionEmoji.ts index cc3713c..5baeffc 100644 --- a/src/commands/moderation/removeReactionEmoji.ts +++ b/src/commands/moderation/removeReactionEmoji.ts @@ -1,6 +1,6 @@ import { Arg, - BushCommand, + BotCommand, clientSendAndPermCheck, emojis, format, @@ -11,7 +11,7 @@ import { import assert from 'assert/strict'; import { ApplicationCommandOptionType, Message, PermissionFlagsBits } from 'discord.js'; -export default class RemoveReactionEmojiCommand extends BushCommand { +export default class RemoveReactionEmojiCommand extends BotCommand { public constructor() { super('removeReactionEmoji', { aliases: ['remove-reaction-emoji', 'rre'], diff --git a/src/commands/moderation/role.ts b/src/commands/moderation/role.ts index 5251be7..6b874da 100644 --- a/src/commands/moderation/role.ts +++ b/src/commands/moderation/role.ts @@ -1,7 +1,7 @@ import { addRoleResponse, AllowedMentions, - BushCommand, + BotCommand, clientSendAndPermCheck, emojis, format, @@ -17,7 +17,7 @@ import assert from 'assert/strict'; import { type ArgumentGeneratorReturn } from 'discord-akairo'; import { ApplicationCommandOptionType, PermissionFlagsBits, type Snowflake } from 'discord.js'; -export default class RoleCommand extends BushCommand { +export default class RoleCommand extends BotCommand { public constructor() { super('role', { aliases: ['role', 'rr', 'ar', 'ra'], @@ -169,7 +169,7 @@ export default class RoleCommand extends BushCommand { const shouldLog = this.punishmentRoleNames.includes(args.role.name); - const responseCode = await args.member[`bush${args.action === 'add' ? 'Add' : 'Remove'}Role`]({ + const responseCode = await args.member[`custom${args.action === 'add' ? 'Add' : 'Remove'}Role`]({ moderator: message.member!, addToModlog: shouldLog, role: args.role, diff --git a/src/commands/moderation/slowmode.ts b/src/commands/moderation/slowmode.ts index 2e603c6..66bc2a0 100644 --- a/src/commands/moderation/slowmode.ts +++ b/src/commands/moderation/slowmode.ts @@ -1,6 +1,6 @@ import { Arg, - BushCommand, + BotCommand, clientSendAndPermCheck, emojis, format, @@ -14,7 +14,7 @@ import assert from 'assert/strict'; import { Argument } from 'discord-akairo'; import { ApplicationCommandOptionType, ChannelType, PermissionFlagsBits } from 'discord.js'; -export default class SlowmodeCommand extends BushCommand { +export default class SlowmodeCommand extends BotCommand { public constructor() { super('slowmode', { aliases: ['slowmode', 'slow'], diff --git a/src/commands/moderation/timeout.ts b/src/commands/moderation/timeout.ts index 3e2b10d..5ab62e4 100644 --- a/src/commands/moderation/timeout.ts +++ b/src/commands/moderation/timeout.ts @@ -1,6 +1,6 @@ import { AllowedMentions, - BushCommand, + BotCommand, castDurationContent, clientSendAndPermCheck, emojis, @@ -15,7 +15,7 @@ import { import assert from 'assert/strict'; import { ApplicationCommandOptionType, PermissionFlagsBits, type GuildMember } from 'discord.js'; -export default class TimeoutCommand extends BushCommand { +export default class TimeoutCommand extends BotCommand { public constructor() { super('timeout', { aliases: ['timeout', 'to'], @@ -80,7 +80,7 @@ export default class TimeoutCommand extends BushCommand { return message.util.reply(canModerateResponse); } - const responseCode = await member.bushTimeout({ + const responseCode = await member.customTimeout({ reason: content, moderator: message.member, duration: duration diff --git a/src/commands/moderation/unban.ts b/src/commands/moderation/unban.ts index 3a6221a..29dedab 100644 --- a/src/commands/moderation/unban.ts +++ b/src/commands/moderation/unban.ts @@ -1,7 +1,7 @@ import { AllowedMentions, Arg, - BushCommand, + BotCommand, emojis, format, unbanResponse, @@ -14,7 +14,7 @@ import { import assert from 'assert/strict'; import { ApplicationCommandOptionType, PermissionFlagsBits, type User } from 'discord.js'; -export default class UnbanCommand extends BushCommand { +export default class UnbanCommand extends BotCommand { public constructor() { super('unban', { aliases: ['unban'], @@ -55,7 +55,7 @@ export default class UnbanCommand extends BushCommand { ) { assert(message.inGuild()); - const responseCode = await message.guild.bushUnban({ + const responseCode = await message.guild.customUnban({ user, moderator: message.author, reason diff --git a/src/commands/moderation/unblock.ts b/src/commands/moderation/unblock.ts index 6533da0..e342f0f 100644 --- a/src/commands/moderation/unblock.ts +++ b/src/commands/moderation/unblock.ts @@ -1,6 +1,6 @@ import { AllowedMentions, - BushCommand, + BotCommand, clientSendAndPermCheck, emojis, format, @@ -16,7 +16,7 @@ import { import assert from 'assert/strict'; import { ApplicationCommandOptionType, PermissionFlagsBits, type GuildMember } from 'discord.js'; -export default class UnblockCommand extends BushCommand { +export default class UnblockCommand extends BotCommand { public constructor() { super('unblock', { aliases: ['unblock'], @@ -83,7 +83,7 @@ export default class UnblockCommand extends BushCommand { return message.util.reply(canModerateResponse); } - const responseCode = await member.bushUnblock({ + const responseCode = await member.customUnblock({ reason: args.reason ?? '', moderator: message.member, channel: message.channel diff --git a/src/commands/moderation/unlockdown.ts b/src/commands/moderation/unlockdown.ts index 873ea87..38d2fe6 100644 --- a/src/commands/moderation/unlockdown.ts +++ b/src/commands/moderation/unlockdown.ts @@ -1,8 +1,8 @@ import { LockdownCommand } from '#commands'; -import { BushCommand, clientSendAndPermCheck, type ArgType, type CommandMessage, type OptArgType, type SlashMessage } from '#lib'; +import { BotCommand, clientSendAndPermCheck, type ArgType, type CommandMessage, type OptArgType, type SlashMessage } from '#lib'; import { ApplicationCommandOptionType, Constants, PermissionFlagsBits } from 'discord.js'; -export default class UnlockdownCommand extends BushCommand { +export default class UnlockdownCommand extends BotCommand { public constructor() { super('unlockdown', { aliases: ['unlockdown', 'unlock', 'lockup'], diff --git a/src/commands/moderation/unmute.ts b/src/commands/moderation/unmute.ts index f1e74ab..4f408eb 100644 --- a/src/commands/moderation/unmute.ts +++ b/src/commands/moderation/unmute.ts @@ -11,9 +11,9 @@ import { } from '#lib'; import assert from 'assert/strict'; import { ApplicationCommandOptionType, PermissionFlagsBits } from 'discord.js'; -import { BushCommand } from '../../../lib/extensions/discord-akairo/BushCommand.js'; +import { BotCommand } from '../../../lib/extensions/discord-akairo/BotCommand.js'; -export default class UnmuteCommand extends BushCommand { +export default class UnmuteCommand extends BotCommand { public constructor() { super('unmute', { aliases: ['unmute'], @@ -74,7 +74,7 @@ export default class UnmuteCommand extends BushCommand { return message.util.reply(canModerateResponse); } - const responseCode = await member.bushUnmute({ + const responseCode = await member.customUnmute({ reason, moderator: message.member }); diff --git a/src/commands/moderation/untimeout.ts b/src/commands/moderation/untimeout.ts index 6ca28f4..8bc977b 100644 --- a/src/commands/moderation/untimeout.ts +++ b/src/commands/moderation/untimeout.ts @@ -1,6 +1,6 @@ import { AllowedMentions, - BushCommand, + BotCommand, clientSendAndPermCheck, emojis, format, @@ -15,7 +15,7 @@ import { import assert from 'assert/strict'; import { ApplicationCommandOptionType, PermissionFlagsBits, type GuildMember } from 'discord.js'; -export default class UntimeoutCommand extends BushCommand { +export default class UntimeoutCommand extends BotCommand { public constructor() { super('untimeout', { aliases: ['untimeout', 'remove-timeout'], @@ -80,7 +80,7 @@ export default class UntimeoutCommand extends BushCommand { return message.util.reply(canModerateResponse); } - const responseCode = await member.bushRemoveTimeout({ + const responseCode = await member.customRemoveTimeout({ reason: args.reason ?? undefined, moderator: message.member }); diff --git a/src/commands/moderation/warn.ts b/src/commands/moderation/warn.ts index e1d1e90..9547583 100644 --- a/src/commands/moderation/warn.ts +++ b/src/commands/moderation/warn.ts @@ -1,6 +1,6 @@ import { AllowedMentions, - BushCommand, + BotCommand, clientSendAndPermCheck, emojis, format, @@ -17,7 +17,7 @@ import { import assert from 'assert/strict'; import { ApplicationCommandOptionType, PermissionFlagsBits, type GuildMember } from 'discord.js'; -export default class WarnCommand extends BushCommand { +export default class WarnCommand extends BotCommand { public constructor() { super('warn', { aliases: ['warn'], @@ -77,7 +77,7 @@ export default class WarnCommand extends BushCommand { return message.util.reply(canModerateResponse); } - const { result: responseCode, caseNum } = await member.bushWarn({ + const { result: responseCode, caseNum } = await member.customWarn({ reason, moderator: message.member }); diff --git a/src/commands/moulberry-bush/capePermissions.ts b/src/commands/moulberry-bush/capePermissions.ts index 793ac59..fdeddd8 100644 --- a/src/commands/moulberry-bush/capePermissions.ts +++ b/src/commands/moulberry-bush/capePermissions.ts @@ -1,6 +1,6 @@ import { AllowedMentions, - BushCommand, + BotCommand, clientSendAndPermCheck, colors, emojis, @@ -12,7 +12,7 @@ import { } from '#lib'; import { ApplicationCommandOptionType, EmbedBuilder, PermissionFlagsBits } from 'discord.js'; -export default class CapePermissionsCommand extends BushCommand { +export default class CapePermissionsCommand extends BotCommand { public constructor() { super('capePermissions', { aliases: ['cape-permissions', 'cape-perms', 'cape-perm'], diff --git a/src/commands/moulberry-bush/capes.ts b/src/commands/moulberry-bush/capes.ts index 6ffc540..79c163f 100644 --- a/src/commands/moulberry-bush/capes.ts +++ b/src/commands/moulberry-bush/capes.ts @@ -1,6 +1,6 @@ import { AllowedMentions, - BushCommand, + BotCommand, ButtonPaginator, clientSendAndPermCheck, colors, @@ -18,7 +18,7 @@ import { default as Fuse } from 'fuse.js'; assert(Fuse); -export default class CapesCommand extends BushCommand { +export default class CapesCommand extends BotCommand { public constructor() { super('capes', { aliases: ['capes', 'cape'], diff --git a/src/commands/moulberry-bush/giveawayPing.ts b/src/commands/moulberry-bush/giveawayPing.ts index 8f8941f..aebcc52 100644 --- a/src/commands/moulberry-bush/giveawayPing.ts +++ b/src/commands/moulberry-bush/giveawayPing.ts @@ -1,8 +1,8 @@ -import { AllowedMentions, BushCommand, clientSendAndPermCheck, emojis, mappings, type CommandMessage } from '#lib'; +import { AllowedMentions, BotCommand, clientSendAndPermCheck, emojis, mappings, type CommandMessage } from '#lib'; import assert from 'assert/strict'; import { PermissionFlagsBits } from 'discord.js'; -export default class GiveawayPingCommand extends BushCommand { +export default class GiveawayPingCommand extends BotCommand { public constructor() { super('giveawayPing', { aliases: ['giveaway-ping', 'giveaway-pong'], diff --git a/src/commands/moulberry-bush/moulHammer.ts b/src/commands/moulberry-bush/moulHammer.ts index 7bb514e..0407428 100644 --- a/src/commands/moulberry-bush/moulHammer.ts +++ b/src/commands/moulberry-bush/moulHammer.ts @@ -1,16 +1,8 @@ -import { - BushCommand, - clientSendAndPermCheck, - colors, - mappings, - type ArgType, - type CommandMessage, - type SlashMessage -} from '#lib'; +import { BotCommand, clientSendAndPermCheck, colors, mappings, type ArgType, type CommandMessage, type SlashMessage } from '#lib'; import assert from 'assert/strict'; import { ApplicationCommandOptionType, EmbedBuilder, PermissionFlagsBits } from 'discord.js'; -export default class MoulHammerCommand extends BushCommand { +export default class MoulHammerCommand extends BotCommand { public constructor() { super('moulHammer', { aliases: ['moul-hammer'], diff --git a/src/commands/moulberry-bush/neuRepo.ts b/src/commands/moulberry-bush/neuRepo.ts index 4baae7d..d8eb7ed 100644 --- a/src/commands/moulberry-bush/neuRepo.ts +++ b/src/commands/moulberry-bush/neuRepo.ts @@ -1,4 +1,4 @@ -import { BushCommand, clientSendAndPermCheck, type ArgType, type CommandMessage, type SlashMessage } from '#lib'; +import { BotCommand, clientSendAndPermCheck, type ArgType, type CommandMessage, type SlashMessage } from '#lib'; import canvas from '@napi-rs/canvas'; import { ApplicationCommandOptionType, @@ -11,7 +11,7 @@ import { join } from 'path'; import tinycolor from 'tinycolor2'; import { formattingInfo, RawNeuItem } from '../../../lib/utils/Minecraft.js'; -export default class NeuRepoCommand extends BushCommand { +export default class NeuRepoCommand extends BotCommand { public static items: { name: string; id: string }[] = []; public constructor() { diff --git a/src/commands/moulberry-bush/report.ts b/src/commands/moulberry-bush/report.ts index d0c4f33..8eb412c 100644 --- a/src/commands/moulberry-bush/report.ts +++ b/src/commands/moulberry-bush/report.ts @@ -1,6 +1,6 @@ import { AllowedMentions, - BushCommand, + BotCommand, clientSendAndPermCheck, colors, emojis, @@ -13,7 +13,7 @@ import { stripIndent } from '#tags'; import assert from 'assert/strict'; import { ApplicationCommandOptionType, EmbedBuilder, PermissionFlagsBits } from 'discord.js'; -export default class ReportCommand extends BushCommand { +export default class ReportCommand extends BotCommand { public constructor() { super('report', { aliases: ['report'], diff --git a/src/commands/moulberry-bush/rule.ts b/src/commands/moulberry-bush/rule.ts index ab5500d..5f2155f 100644 --- a/src/commands/moulberry-bush/rule.ts +++ b/src/commands/moulberry-bush/rule.ts @@ -1,7 +1,7 @@ import { AllowedMentions, Arg, - BushCommand, + BotCommand, clientSendAndPermCheck, mappings, type CommandMessage, @@ -67,7 +67,7 @@ const rules = [ } ]; -export default class RuleCommand extends BushCommand { +export default class RuleCommand extends BotCommand { public constructor() { super('rule', { aliases: ['rule', 'rules'], diff --git a/src/commands/moulberry-bush/serverStatus.ts b/src/commands/moulberry-bush/serverStatus.ts index cde3f04..709de26 100644 --- a/src/commands/moulberry-bush/serverStatus.ts +++ b/src/commands/moulberry-bush/serverStatus.ts @@ -1,7 +1,7 @@ -import { BushCommand, clientSendAndPermCheck, colors, emojis, type CommandMessage } from '#lib'; +import { BotCommand, clientSendAndPermCheck, colors, emojis, type CommandMessage } from '#lib'; import { EmbedBuilder, PermissionFlagsBits } from 'discord.js'; -export default class ServerStatusCommand extends BushCommand { +export default class ServerStatusCommand extends BotCommand { public constructor() { super('serverStatus', { aliases: ['server-status', 'ss'], diff --git a/src/commands/moulberry-bush/solved.ts b/src/commands/moulberry-bush/solved.ts index ac7684a..197a3ce 100644 --- a/src/commands/moulberry-bush/solved.ts +++ b/src/commands/moulberry-bush/solved.ts @@ -1,7 +1,7 @@ -import { BushCommand, clientSendAndPermCheck, emojis, mappings, type CommandMessage, type SlashMessage } from '#lib'; +import { BotCommand, clientSendAndPermCheck, emojis, mappings, type CommandMessage, type SlashMessage } from '#lib'; import assert from 'assert/strict'; -export default class Solved extends BushCommand { +export default class Solved extends BotCommand { public constructor() { super('solved', { aliases: ['solved'], diff --git a/src/commands/tickets/ticket-!.ts b/src/commands/tickets/ticket-!.ts index 6ec4093..d1462fb 100644 --- a/src/commands/tickets/ticket-!.ts +++ b/src/commands/tickets/ticket-!.ts @@ -1,4 +1,4 @@ -import { BushCommand, clientSendAndPermCheck, deepWriteable, type SlashMessage } from '#lib'; +import { BotCommand, clientSendAndPermCheck, deepWriteable, type SlashMessage } from '#lib'; import { Flag, type ArgumentGeneratorReturn, type SlashOption } from 'discord-akairo'; import { ApplicationCommandOptionType } from 'discord.js'; @@ -18,7 +18,7 @@ export const ticketSubcommands = deepWriteable({ } } as const); -export default class TicketCommand extends BushCommand { +export default class TicketCommand extends BotCommand { public constructor() { super('ticket', { aliases: ['ticket'], diff --git a/src/commands/utilities/_poll.ts b/src/commands/utilities/_poll.ts index 1ceb13a..4655f36 100644 --- a/src/commands/utilities/_poll.ts +++ b/src/commands/utilities/_poll.ts @@ -1,7 +1,7 @@ -// import { BushCommand, clientSendAndPermCheck, emojis, type ArgType, type CommandMessage, type SlashMessage } from '#lib'; +// import { clientSendAndPermCheck, CustomCommand, emojis, type ArgType, type CommandMessage, type SlashMessage } from '#lib'; // import { ApplicationCommandOptionType, ComponentType } from 'discord.js'; -// export default class PollCommand extends BushCommand { +// export default class PollCommand extends CustomCommand { // public constructor() { // super('poll', { // aliases: ['poll', 'quick-poll'], diff --git a/src/commands/utilities/activity.ts b/src/commands/utilities/activity.ts index e5c2cdd..414e6a2 100644 --- a/src/commands/utilities/activity.ts +++ b/src/commands/utilities/activity.ts @@ -1,10 +1,10 @@ import { - BushCommand, + BotCommand, clientSendAndPermCheck, emojis, regex, type ArgType, - type BushArgumentTypeCaster, + type BotArgumentTypeCaster, type CommandMessage, type SlashMessage } from '#lib'; @@ -75,14 +75,14 @@ function map(phase: string): Activity | null { return null; } -const activityTypeCaster: BushArgumentTypeCaster<Snowflake | null> = (message: CommandMessage, phrase: string) => { +const activityTypeCaster: BotArgumentTypeCaster<Snowflake | null> = (message: CommandMessage, phrase: string) => { const parsedPhrase = phrase ?? message.util.parsed?.alias !== 'activity' ? message.util.parsed?.alias : undefined; if (!parsedPhrase) return null; const mappedPhrase = map(parsedPhrase)?.id; return mappedPhrase ?? null; }; -export default class ActivityCommand extends BushCommand { +export default class ActivityCommand extends BotCommand { public constructor() { super('activity', { aliases: ['activity', ...Object.values(activityMap).flatMap((a) => a.aliases)], diff --git a/src/commands/utilities/calculator.ts b/src/commands/utilities/calculator.ts index dc5593b..c9d300c 100644 --- a/src/commands/utilities/calculator.ts +++ b/src/commands/utilities/calculator.ts @@ -1,6 +1,6 @@ import { AllowedMentions, - BushCommand, + BotCommand, clientSendAndPermCheck, colors, emojis, @@ -13,7 +13,7 @@ import { evaluate } from 'mathjs'; assert(evaluate); -export default class CalculatorCommand extends BushCommand { +export default class CalculatorCommand extends BotCommand { public constructor() { super('calculator', { aliases: ['calculator', 'calc', 'math'], diff --git a/src/commands/utilities/decode.ts b/src/commands/utilities/decode.ts index 065e9e5..12a016b 100644 --- a/src/commands/utilities/decode.ts +++ b/src/commands/utilities/decode.ts @@ -1,6 +1,6 @@ import { AllowedMentions, - BushCommand, + BotCommand, capitalize, clientSendAndPermCheck, colors, @@ -13,7 +13,7 @@ import { ApplicationCommandOptionType, EmbedBuilder } from 'discord.js'; const encodingTypesArray = ['ascii', 'utf8', 'utf-8', 'utf16le', 'ucs2', 'ucs-2', 'base64', 'latin1', 'binary', 'hex']; const encodingTypesString = encodingTypesArray.map((e) => `\`${e}\``).join(', '); -export default class DecodeCommand extends BushCommand { +export default class DecodeCommand extends BotCommand { public constructor() { super('decode', { aliases: ['decode', 'encode'], diff --git a/src/commands/utilities/hash.ts b/src/commands/utilities/hash.ts index 251d5e6..1c741bd 100644 --- a/src/commands/utilities/hash.ts +++ b/src/commands/utilities/hash.ts @@ -1,4 +1,4 @@ -// import { BushCommand, clientSendAndPermCheck, type CommandMessage } from '#lib'; +// import { clientSendAndPermCheck, CustomCommand, type CommandMessage } from '#lib'; // import assert from 'assert/strict'; // import crypto from 'crypto'; // import { ApplicationCommandOptionType } from 'discord.js'; @@ -7,7 +7,7 @@ // assert(crypto); // assert(got); -// export default class HashCommand extends BushCommand { +// export default class HashCommand extends CustomCommand { // public constructor() { // super('hash', { // aliases: ['hash'], diff --git a/src/commands/utilities/highlight-!.ts b/src/commands/utilities/highlight-!.ts index f2ee259..4995e97 100644 --- a/src/commands/utilities/highlight-!.ts +++ b/src/commands/utilities/highlight-!.ts @@ -1,4 +1,4 @@ -import { BushCommand, clientSendAndPermCheck, deepWriteable, Highlight, HighlightWord, type SlashMessage } from '#lib'; +import { BotCommand, clientSendAndPermCheck, deepWriteable, Highlight, HighlightWord, type SlashMessage } from '#lib'; import { Flag, type ArgumentGeneratorReturn, type SlashOption } from 'discord-akairo'; import { ApplicationCommandOptionType, Constants, type AutocompleteInteraction, type CacheType } from 'discord.js'; @@ -133,7 +133,7 @@ export const highlightSubcommands = deepWriteable({ } } as const); -export default class HighlightCommand extends BushCommand { +export default class HighlightCommand extends BotCommand { public constructor() { super('highlight', { aliases: ['highlight', 'hl'], diff --git a/src/commands/utilities/highlight-add.ts b/src/commands/utilities/highlight-add.ts index e7d3ec6..101b26e 100644 --- a/src/commands/utilities/highlight-add.ts +++ b/src/commands/utilities/highlight-add.ts @@ -1,8 +1,8 @@ -import { AllowedMentions, BushCommand, emojis, format, type ArgType, type CommandMessage, type SlashMessage } from '#lib'; +import { AllowedMentions, BotCommand, emojis, format, type ArgType, type CommandMessage, type SlashMessage } from '#lib'; import assert from 'assert/strict'; import { highlightSubcommands } from './highlight-!.js'; -export default class HighlightAddCommand extends BushCommand { +export default class HighlightAddCommand extends BotCommand { public constructor() { super('highlight-add', { aliases: [], diff --git a/src/commands/utilities/highlight-block.ts b/src/commands/utilities/highlight-block.ts index 58e7766..b16852e 100644 --- a/src/commands/utilities/highlight-block.ts +++ b/src/commands/utilities/highlight-block.ts @@ -1,11 +1,11 @@ -import { AllowedMentions, BushCommand, emojis, type ArgType, type CommandMessage, type SlashMessage } from '#lib'; +import { AllowedMentions, BotCommand, emojis, type ArgType, type CommandMessage, type SlashMessage } from '#lib'; import assert from 'assert/strict'; import { Argument, ArgumentGeneratorReturn } from 'discord-akairo'; import { BaseChannel, GuildMember, User } from 'discord.js'; import { HighlightBlockResult } from '../../../lib/common/HighlightManager.js'; import { highlightSubcommands } from './highlight-!.js'; -export default class HighlightBlockCommand extends BushCommand { +export default class HighlightBlockCommand extends BotCommand { public constructor() { super('highlight-block', { aliases: [], diff --git a/src/commands/utilities/highlight-clear.ts b/src/commands/utilities/highlight-clear.ts index 5451e4e..d02cda6 100644 --- a/src/commands/utilities/highlight-clear.ts +++ b/src/commands/utilities/highlight-clear.ts @@ -1,8 +1,8 @@ -import { BushCommand, ConfirmationPrompt, emojis, type CommandMessage, type SlashMessage } from '#lib'; +import { BotCommand, ConfirmationPrompt, emojis, type CommandMessage, type SlashMessage } from '#lib'; import assert from 'assert/strict'; import { highlightSubcommands } from './highlight-!.js'; -export default class HighlightClearCommand extends BushCommand { +export default class HighlightClearCommand extends BotCommand { public constructor() { super('highlight-clear', { aliases: [], diff --git a/src/commands/utilities/highlight-matches.ts b/src/commands/utilities/highlight-matches.ts index 863445e..d54fd4a 100644 --- a/src/commands/utilities/highlight-matches.ts +++ b/src/commands/utilities/highlight-matches.ts @@ -1,10 +1,10 @@ -import { BushCommand, ButtonPaginator, chunk, colors, emojis, type ArgType, type CommandMessage, type SlashMessage } from '#lib'; +import { BotCommand, ButtonPaginator, chunk, colors, emojis, type ArgType, type CommandMessage, type SlashMessage } from '#lib'; import assert from 'assert/strict'; import { type ArgumentGeneratorReturn } from 'discord-akairo'; import { type APIEmbed } from 'discord.js'; import { highlightSubcommands } from './highlight-!.js'; -export default class HighlightMatchesCommand extends BushCommand { +export default class HighlightMatchesCommand extends BotCommand { public constructor() { super('highlight-matches', { aliases: [], diff --git a/src/commands/utilities/highlight-remove.ts b/src/commands/utilities/highlight-remove.ts index fd2fa90..b91bc8c 100644 --- a/src/commands/utilities/highlight-remove.ts +++ b/src/commands/utilities/highlight-remove.ts @@ -1,8 +1,8 @@ -import { AllowedMentions, BushCommand, emojis, type ArgType, type CommandMessage, type SlashMessage } from '#lib'; +import { AllowedMentions, BotCommand, emojis, type ArgType, type CommandMessage, type SlashMessage } from '#lib'; import assert from 'assert/strict'; import { highlightSubcommands } from './highlight-!.js'; -export default class HighlightRemoveCommand extends BushCommand { +export default class HighlightRemoveCommand extends BotCommand { public constructor() { super('highlight-remove', { aliases: [], diff --git a/src/commands/utilities/highlight-show.ts b/src/commands/utilities/highlight-show.ts index 2ed5ed1..6d386e9 100644 --- a/src/commands/utilities/highlight-show.ts +++ b/src/commands/utilities/highlight-show.ts @@ -1,9 +1,9 @@ -import { AllowedMentions, BushCommand, colors, emojis, Highlight, type CommandMessage, type SlashMessage } from '#lib'; +import { AllowedMentions, BotCommand, colors, emojis, Highlight, type CommandMessage, type SlashMessage } from '#lib'; import assert from 'assert/strict'; import { EmbedBuilder } from 'discord.js'; import { highlightSubcommands } from './highlight-!.js'; -export default class HighlightShowCommand extends BushCommand { +export default class HighlightShowCommand extends BotCommand { public constructor() { super('highlight-show', { aliases: [], diff --git a/src/commands/utilities/highlight-unblock.ts b/src/commands/utilities/highlight-unblock.ts index 2238831..0f2dd78 100644 --- a/src/commands/utilities/highlight-unblock.ts +++ b/src/commands/utilities/highlight-unblock.ts @@ -1,11 +1,11 @@ -import { AllowedMentions, BushCommand, emojis, type ArgType, type CommandMessage, type SlashMessage } from '#lib'; +import { AllowedMentions, BotCommand, emojis, type ArgType, type CommandMessage, type SlashMessage } from '#lib'; import assert from 'assert'; import { Argument, ArgumentGeneratorReturn } from 'discord-akairo'; import { BaseChannel, GuildMember, User } from 'discord.js'; import { HighlightUnblockResult } from '../../../lib/common/HighlightManager.js'; import { highlightSubcommands } from './highlight-!.js'; -export default class HighlightUnblockCommand extends BushCommand { +export default class HighlightUnblockCommand extends BotCommand { public constructor() { super('highlight-unblock', { aliases: [], diff --git a/src/commands/utilities/price.ts b/src/commands/utilities/price.ts index bfe1f10..a1645dc 100644 --- a/src/commands/utilities/price.ts +++ b/src/commands/utilities/price.ts @@ -1,11 +1,11 @@ -import { ArgType, BushCommand, clientSendAndPermCheck, colors, emojis, format, oxford, type CommandMessage } from '#lib'; +import { ArgType, BotCommand, clientSendAndPermCheck, colors, emojis, format, oxford, type CommandMessage } from '#lib'; import assert from 'assert/strict'; import { ApplicationCommandOptionType, AutocompleteInteraction, EmbedBuilder, PermissionFlagsBits } from 'discord.js'; import { default as Fuse } from 'fuse.js'; assert(Fuse); -export default class PriceCommand extends BushCommand { +export default class PriceCommand extends BotCommand { public static cachedItemList: string[] = []; public static readonly urls = [ { url: 'https://api.hypixel.net/skyblock/bazaar', error: 'bazaar' }, diff --git a/src/commands/utilities/remind.ts b/src/commands/utilities/remind.ts index 3a1cd18..498a63d 100644 --- a/src/commands/utilities/remind.ts +++ b/src/commands/utilities/remind.ts @@ -1,5 +1,5 @@ import { - BushCommand, + BotCommand, castDurationContent, clientSendAndPermCheck, dateDelta, @@ -14,7 +14,7 @@ import { } from '#lib'; import { ApplicationCommandOptionType } from 'discord.js'; -export default class RemindCommand extends BushCommand { +export default class RemindCommand extends BotCommand { public constructor() { super('remind', { aliases: ['remind', 'remindme', 'reminder'], diff --git a/src/commands/utilities/reminders.ts b/src/commands/utilities/reminders.ts index fdce981..f98166f 100644 --- a/src/commands/utilities/reminders.ts +++ b/src/commands/utilities/reminders.ts @@ -1,5 +1,5 @@ import { - BushCommand, + BotCommand, ButtonPaginator, chunk, clientSendAndPermCheck, @@ -16,7 +16,7 @@ import { Op } from 'sequelize'; assert(Op); -export default class RemindersCommand extends BushCommand { +export default class RemindersCommand extends BotCommand { public constructor() { super('reminders', { aliases: ['reminders', 'view-reminders', 'list-reminders'], diff --git a/src/commands/utilities/steal.ts b/src/commands/utilities/steal.ts index b07338f..7f70830 100644 --- a/src/commands/utilities/steal.ts +++ b/src/commands/utilities/steal.ts @@ -1,6 +1,6 @@ import { Arg, - BushCommand, + BotCommand, clientSendAndPermCheck, emojis, format, @@ -28,7 +28,7 @@ const enum lang { nameDescription = 'The name to give the new emoji.' } -export default class StealCommand extends BushCommand { +export default class StealCommand extends BotCommand { public constructor() { super('steal', { aliases: ['steal', 'copy-emoji', 'emoji'], diff --git a/src/commands/utilities/suicide.ts b/src/commands/utilities/suicide.ts index f4c76be..bc76d9c 100644 --- a/src/commands/utilities/suicide.ts +++ b/src/commands/utilities/suicide.ts @@ -1,8 +1,8 @@ -import { AllowedMentions, BushCommand, clientSendAndPermCheck, colors, type CommandMessage, type SlashMessage } from '#lib'; +import { AllowedMentions, BotCommand, clientSendAndPermCheck, colors, type CommandMessage, type SlashMessage } from '#lib'; import { stripIndent } from '#tags'; import { EmbedBuilder } from 'discord.js'; -export default class SuicideCommand extends BushCommand { +export default class SuicideCommand extends BotCommand { public constructor() { super('suicide', { aliases: ['suicide'], diff --git a/src/commands/utilities/uuid.ts b/src/commands/utilities/uuid.ts index 04d4013..041acfc 100644 --- a/src/commands/utilities/uuid.ts +++ b/src/commands/utilities/uuid.ts @@ -1,7 +1,7 @@ import { AllowedMentions, ArgType, - BushCommand, + BotCommand, clientSendAndPermCheck, emojis, format, @@ -11,7 +11,7 @@ import { } from '#lib'; import { ApplicationCommandOptionType } from 'discord.js'; -export default class UuidCommand extends BushCommand { +export default class UuidCommand extends BotCommand { public constructor() { super('uuid', { aliases: ['uuid'], diff --git a/src/commands/utilities/viewRaw.ts b/src/commands/utilities/viewRaw.ts index a7d8b25..63125c3 100644 --- a/src/commands/utilities/viewRaw.ts +++ b/src/commands/utilities/viewRaw.ts @@ -1,6 +1,6 @@ import { Arg, - BushCommand, + BotCommand, clientSendAndPermCheck, colors, emojis, @@ -13,7 +13,7 @@ import { import assert from 'assert/strict'; import { ApplicationCommandOptionType, Constants, EmbedBuilder, Message, PermissionFlagsBits } from 'discord.js'; -export default class ViewRawCommand extends BushCommand { +export default class ViewRawCommand extends BotCommand { public constructor() { super('view-raw', { aliases: ['view-raw', 'vr'], diff --git a/src/commands/utilities/whoHasRole.ts b/src/commands/utilities/whoHasRole.ts index 789701c..23eccd6 100644 --- a/src/commands/utilities/whoHasRole.ts +++ b/src/commands/utilities/whoHasRole.ts @@ -1,5 +1,5 @@ import { - BushCommand, + BotCommand, ButtonPaginator, chunk, clientSendAndPermCheck, @@ -13,7 +13,7 @@ import { import assert from 'assert/strict'; import { ApplicationCommandOptionType, escapeMarkdown, type CommandInteraction, type Role } from 'discord.js'; -export default class WhoHasRoleCommand extends BushCommand { +export default class WhoHasRoleCommand extends BotCommand { public constructor() { super('whoHasRole', { aliases: ['who-has-role', 'whr', 'dump'], diff --git a/src/commands/utilities/wolframAlpha.ts b/src/commands/utilities/wolframAlpha.ts index 5ba55f7..863b16a 100644 --- a/src/commands/utilities/wolframAlpha.ts +++ b/src/commands/utilities/wolframAlpha.ts @@ -1,6 +1,6 @@ import { AllowedMentions, - BushCommand, + BotCommand, clientSendAndPermCheck, colors, emojis, @@ -14,7 +14,7 @@ import { ApplicationCommandOptionType, EmbedBuilder, type MessageOptions } from assert(WolframAlphaAPI); -export default class WolframAlphaCommand extends BushCommand { +export default class WolframAlphaCommand extends BotCommand { public constructor() { super('wolframAlpha', { aliases: ['wolfram-alpha', 'wolfram', 'alpha', 'wolf', 'wa'], |