diff options
Diffstat (limited to 'src/commands/moderation')
23 files changed, 73 insertions, 62 deletions
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 }); |