diff options
author | IRONM00N <64110067+IRONM00N@users.noreply.github.com> | 2022-04-20 18:37:22 -0400 |
---|---|---|
committer | IRONM00N <64110067+IRONM00N@users.noreply.github.com> | 2022-04-20 18:37:22 -0400 |
commit | f01be2e3ce820e5737416180efa3e5852ece72c4 (patch) | |
tree | a972af929940173e4e2d9f843124a8dfb293bc90 /src/listeners | |
parent | bcb3dc5fcd21f7626d4c5a8c009dca5658a4436b (diff) | |
download | tanzanite-f01be2e3ce820e5737416180efa3e5852ece72c4.tar.gz tanzanite-f01be2e3ce820e5737416180efa3e5852ece72c4.tar.bz2 tanzanite-f01be2e3ce820e5737416180efa3e5852ece72c4.zip |
fix invite link, remove store channel, update to use builder methods, fix breaking changes
Diffstat (limited to 'src/listeners')
32 files changed, 74 insertions, 71 deletions
diff --git a/src/listeners/bush/appealListener.ts b/src/listeners/bush/appealListener.ts index 1dacb19..b50b3c5 100644 --- a/src/listeners/bush/appealListener.ts +++ b/src/listeners/bush/appealListener.ts @@ -1,7 +1,7 @@ /* eslint-disable no-control-regex */ import { BushListener, ModLog, type BushClientEvents } from '#lib'; import assert from 'assert'; -import { Embed } from 'discord.js'; +import { EmbedBuilder } from 'discord.js'; import UserInfoCommand from '../../commands/info/userInfo.js'; import ModlogCommand from '../../commands/moderation/modlog.js'; @@ -30,7 +30,7 @@ export default class AppealListener extends BushListener { if (!user) return await thread.send({ embeds: [ - new Embed() + new EmbedBuilder() .setTimestamp() .setColor(util.colors.error) .setTitle( @@ -55,7 +55,7 @@ export default class AppealListener extends BushListener { .slice(0, 3) .reverse(); - const embed = new Embed() + const embed = new EmbedBuilder() .setTimestamp() .setColor(util.colors.default) .setTitle(`${message.embeds[0].fields!.find((f) => f.name === 'What type of punishment are you appealing?')!.value} appeal`) diff --git a/src/listeners/bush/supportThread.ts b/src/listeners/bush/supportThread.ts index d408eef..23c1e44 100644 --- a/src/listeners/bush/supportThread.ts +++ b/src/listeners/bush/supportThread.ts @@ -1,7 +1,7 @@ import { BushListener, BushTextChannel, type BushClientEvents } from '#lib'; import assert from 'assert'; import { stripIndent } from 'common-tags'; -import { Embed, MessageType, PermissionFlagsBits } from 'discord.js'; +import { EmbedBuilder, MessageType, PermissionFlagsBits } from 'discord.js'; export default class SupportThreadListener extends BushListener { public constructor() { @@ -41,7 +41,7 @@ export default class SupportThreadListener extends BushListener { }) .catch(() => null); if (!thread) return; - const embed = new Embed() + const embed = new EmbedBuilder() .setTitle('NotEnoughUpdates Support') .setDescription( stripIndent` diff --git a/src/listeners/commands/commandError.ts b/src/listeners/commands/commandError.ts index 048c597..6a66375 100644 --- a/src/listeners/commands/commandError.ts +++ b/src/listeners/commands/commandError.ts @@ -1,7 +1,7 @@ import { type BushCommandHandlerEvents } from '#lib'; import { Severity } from '@sentry/types'; import { type AkairoMessage, type Command } from 'discord-akairo'; -import { Embed, Formatters, GuildTextBasedChannel, type Message } from 'discord.js'; +import { EmbedBuilder, Formatters, GuildTextBasedChannel, type Message } from 'discord.js'; import { BushListener } from '../../lib/extensions/discord-akairo/BushListener.js'; export default class CommandErrorListener extends BushListener { @@ -94,7 +94,7 @@ export default class CommandErrorListener extends BushListener { channel?: string; } | { error: Error | any; type: 'uncaughtException' | 'unhandledRejection'; context?: string } - ): Promise<Embed> { + ): Promise<EmbedBuilder> { const _haste = CommandErrorListener.getErrorHaste(options.error); const _stack = CommandErrorListener.getErrorStack(options.error); const [haste, stack] = await Promise.all([_haste, _stack]); @@ -122,8 +122,8 @@ export default class CommandErrorListener extends BushListener { haste: string[]; stack: string; } - ): Embed { - const embed = new Embed().setColor(util.colors.error).setTimestamp(); + ): EmbedBuilder { + const embed = new EmbedBuilder().setColor(util.colors.error).setTimestamp(); if (options.type === 'command-user') { return embed .setTitle('An Error Occurred') diff --git a/src/listeners/commands/commandStarted.ts b/src/listeners/commands/commandStarted.ts index 833eff0..4d2f0ad 100644 --- a/src/listeners/commands/commandStarted.ts +++ b/src/listeners/commands/commandStarted.ts @@ -22,7 +22,8 @@ export default class CommandStartedListener extends BushListener { 'message.type': message.util.isSlash ? 'slash' : 'normal', 'message.parsed.content': message.util.parsed?.content, 'channel.id': (message.channel.isDMBased() ? message.channel.recipient?.id : message.channel?.id) ?? '¯_(ツ)_/¯', - 'channel.name': (message.channel.isDMBased() ? message.channel.recipient?.tag : message.channel?.name) ?? '¯_(ツ)_/¯', + 'channel.name': + (message.channel.isDMBased() ? message.channel.recipient?.tag : (<any>message.channel)?.name) ?? '¯_(ツ)_/¯', 'guild.id': message.guild?.id ?? '¯_(ツ)_/¯', 'guild.name': message.guild?.name ?? '¯_(ツ)_/¯', 'environment': client.config.environment diff --git a/src/listeners/guild-custom/bushLockdown.ts b/src/listeners/guild-custom/bushLockdown.ts index b27dfba..54e1ab1 100644 --- a/src/listeners/guild-custom/bushLockdown.ts +++ b/src/listeners/guild-custom/bushLockdown.ts @@ -1,5 +1,5 @@ import { BushListener, type BushClientEvents } from '#lib'; -import { Embed } from 'discord.js'; +import { EmbedBuilder } from 'discord.js'; export default class BushLockdownListener extends BushListener { public constructor() { @@ -14,7 +14,7 @@ export default class BushLockdownListener extends BushListener { const logChannel = await moderator.guild.getLogChannel('moderation'); if (!logChannel) return; - const logEmbed = new Embed() + const logEmbed = new EmbedBuilder() .setColor(util.colors.Blurple) .setTimestamp() .addFields({ name: '**Action**', value: `${'Lockdown'}` }) diff --git a/src/listeners/guild-custom/bushUnlockdown.ts b/src/listeners/guild-custom/bushUnlockdown.ts index 0de83d2..4697c92 100644 --- a/src/listeners/guild-custom/bushUnlockdown.ts +++ b/src/listeners/guild-custom/bushUnlockdown.ts @@ -1,5 +1,5 @@ import { BushListener, type BushClientEvents } from '#lib'; -import { Embed } from 'discord.js'; +import { EmbedBuilder } from 'discord.js'; export default class BushUnlockdownListener extends BushListener { public constructor() { @@ -14,7 +14,7 @@ export default class BushUnlockdownListener extends BushListener { const logChannel = await moderator.guild.getLogChannel('moderation'); if (!logChannel) return; - const logEmbed = new Embed() + const logEmbed = new EmbedBuilder() .setColor(util.colors.Blurple) .setTimestamp() .addFields({ name: '**Action**', value: `${'Unlockdown'}` }) diff --git a/src/listeners/guild/guildMemberAdd.ts b/src/listeners/guild/guildMemberAdd.ts index adbca0f..27d5be2 100644 --- a/src/listeners/guild/guildMemberAdd.ts +++ b/src/listeners/guild/guildMemberAdd.ts @@ -1,5 +1,5 @@ import { BushListener, type BushClientEvents, type BushGuildMember, type BushTextChannel } from '#lib'; -import { Embed } from 'discord.js'; +import { EmbedBuilder } from 'discord.js'; export default class GuildMemberAddListener extends BushListener { public constructor() { @@ -28,7 +28,7 @@ export default class GuildMemberAddListener extends BushListener { // eslint-disable-next-line @typescript-eslint/no-base-to-string return welcome.guild.error('Send Welcome Message', `I do not have permission to send messages in ${welcome}.`); - const embed = new Embed() + const embed = new EmbedBuilder() .setDescription( `${util.emojis.join} ${util.format.input( member.user.tag diff --git a/src/listeners/guild/guildMemberRemove.ts b/src/listeners/guild/guildMemberRemove.ts index d71f3fd..8e7ce0d 100644 --- a/src/listeners/guild/guildMemberRemove.ts +++ b/src/listeners/guild/guildMemberRemove.ts @@ -7,7 +7,7 @@ import { type BushTextChannel, type PartialBushGuildMember } from '#lib'; -import { Embed } from 'discord.js'; +import { EmbedBuilder } from 'discord.js'; export default class GuildMemberRemoveListener extends BushListener { public constructor() { @@ -32,7 +32,7 @@ export default class GuildMemberRemoveListener extends BushListener { if (!welcomeChannel) return; const welcome = client.channels.cache.get(welcomeChannel) as BushTextChannel | undefined; if (member.guild.id !== welcome?.guild.id) throw new Error('Welcome channel must be in the guild.'); - const embed: Embed = new Embed() + const embed: EmbedBuilder = new EmbedBuilder() .setDescription( `${util.emojis.leave} ${util.format.input(user.tag)} ${ isBan ? 'got banned from' : 'left' diff --git a/src/listeners/interaction/interactionCreate.ts b/src/listeners/interaction/interactionCreate.ts index 6916134..f3b786c 100644 --- a/src/listeners/interaction/interactionCreate.ts +++ b/src/listeners/interaction/interactionCreate.ts @@ -1,5 +1,5 @@ import { AutoMod, BushListener, type BushButtonInteraction, type BushClientEvents } from '#lib'; -import { InteractionType } from 'discord-api-types/v9'; +import { InteractionType } from 'discord-api-types/v10'; export default class InteractionCreateListener extends BushListener { public constructor() { diff --git a/src/listeners/member-custom/bushBan.ts b/src/listeners/member-custom/bushBan.ts index cd700a9..efdabb9 100644 --- a/src/listeners/member-custom/bushBan.ts +++ b/src/listeners/member-custom/bushBan.ts @@ -1,5 +1,5 @@ import { BushListener, type BushClientEvents } from '#lib'; -import { Embed, GuildMember } from 'discord.js'; +import { EmbedBuilder, GuildMember } from 'discord.js'; export default class BushBanListener extends BushListener { public constructor() { @@ -15,7 +15,7 @@ export default class BushBanListener extends BushListener { if (!logChannel) return; const user = victim instanceof GuildMember ? victim.user : victim; - const logEmbed = new Embed() + const logEmbed = new EmbedBuilder() .setColor(util.colors.Red) .setTimestamp() .setFooter({ text: `CaseID: ${caseID}` }) diff --git a/src/listeners/member-custom/bushBlock.ts b/src/listeners/member-custom/bushBlock.ts index 111c945..26de816 100644 --- a/src/listeners/member-custom/bushBlock.ts +++ b/src/listeners/member-custom/bushBlock.ts @@ -1,5 +1,5 @@ import { BushListener, type BushClientEvents } from '#lib'; -import { Embed, GuildMember } from 'discord.js'; +import { EmbedBuilder, GuildMember } from 'discord.js'; export default class BushBlockListener extends BushListener { public constructor() { @@ -17,7 +17,7 @@ export default class BushBlockListener extends BushListener { if (!logChannel) return; const user = victim instanceof GuildMember ? victim.user : victim; - const logEmbed = new Embed() + const logEmbed = new EmbedBuilder() .setColor(util.colors.Purple) .setTimestamp() .setFooter({ text: `CaseID: ${caseID}` }) diff --git a/src/listeners/member-custom/bushKick.ts b/src/listeners/member-custom/bushKick.ts index f3e5df1..5494db3 100644 --- a/src/listeners/member-custom/bushKick.ts +++ b/src/listeners/member-custom/bushKick.ts @@ -1,5 +1,5 @@ import { BushListener, type BushClientEvents } from '#lib'; -import { Embed, GuildMember } from 'discord.js'; +import { EmbedBuilder, GuildMember } from 'discord.js'; export default class BushKickListener extends BushListener { public constructor() { @@ -15,7 +15,7 @@ export default class BushKickListener extends BushListener { if (!logChannel) return; const user = victim instanceof GuildMember ? victim.user : victim; - const logEmbed = new Embed() + const logEmbed = new EmbedBuilder() .setColor(util.colors.Red) .setTimestamp() .setFooter({ text: `CaseID: ${caseID}` }) diff --git a/src/listeners/member-custom/bushMute.ts b/src/listeners/member-custom/bushMute.ts index 6f05fcc..df723eb 100644 --- a/src/listeners/member-custom/bushMute.ts +++ b/src/listeners/member-custom/bushMute.ts @@ -1,5 +1,5 @@ import { BushListener, type BushClientEvents } from '#lib'; -import { Embed, GuildMember } from 'discord.js'; +import { EmbedBuilder, GuildMember } from 'discord.js'; export default class BushMuteListener extends BushListener { public constructor() { @@ -15,7 +15,7 @@ export default class BushMuteListener extends BushListener { if (!logChannel) return; const user = victim instanceof GuildMember ? victim.user : victim; - const logEmbed = new Embed() + const logEmbed = new EmbedBuilder() .setColor(util.colors.Orange) .setTimestamp() .setFooter({ text: `CaseID: ${caseID}` }) diff --git a/src/listeners/member-custom/bushPunishRole.ts b/src/listeners/member-custom/bushPunishRole.ts index b3eeef0..716488e 100644 --- a/src/listeners/member-custom/bushPunishRole.ts +++ b/src/listeners/member-custom/bushPunishRole.ts @@ -1,5 +1,5 @@ import { BushListener, type BushClientEvents } from '#lib'; -import { Embed, GuildMember } from 'discord.js'; +import { EmbedBuilder, GuildMember } from 'discord.js'; export default class BushPunishRoleListener extends BushListener { public constructor() { @@ -15,7 +15,7 @@ export default class BushPunishRoleListener extends BushListener { if (!logChannel) return; const user = victim instanceof GuildMember ? victim.user : victim; - const logEmbed = new Embed() + const logEmbed = new EmbedBuilder() .setColor(util.colors.Yellow) .setTimestamp() .setFooter({ text: `CaseID: ${caseID}` }) diff --git a/src/listeners/member-custom/bushPunishRoleRemove.ts b/src/listeners/member-custom/bushPunishRoleRemove.ts index 22b17a7..c5103e3 100644 --- a/src/listeners/member-custom/bushPunishRoleRemove.ts +++ b/src/listeners/member-custom/bushPunishRoleRemove.ts @@ -1,5 +1,5 @@ import { BushListener, type BushClientEvents } from '#lib'; -import { Embed, GuildMember } from 'discord.js'; +import { EmbedBuilder, GuildMember } from 'discord.js'; export default class BushPunishRoleRemoveListener extends BushListener { public constructor() { @@ -15,7 +15,7 @@ export default class BushPunishRoleRemoveListener extends BushListener { if (!logChannel) return; const user = victim instanceof GuildMember ? victim.user : victim; - const logEmbed = new Embed() + const logEmbed = new EmbedBuilder() .setColor(util.colors.Green) .setTimestamp() .setFooter({ text: `CaseID: ${caseID}` }) diff --git a/src/listeners/member-custom/bushPurge.ts b/src/listeners/member-custom/bushPurge.ts index 2834397..1c373fb 100644 --- a/src/listeners/member-custom/bushPurge.ts +++ b/src/listeners/member-custom/bushPurge.ts @@ -1,5 +1,5 @@ import { BushListener, type BushClientEvents } from '#lib'; -import { Embed } from 'discord.js'; +import { EmbedBuilder } from '@discordjs/builders'; export default class BushPurgeListener extends BushListener { public constructor() { @@ -23,7 +23,7 @@ export default class BushPurgeListener extends BushListener { })); const haste = await util.inspectCleanRedactHaste(mappedMessages); - const logEmbed = new Embed() + const logEmbed = new EmbedBuilder() .setColor(util.colors.DarkPurple) .setTimestamp() .setFooter({ text: `${messages.size.toLocaleString()} Messages` }) diff --git a/src/listeners/member-custom/bushRemoveTimeout.ts b/src/listeners/member-custom/bushRemoveTimeout.ts index f2a20ed..bf2e402 100644 --- a/src/listeners/member-custom/bushRemoveTimeout.ts +++ b/src/listeners/member-custom/bushRemoveTimeout.ts @@ -1,5 +1,5 @@ import { BushListener, type BushClientEvents } from '#lib'; -import { Embed, GuildMember } from 'discord.js'; +import { EmbedBuilder, GuildMember } from 'discord.js'; export default class BushRemoveTimeoutListener extends BushListener { public constructor() { @@ -15,7 +15,7 @@ export default class BushRemoveTimeoutListener extends BushListener { if (!logChannel) return; const user = victim instanceof GuildMember ? victim.user : victim; - const logEmbed = new Embed() + const logEmbed = new EmbedBuilder() .setColor(util.colors.Green) .setTimestamp() .setFooter({ text: `CaseID: ${caseID}` }) diff --git a/src/listeners/member-custom/bushTimeout.ts b/src/listeners/member-custom/bushTimeout.ts index d0eedf2..d319eb6 100644 --- a/src/listeners/member-custom/bushTimeout.ts +++ b/src/listeners/member-custom/bushTimeout.ts @@ -1,5 +1,5 @@ import { BushListener, type BushClientEvents } from '#lib'; -import { Embed, GuildMember } from 'discord.js'; +import { EmbedBuilder, GuildMember } from 'discord.js'; export default class BushTimeoutListener extends BushListener { public constructor() { @@ -17,7 +17,7 @@ export default class BushTimeoutListener extends BushListener { if (!logChannel) return; const user = victim instanceof GuildMember ? victim.user : victim; - const logEmbed = new Embed() + const logEmbed = new EmbedBuilder() .setColor(util.colors.Orange) .setTimestamp() .setFooter({ text: `CaseID: ${caseID}` }) diff --git a/src/listeners/member-custom/bushUnban.ts b/src/listeners/member-custom/bushUnban.ts index a3370c8..f7701b2 100644 --- a/src/listeners/member-custom/bushUnban.ts +++ b/src/listeners/member-custom/bushUnban.ts @@ -1,5 +1,5 @@ import { BushListener, type BushClientEvents } from '#lib'; -import { Embed, GuildMember } from 'discord.js'; +import { EmbedBuilder, GuildMember } from 'discord.js'; export default class BushUnbanListener extends BushListener { public constructor() { @@ -15,7 +15,7 @@ export default class BushUnbanListener extends BushListener { if (!logChannel) return; const user = victim instanceof GuildMember ? victim.user : victim; - const logEmbed = new Embed() + const logEmbed = new EmbedBuilder() .setColor(util.colors.Green) .setTimestamp() .setFooter({ text: `CaseID: ${caseID}` }) diff --git a/src/listeners/member-custom/bushUnblock.ts b/src/listeners/member-custom/bushUnblock.ts index 19d7fad..4b6ce11 100644 --- a/src/listeners/member-custom/bushUnblock.ts +++ b/src/listeners/member-custom/bushUnblock.ts @@ -1,5 +1,5 @@ import { BushListener, type BushClientEvents } from '#lib'; -import { Embed, GuildMember } from 'discord.js'; +import { EmbedBuilder, GuildMember } from 'discord.js'; export default class BushUnblockListener extends BushListener { public constructor() { @@ -15,7 +15,7 @@ export default class BushUnblockListener extends BushListener { if (!logChannel) return; const user = victim instanceof GuildMember ? victim.user : victim; - const logEmbed = new Embed() + const logEmbed = new EmbedBuilder() .setColor(util.colors.Green) .setTimestamp() .setFooter({ text: `CaseID: ${caseID}` }) diff --git a/src/listeners/member-custom/bushUnmute.ts b/src/listeners/member-custom/bushUnmute.ts index 791fa19..9857f64 100644 --- a/src/listeners/member-custom/bushUnmute.ts +++ b/src/listeners/member-custom/bushUnmute.ts @@ -1,5 +1,5 @@ import { BushListener, type BushClientEvents } from '#lib'; -import { Embed, GuildMember } from 'discord.js'; +import { EmbedBuilder, GuildMember } from 'discord.js'; export default class BushUnmuteListener extends BushListener { public constructor() { @@ -15,7 +15,7 @@ export default class BushUnmuteListener extends BushListener { if (!logChannel) return; const user = victim instanceof GuildMember ? victim.user : victim; - const logEmbed = new Embed() + const logEmbed = new EmbedBuilder() .setColor(util.colors.Green) .setTimestamp() .setFooter({ text: `CaseID: ${caseID}` }) diff --git a/src/listeners/member-custom/bushUpdateModlog.ts b/src/listeners/member-custom/bushUpdateModlog.ts index a8fb277..2cc5e48 100644 --- a/src/listeners/member-custom/bushUpdateModlog.ts +++ b/src/listeners/member-custom/bushUpdateModlog.ts @@ -1,5 +1,5 @@ import { BushListener, type BushClientEvents } from '#lib'; -import { Embed } from 'discord.js'; +import { EmbedBuilder } from 'discord.js'; export default class BushUpdateModlogListener extends BushListener { public constructor() { @@ -14,7 +14,7 @@ export default class BushUpdateModlogListener extends BushListener { const logChannel = await moderator.guild.getLogChannel('moderation'); if (!logChannel) return; - const logEmbed = new Embed() + const logEmbed = new EmbedBuilder() .setColor(util.colors.Blurple) .setTimestamp() .setAuthor({ diff --git a/src/listeners/member-custom/bushUpdateSettings.ts b/src/listeners/member-custom/bushUpdateSettings.ts index 1ce8806..7c7828e 100644 --- a/src/listeners/member-custom/bushUpdateSettings.ts +++ b/src/listeners/member-custom/bushUpdateSettings.ts @@ -1,5 +1,5 @@ import { BushListener, type BushClientEvents } from '#lib'; -import { Embed } from 'discord.js'; +import { EmbedBuilder } from 'discord.js'; export default class BushUpdateSettingsListener extends BushListener { public constructor() { @@ -14,7 +14,7 @@ export default class BushUpdateSettingsListener extends BushListener { const logChannel = await guild.getLogChannel('moderation'); if (!logChannel) return; - const logEmbed = new Embed().setColor(util.colors.Blurple).setTimestamp(); + const logEmbed = new EmbedBuilder().setColor(util.colors.Blurple).setTimestamp(); if (moderator) logEmbed.setAuthor({ diff --git a/src/listeners/member-custom/bushWarn.ts b/src/listeners/member-custom/bushWarn.ts index c22f61f..724a266 100644 --- a/src/listeners/member-custom/bushWarn.ts +++ b/src/listeners/member-custom/bushWarn.ts @@ -1,5 +1,5 @@ import { BushListener, type BushClientEvents } from '#lib'; -import { Embed, GuildMember } from 'discord.js'; +import { EmbedBuilder, GuildMember } from 'discord.js'; export default class BushWarnListener extends BushListener { public constructor() { @@ -15,7 +15,7 @@ export default class BushWarnListener extends BushListener { if (!logChannel) return; const user = victim instanceof GuildMember ? victim.user : victim; - const logEmbed = new Embed() + const logEmbed = new EmbedBuilder() .setColor(util.colors.Yellow) .setTimestamp() .setFooter({ text: `CaseID: ${caseID}` }) diff --git a/src/listeners/message/blacklistedFile.ts b/src/listeners/message/blacklistedFile.ts index 77c4971..a6216a5 100644 --- a/src/listeners/message/blacklistedFile.ts +++ b/src/listeners/message/blacklistedFile.ts @@ -67,7 +67,6 @@ export default class BlacklistedFileListener extends BushListener { public override async exec(...[message]: BushClientEvents['messageCreate']) { if (!message.guild || !(await message.guild.hasFeature('blacklistedFile'))) return; - // eslint-disable-next-line deprecation/deprecation // const embedAttachments = message.embeds.filter((e) => ['image', 'video', 'gifv'].includes(e.type)); const foundEmojis = [...message.content.matchAll(/<(?<animated>a?):\w+:(?<id>\d+)>/g)]; if (message.attachments.size + /* embedAttachments.length + */ foundEmojis.length < 1) return; diff --git a/src/listeners/message/directMessage.ts b/src/listeners/message/directMessage.ts index 575fbda..dd0c8ae 100644 --- a/src/listeners/message/directMessage.ts +++ b/src/listeners/message/directMessage.ts @@ -1,5 +1,5 @@ import { BushListener, type BushClientEvents } from '#lib'; -import { ChannelType, Embed } from 'discord.js'; +import { ChannelType, EmbedBuilder } from 'discord.js'; export default class DirectMessageListener extends BushListener { public constructor() { @@ -14,7 +14,7 @@ export default class DirectMessageListener extends BushListener { if (message.channel.type === ChannelType.DM) { if (!(message.author.id == client.user!.id) && message.author.bot) return; if (client.cache.global.blacklistedUsers.includes(message.author.id)) return; - const dmLogEmbed = new Embed().setTimestamp().setFooter({ text: `User ID • ${message.channel.recipientId}` }); + const dmLogEmbed = new EmbedBuilder().setTimestamp().setFooter({ text: `User ID • ${message.channel.recipientId}` }); if (message.author.id != client.user!.id) { dmLogEmbed diff --git a/src/listeners/other/consoleListener.ts b/src/listeners/other/consoleListener.ts index 15461f2..0c30724 100644 --- a/src/listeners/other/consoleListener.ts +++ b/src/listeners/other/consoleListener.ts @@ -25,7 +25,7 @@ import { promisify } from 'util'; Interaction, Message, ActionRow, - MessageAttachment, + Attachment, ButtonComponent, MessageCollector, InteractionCollector, diff --git a/src/listeners/track-manual-punishments/modlogSyncBan.ts b/src/listeners/track-manual-punishments/modlogSyncBan.ts index b1bdcee..106224a 100644 --- a/src/listeners/track-manual-punishments/modlogSyncBan.ts +++ b/src/listeners/track-manual-punishments/modlogSyncBan.ts @@ -1,6 +1,7 @@ import { BushListener, BushUser, Moderation, ModLogType, Time, type BushClientEvents } from '#lib'; -import { AuditLogEvent } from 'discord-api-types/v9'; -import { Embed, PermissionFlagsBits } from 'discord.js'; +import { EmbedBuilder } from '@discordjs/builders'; +import { AuditLogEvent } from 'discord-api-types/v10'; +import { PermissionFlagsBits } from 'discord.js'; export default class ModlogSyncBanListener extends BushListener { public constructor() { @@ -51,7 +52,7 @@ export default class ModlogSyncBanListener extends BushListener { const logChannel = await ban.guild.getLogChannel('moderation'); if (!logChannel) return; - const logEmbed = new Embed() + const logEmbed = new EmbedBuilder() .setColor(util.colors.Red) .setTimestamp() .setFooter({ text: `CaseID: ${log.id}` }) diff --git a/src/listeners/track-manual-punishments/modlogSyncKick.ts b/src/listeners/track-manual-punishments/modlogSyncKick.ts index 59b43bc..cff397b 100644 --- a/src/listeners/track-manual-punishments/modlogSyncKick.ts +++ b/src/listeners/track-manual-punishments/modlogSyncKick.ts @@ -1,6 +1,6 @@ import { BushListener, BushUser, Moderation, ModLogType, Time, type BushClientEvents } from '#lib'; -import { AuditLogEvent } from 'discord-api-types/v9'; -import { Embed, PermissionFlagsBits } from 'discord.js'; +import { AuditLogEvent } from 'discord-api-types/v10'; +import { EmbedBuilder, PermissionFlagsBits } from 'discord.js'; export default class ModlogSyncKickListener extends BushListener { public constructor() { @@ -51,7 +51,7 @@ export default class ModlogSyncKickListener extends BushListener { const logChannel = await member.guild.getLogChannel('moderation'); if (!logChannel) return; - const logEmbed = new Embed() + const logEmbed = new EmbedBuilder() .setColor(util.colors.Red) .setTimestamp() .setFooter({ text: `CaseID: ${log.id}` }) diff --git a/src/listeners/track-manual-punishments/modlogSyncTimeout.ts b/src/listeners/track-manual-punishments/modlogSyncTimeout.ts index 8ad8b79..57e7ae6 100644 --- a/src/listeners/track-manual-punishments/modlogSyncTimeout.ts +++ b/src/listeners/track-manual-punishments/modlogSyncTimeout.ts @@ -1,6 +1,6 @@ import { BushListener, BushUser, Moderation, ModLogType, Time, type BushClientEvents } from '#lib'; -import { AuditLogEvent } from 'discord-api-types/v9'; -import { Embed, PermissionFlagsBits } from 'discord.js'; +import { AuditLogEvent } from 'discord-api-types/v10'; +import { EmbedBuilder, PermissionFlagsBits } from 'discord.js'; export default class ModlogSyncTimeoutListener extends BushListener { public constructor() { @@ -56,7 +56,7 @@ export default class ModlogSyncTimeoutListener extends BushListener { const logChannel = await newMember.guild.getLogChannel('moderation'); if (!logChannel) return; - const logEmbed = new Embed() + const logEmbed = new EmbedBuilder() .setColor(util.colors[newTime ? 'Orange' : 'Green']) .setTimestamp() .setFooter({ text: `CaseID: ${log.id}` }) diff --git a/src/listeners/track-manual-punishments/modlogSyncUnban.ts b/src/listeners/track-manual-punishments/modlogSyncUnban.ts index 1c5de1d..f7b9730 100644 --- a/src/listeners/track-manual-punishments/modlogSyncUnban.ts +++ b/src/listeners/track-manual-punishments/modlogSyncUnban.ts @@ -1,6 +1,7 @@ import { BushListener, BushUser, Moderation, ModLogType, Time, type BushClientEvents } from '#lib'; -import { AuditLogEvent } from 'discord-api-types/v9'; -import { Embed, PermissionFlagsBits } from 'discord.js'; +import { EmbedBuilder } from '@discordjs/builders'; +import { AuditLogEvent } from 'discord-api-types/v10'; +import { PermissionFlagsBits } from 'discord.js'; export default class ModlogSyncUnbanListener extends BushListener { public constructor() { @@ -50,7 +51,7 @@ export default class ModlogSyncUnbanListener extends BushListener { const logChannel = await ban.guild.getLogChannel('moderation'); if (!logChannel) return; - const logEmbed = new Embed() + const logEmbed = new EmbedBuilder() .setColor(util.colors.Orange) .setTimestamp() .setFooter({ text: `CaseID: ${log.id}` }) diff --git a/src/listeners/ws/INTERACTION_CREATE.ts b/src/listeners/ws/INTERACTION_CREATE.ts index c245418..76b5a0e 100644 --- a/src/listeners/ws/INTERACTION_CREATE.ts +++ b/src/listeners/ws/INTERACTION_CREATE.ts @@ -1,4 +1,5 @@ import { BushListener, BushUser, Moderation, ModLog, PunishmentTypePresent } from '#lib'; +import { EmbedBuilder } from '@discordjs/builders'; import assert from 'assert'; import { APIEmbed, @@ -14,8 +15,8 @@ import { InteractionType, Routes, TextInputStyle -} from 'discord-api-types/v9'; -import { ActionRow, ButtonComponent, Embed, Snowflake } from 'discord.js'; +} from 'discord-api-types/v10'; +import { ActionRowBuilder, ButtonBuilder, Snowflake } from 'discord.js'; export default class WsInteractionCreateListener extends BushListener { public constructor() { @@ -192,7 +193,7 @@ export default class WsInteractionCreateListener extends BushListener { const caseId = await ModLog.findOne({ where: { user: userId, guild: guildId, id: modlogCase } }); - const embed = new Embed() + const embed = new EmbedBuilder() .setTitle(`${util.capitalize(punishment)} Appeal`) .setColor(util.colors.newBlurple) .setTimestamp() @@ -213,14 +214,14 @@ export default class WsInteractionCreateListener extends BushListener { .toJSON() as APIEmbed; const components = [ - new ActionRow({ + new ActionRowBuilder<ButtonBuilder>({ components: [ - new ButtonComponent({ + new ButtonBuilder({ customId: `appeal_accept;${punishment};${guildId};${userId};${modlogCase}`, label: 'Accept', style: ButtonStyle.Success }).toJSON(), - new ButtonComponent({ + new ButtonBuilder({ customId: `appeal_deny;${punishment};${guildId};${userId};${modlogCase}`, label: 'Deny', style: ButtonStyle.Danger |