diff options
32 files changed, 328 insertions, 220 deletions
diff --git a/package.json b/package.json index 0beb6ff..f7fa4d5 100644 --- a/package.json +++ b/package.json @@ -50,15 +50,14 @@ "deploy:all": "yarn beta && pm2 deploy ecosystem.config.cjs production && pm2 deploy ecosystem.config.cjs beta" }, "dependencies": { - "@discordjs/rest": "npm:@notenoughupdates/rest@dev", "@notenoughupdates/discord.js-minesweeper": "^1.0.10", "@notenoughupdates/events-intercept": "^3.0.1", "@notenoughupdates/humanize-duration": "^4.0.1", "@notenoughupdates/simplify-number": "^1.0.1", "@notenoughupdates/wolfram-alpha-api": "^1.0.1", - "@sentry/integrations": "^6.17.4", - "@sentry/node": "^6.17.4", - "@sentry/tracing": "^6.17.4", + "@sentry/integrations": "^6.17.6", + "@sentry/node": "^6.17.6", + "@sentry/tracing": "^6.17.6", "canvas": "^2.9.0", "chalk": "^5.0.0", "deep-lock": "^1.0.0", @@ -80,24 +79,24 @@ "sequelize": "6.13.0", "tinycolor2": "^1.4.2", "typescript": "^4.5.5", - "vm2": "^3.9.5" + "vm2": "^3.9.7" }, "devDependencies": { "@sapphire/snowflake": "^3.1.0", - "@sentry/types": "^6.17.4", + "@sentry/types": "^6.17.6", "@types/eslint": "^8.4.1", "@types/express": "^4.17.13", "@types/lodash": "^4.14.178", - "@types/node": "^17.0.15", + "@types/node": "^17.0.17", "@types/node-os-utils": "^1.2.0", "@types/numeral": "^2.0.2", "@types/pg": "^8.6.4", - "@types/prettier": "^2.4.3", + "@types/prettier": "^2.4.4", "@types/rimraf": "^3.0.2", "@types/tinycolor2": "^1.4.3", "@types/validator": "^13.7.1", - "@typescript-eslint/eslint-plugin": "^5.10.2", - "@typescript-eslint/parser": "^5.10.2", + "@typescript-eslint/eslint-plugin": "^5.11.0", + "@typescript-eslint/parser": "^5.11.0", "eslint": "^8.8.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-deprecation": "^1.3.2", diff --git a/src/lib/extensions/discord.js/BushGuild.ts b/src/lib/extensions/discord.js/BushGuild.ts index b13d0f8..93875b8 100644 --- a/src/lib/extensions/discord.js/BushGuild.ts +++ b/src/lib/extensions/discord.js/BushGuild.ts @@ -371,7 +371,7 @@ export class BushGuild extends Guild { author: { name: moderator.user.tag, icon_url: moderator.displayAvatarURL() }, title: `This channel has been ${options.unlock ? 'un' : ''}locked`, description: options.reason ?? 'No reason provided', - color: options.unlock ? util.colors.GREEN : util.colors.RED, + color: options.unlock ? util.colors.Green : util.colors.Red, timestamp: new Date().toISOString() } ] diff --git a/src/lib/extensions/discord.js/BushGuildChannelManager.ts b/src/lib/extensions/discord.js/BushGuildChannelManager.ts index 029f7d3..91bff07 100644 --- a/src/lib/extensions/discord.js/BushGuildChannelManager.ts +++ b/src/lib/extensions/discord.js/BushGuildChannelManager.ts @@ -2,12 +2,19 @@ import type { BushFetchedThreads, BushGuild, BushGuildBasedChannel, + BushGuildChannel, BushMappedGuildChannelTypes, BushNonThreadGuildBasedChannel, - BushStoreChannel + BushStoreChannel, + BushTextChannel } from '#lib'; import { CachedManager, + ChannelData, + ChannelType, + ChannelWebhookCreateOptions, + SetChannelPositionOptions, + Webhook, type BaseFetchOptions, type ChannelPosition, type Collection, @@ -59,27 +66,70 @@ export declare class BushGuildChannelManager * }, * ], * }) - * @deprecated See [Self-serve Game Selling Deprecation](https://support-dev.discord.com/hc/en-us/articles/4414590563479) for more information */ - // eslint-disable-next-line deprecation/deprecation - public create(name: string, options: GuildChannelCreateOptions & { type: 'GuildStore' }): Promise<BushStoreChannel>; + public create<T extends Exclude<GuildChannelTypes, ChannelType.GuildStore>>( + name: string, + options: GuildChannelCreateOptions & { type: T } + ): Promise<BushMappedGuildChannelTypes[T]>; /** * Creates a new channel in the guild. * @param name The name of the new channel * @param options Options for creating the new channel + * @example + * // Create a new text channel + * guild.channels.create('new-general', { reason: 'Needed a cool new channel' }) + * .then(console.log) + * .catch(console.error); + * @example + * // Create a new channel with permission overwrites + * guild.channels.create('new-voice', { + * type: 'GuildVoice', + * permissionOverwrites: [ + * { + * id: message.author.id, + * deny: [PermissionFlagsBits.ViewChannel], + * }, + * ], + * }) + * @deprecated See [Self-serve Game Selling Deprecation](https://support-dev.discord.com/hc/en-us/articles/4414590563479) for more information */ - public create<T extends GuildChannelTypes>( + public create( name: string, - options: GuildChannelCreateOptions & { type: T } - ): Promise<BushMappedGuildChannelTypes[T]>; + options: GuildChannelCreateOptions & { type: ChannelType.GuildStore } + ): // eslint-disable-next-line deprecation/deprecation + Promise<BushStoreChannel>; + public create(name: string, options?: GuildChannelCreateOptions): Promise<BushTextChannel>; /** - * Creates a new channel in the guild. - * @param name The name of the new channel - * @param options Options for creating the new channel + * Creates a webhook for the channel. + * @param channel The channel to create the webhook for + * @param name The name of the webhook + * @param options Options for creating the webhook + * @returns Returns the created Webhook + * @example + * // Create a webhook for the current channel + * guild.channels.createWebhook('222197033908436994', 'Snek', { + * avatar: 'https://i.imgur.com/mI8XcpG.jpg', + * reason: 'Needed a cool new Webhook' + * }) + * .then(console.log) + * .catch(console.error) */ - public create(name: string, options: GuildChannelCreateOptions): Promise<BushNonThreadGuildBasedChannel>; + public createWebhook(channel: GuildChannelResolvable, name: string, options?: ChannelWebhookCreateOptions): Promise<Webhook>; + + /** + * Edits the channel. + * @param channel The channel to edit + * @param data The new data for the channel + * @param reason Reason for editing this channel + * @example + * // Edit a channel + * guild.channels.edit('222197033908436994', { name: 'new-channel' }) + * .then(console.log) + * .catch(console.error); + */ + public edit(channel: GuildChannelResolvable, data: ChannelData, reason?: string): Promise<BushGuildChannel>; /** * Obtains one or more guild channels from Discord, or the channel cache if they're already available. @@ -100,6 +150,34 @@ export declare class BushGuildChannelManager public fetch(id?: undefined, options?: BaseFetchOptions): Promise<Collection<Snowflake, BushNonThreadGuildBasedChannel>>; /** + * Fetches all webhooks for the channel. + * @param channel The channel to fetch webhooks for + * @example + * // Fetch webhooks + * guild.channels.fetchWebhooks('769862166131245066') + * .then(hooks => console.log(`This channel has ${hooks.size} hooks`)) + * .catch(console.error); + */ + public fetchWebhooks(channel: GuildChannelResolvable): Promise<Collection<Snowflake, Webhook>>; + + /** + * Sets a new position for the guild channel. + * @param channel The channel to set the position for + * @param position The new position for the guild channel + * @param options Options for setting position + * @example + * // Set a new channel position + * guild.channels.setPosition('222078374472843266', 2) + * .then(newChannel => console.log(`Channel's new position is ${newChannel.position}`)) + * .catch(console.error); + */ + public setPosition( + channel: GuildChannelResolvable, + position: number, + options?: SetChannelPositionOptions + ): Promise<BushGuildChannel>; + + /** * Batch-updates the guild's channels' positions. * <info>Only one channel's parent can be changed at a time</info> * @param channelPositions Channel positions to update @@ -120,4 +198,16 @@ export declare class BushGuildChannelManager * .catch(console.error); */ public fetchActiveThreads(cache?: boolean): Promise<BushFetchedThreads>; + + /** + * Deletes the channel. + * @param channel The channel to delete + * @param reason Reason for deleting this channel + * @example + * // Delete the channel + * guild.channels.delete('858850993013260338', 'making room for new channels') + * .then(console.log) + * .catch(console.error); + */ + public delete(channel: GuildChannelResolvable, reason?: string): Promise<void>; } diff --git a/src/lib/extensions/discord.js/BushGuildMember.ts b/src/lib/extensions/discord.js/BushGuildMember.ts index ab6cd65..84fdf13 100644 --- a/src/lib/extensions/discord.js/BushGuildMember.ts +++ b/src/lib/extensions/discord.js/BushGuildMember.ts @@ -1123,7 +1123,7 @@ export type TimeoutResponse = ValueOf<typeof timeoutResponse>; */ export type RemoveTimeoutResponse = ValueOf<typeof removeTimeoutResponse>; -export type PartialBushGuildMember = Partialize<BushGuildMember, 'joinedAt' | 'joinedTimestamp'>; +export type PartialBushGuildMember = Partialize<BushGuildMember, 'joinedAt' | 'joinedTimestamp' | 'pending'>; /** * @typedef {BushClientEvents} VSCodePleaseDontRemove diff --git a/src/lib/utils/BushConstants.ts b/src/lib/utils/BushConstants.ts index 5b2b2e6..4327fec 100644 --- a/src/lib/utils/BushConstants.ts +++ b/src/lib/utils/BushConstants.ts @@ -1,4 +1,4 @@ -import { Constants } from 'discord.js'; +import { Colors } from 'discord.js'; import { BushClientUtil } from '../extensions/discord-akairo/BushClientUtil.js'; const rawCapeUrl = 'https://raw.githubusercontent.com/NotEnoughUpdates/capes/master/'; @@ -107,7 +107,7 @@ export class BushConstants { darkGray: 0x7a7a7a, black: 0x000000, orange: 0xe86100, - ...Constants.Colors + ...Colors } as const); // Somewhat stolen from @Mzato0001 diff --git a/src/listeners/bush/joinAutoBan.ts b/src/listeners/bush/joinAutoBan.ts index 5ded5b4..c258877 100644 --- a/src/listeners/bush/joinAutoBan.ts +++ b/src/listeners/bush/joinAutoBan.ts @@ -37,7 +37,7 @@ export default class JoinAutoBanListener extends BushListener { { title: 'Name Auto Ban - User Join', description: `**User:** ${member.user} (${member.user.tag})\n **Action:** Banned for blacklisted name.`, - color: client.consts.colors.red, + color: util.colors.red, author: { name: member.user.tag, icon_url: member.displayAvatarURL() diff --git a/src/listeners/bush/userUpdateAutoBan.ts b/src/listeners/bush/userUpdateAutoBan.ts index 97fcf48..e3fba02 100644 --- a/src/listeners/bush/userUpdateAutoBan.ts +++ b/src/listeners/bush/userUpdateAutoBan.ts @@ -43,7 +43,7 @@ export default class UserUpdateAutoBanListener extends BushListener { { title: 'Name Auto Ban - User Update', description: `**User:** ${member.user} (${member.user.tag})\n **Action:** Banned for using blacklisted name.`, - color: client.consts.colors.red, + color: util.colors.red, author: { name: member.user.tag, icon_url: member.displayAvatarURL() diff --git a/src/listeners/guild-custom/bushLockdown.ts b/src/listeners/guild-custom/bushLockdown.ts index 6a075b4..badbb39 100644 --- a/src/listeners/guild-custom/bushLockdown.ts +++ b/src/listeners/guild-custom/bushLockdown.ts @@ -15,7 +15,7 @@ export default class BushLockdownListener extends BushListener { if (!logChannel) return; const logEmbed = new Embed() - .setColor(util.colors.BLURPLE) + .setColor(util.colors.Blurple) .setTimestamp() .addField({ name: '**Action**', value: `${'Lockdown'}` }) .addField({ name: '**Moderator**', value: `${moderator} (${moderator.user.tag})` }) diff --git a/src/listeners/guild-custom/bushUnlockdown.ts b/src/listeners/guild-custom/bushUnlockdown.ts index 6c87678..c7d9158 100644 --- a/src/listeners/guild-custom/bushUnlockdown.ts +++ b/src/listeners/guild-custom/bushUnlockdown.ts @@ -15,7 +15,7 @@ export default class BushUnlockdownListener extends BushListener { if (!logChannel) return; const logEmbed = new Embed() - .setColor(util.colors.BLURPLE) + .setColor(util.colors.Blurple) .setTimestamp() .addField({ name: '**Action**', value: `${'Unlockdown'}` }) .addField({ name: '**Moderator**', value: `${moderator} (${moderator.user.tag})` }) diff --git a/src/listeners/guild/guildCreate.ts b/src/listeners/guild/guildCreate.ts index 0e2540f..56cd5df 100644 --- a/src/listeners/guild/guildCreate.ts +++ b/src/listeners/guild/guildCreate.ts @@ -19,7 +19,7 @@ export default class GuildCreateListener extends BushListener { return await channel.send({ embeds: [ { - color: util.colors.GREEN, + color: util.colors.Green, description: `${util.emojis.join} Joined ${util.format.input( guild.name )} with **${guild.memberCount?.toLocaleString()}** members. I am now in **${client.guilds.cache.size}** guilds.`, diff --git a/src/listeners/guild/guildDelete.ts b/src/listeners/guild/guildDelete.ts index 2af2295..054c5e0 100644 --- a/src/listeners/guild/guildDelete.ts +++ b/src/listeners/guild/guildDelete.ts @@ -17,7 +17,7 @@ export default class GuildDeleteListener extends BushListener { return await channel.send({ embeds: [ { - color: util.colors.RED, + color: util.colors.Red, description: `${util.emojis.leave} Left ${util.format.input( guild.name )} with **${guild.memberCount?.toLocaleString()}** members. I am now in **${client.guilds.cache.size}** guilds.`, diff --git a/src/listeners/member-custom/bushBan.ts b/src/listeners/member-custom/bushBan.ts index b58f661..12e8694 100644 --- a/src/listeners/member-custom/bushBan.ts +++ b/src/listeners/member-custom/bushBan.ts @@ -16,7 +16,7 @@ export default class BushBanListener extends BushListener { const user = victim instanceof GuildMember ? victim.user : victim; const logEmbed = new Embed() - .setColor(util.colors.RED) + .setColor(util.colors.Red) .setTimestamp() .setFooter({ text: `CaseID: ${caseID}` }) .setAuthor({ name: user.tag, iconURL: user.avatarURL({ extension: 'png', size: 4096 }) ?? undefined }) diff --git a/src/listeners/member-custom/bushBlock.ts b/src/listeners/member-custom/bushBlock.ts index 2d023c4..e35b5a3 100644 --- a/src/listeners/member-custom/bushBlock.ts +++ b/src/listeners/member-custom/bushBlock.ts @@ -18,7 +18,7 @@ export default class BushBlockListener extends BushListener { const user = victim instanceof GuildMember ? victim.user : victim; const logEmbed = new Embed() - .setColor(util.colors.PURPLE) + .setColor(util.colors.Purple) .setTimestamp() .setFooter({ text: `CaseID: ${caseID}` }) .setAuthor({ name: user.tag, iconURL: user.avatarURL({ extension: 'png', size: 4096 }) ?? undefined }) diff --git a/src/listeners/member-custom/bushKick.ts b/src/listeners/member-custom/bushKick.ts index 50af0af..97db7e4 100644 --- a/src/listeners/member-custom/bushKick.ts +++ b/src/listeners/member-custom/bushKick.ts @@ -16,7 +16,7 @@ export default class BushKickListener extends BushListener { const user = victim instanceof GuildMember ? victim.user : victim; const logEmbed = new Embed() - .setColor(util.colors.RED) + .setColor(util.colors.Red) .setTimestamp() .setFooter({ text: `CaseID: ${caseID}` }) .setAuthor({ name: user.tag, iconURL: user.avatarURL({ extension: 'png', size: 4096 }) ?? undefined }) diff --git a/src/listeners/member-custom/bushMute.ts b/src/listeners/member-custom/bushMute.ts index bfd1fc0..8b80658 100644 --- a/src/listeners/member-custom/bushMute.ts +++ b/src/listeners/member-custom/bushMute.ts @@ -16,7 +16,7 @@ export default class BushMuteListener extends BushListener { const user = victim instanceof GuildMember ? victim.user : victim; const logEmbed = new Embed() - .setColor(util.colors.ORANGE) + .setColor(util.colors.Orange) .setTimestamp() .setFooter({ text: `CaseID: ${caseID}` }) .setAuthor({ name: user.tag, iconURL: user.avatarURL({ extension: 'png', size: 4096 }) ?? undefined }) diff --git a/src/listeners/member-custom/bushPunishRole.ts b/src/listeners/member-custom/bushPunishRole.ts index 112c4df..1c9dcce 100644 --- a/src/listeners/member-custom/bushPunishRole.ts +++ b/src/listeners/member-custom/bushPunishRole.ts @@ -16,7 +16,7 @@ export default class BushPunishRoleListener extends BushListener { const user = victim instanceof GuildMember ? victim.user : victim; const logEmbed = new Embed() - .setColor(util.colors.YELLOW) + .setColor(util.colors.Yellow) .setTimestamp() .setFooter({ text: `CaseID: ${caseID}` }) .setAuthor({ name: user.tag, iconURL: user.avatarURL({ extension: 'png', size: 4096 }) ?? undefined }) diff --git a/src/listeners/member-custom/bushPunishRoleRemove.ts b/src/listeners/member-custom/bushPunishRoleRemove.ts index dadc841..5039370 100644 --- a/src/listeners/member-custom/bushPunishRoleRemove.ts +++ b/src/listeners/member-custom/bushPunishRoleRemove.ts @@ -16,7 +16,7 @@ export default class BushPunishRoleRemoveListener extends BushListener { const user = victim instanceof GuildMember ? victim.user : victim; const logEmbed = new Embed() - .setColor(util.colors.GREEN) + .setColor(util.colors.Green) .setTimestamp() .setFooter({ text: `CaseID: ${caseID}` }) .setAuthor({ name: user.tag, iconURL: user.avatarURL({ extension: 'png', size: 4096 }) ?? undefined }) diff --git a/src/listeners/member-custom/bushPurge.ts b/src/listeners/member-custom/bushPurge.ts index 72286a0..6f61fea 100644 --- a/src/listeners/member-custom/bushPurge.ts +++ b/src/listeners/member-custom/bushPurge.ts @@ -24,7 +24,7 @@ export default class BushPurgeListener extends BushListener { const haste = await util.inspectCleanRedactHaste(mappedMessages); const logEmbed = new Embed() - .setColor(util.colors.DARK_PURPLE) + .setColor(util.colors.DarkPurple) .setTimestamp() .setFooter({ text: `${messages.size.toLocaleString()} Messages` }) .setAuthor({ name: moderator.tag, iconURL: moderator.avatarURL({ extension: 'png', size: 4096 }) ?? undefined }) diff --git a/src/listeners/member-custom/bushRemoveTimeout.ts b/src/listeners/member-custom/bushRemoveTimeout.ts index e3e2e09..bb6d463 100644 --- a/src/listeners/member-custom/bushRemoveTimeout.ts +++ b/src/listeners/member-custom/bushRemoveTimeout.ts @@ -16,7 +16,7 @@ export default class BushRemoveTimeoutListener extends BushListener { const user = victim instanceof GuildMember ? victim.user : victim; const logEmbed = new Embed() - .setColor(util.colors.GREEN) + .setColor(util.colors.Green) .setTimestamp() .setFooter({ text: `CaseID: ${caseID}` }) .setAuthor({ name: user.tag, iconURL: user.avatarURL({ extension: 'png', size: 4096 }) ?? undefined }) diff --git a/src/listeners/member-custom/bushTimeout.ts b/src/listeners/member-custom/bushTimeout.ts index d7f8000..2887104 100644 --- a/src/listeners/member-custom/bushTimeout.ts +++ b/src/listeners/member-custom/bushTimeout.ts @@ -18,7 +18,7 @@ export default class BushTimeoutListener extends BushListener { const user = victim instanceof GuildMember ? victim.user : victim; const logEmbed = new Embed() - .setColor(util.colors.ORANGE) + .setColor(util.colors.Orange) .setTimestamp() .setFooter({ text: `CaseID: ${caseID}` }) .setAuthor({ name: user.tag, iconURL: user.avatarURL({ extension: 'png', size: 4096 }) ?? undefined }) diff --git a/src/listeners/member-custom/bushUnban.ts b/src/listeners/member-custom/bushUnban.ts index bee8032..a3bc7cf 100644 --- a/src/listeners/member-custom/bushUnban.ts +++ b/src/listeners/member-custom/bushUnban.ts @@ -16,7 +16,7 @@ export default class BushUnbanListener extends BushListener { const user = victim instanceof GuildMember ? victim.user : victim; const logEmbed = new Embed() - .setColor(util.colors.GREEN) + .setColor(util.colors.Green) .setTimestamp() .setFooter({ text: `CaseID: ${caseID}` }) .setAuthor({ name: user.tag, iconURL: user.avatarURL({ extension: 'png', size: 4096 }) ?? undefined }) diff --git a/src/listeners/member-custom/bushUnblock.ts b/src/listeners/member-custom/bushUnblock.ts index dd076c6..fde3ad8 100644 --- a/src/listeners/member-custom/bushUnblock.ts +++ b/src/listeners/member-custom/bushUnblock.ts @@ -16,7 +16,7 @@ export default class BushUnblockListener extends BushListener { const user = victim instanceof GuildMember ? victim.user : victim; const logEmbed = new Embed() - .setColor(util.colors.GREEN) + .setColor(util.colors.Green) .setTimestamp() .setFooter({ text: `CaseID: ${caseID}` }) .setAuthor({ name: user.tag, iconURL: user.avatarURL({ extension: 'png', size: 4096 }) ?? undefined }) diff --git a/src/listeners/member-custom/bushUnmute.ts b/src/listeners/member-custom/bushUnmute.ts index 573cbdc..ad9ae6e 100644 --- a/src/listeners/member-custom/bushUnmute.ts +++ b/src/listeners/member-custom/bushUnmute.ts @@ -16,7 +16,7 @@ export default class BushUnmuteListener extends BushListener { const user = victim instanceof GuildMember ? victim.user : victim; const logEmbed = new Embed() - .setColor(util.colors.GREEN) + .setColor(util.colors.Green) .setTimestamp() .setFooter({ text: `CaseID: ${caseID}` }) .setAuthor({ name: user.tag, iconURL: user.avatarURL({ extension: 'png', size: 4096 }) ?? undefined }) diff --git a/src/listeners/member-custom/bushUpdateModlog.ts b/src/listeners/member-custom/bushUpdateModlog.ts index d9e43aa..05a5f8e 100644 --- a/src/listeners/member-custom/bushUpdateModlog.ts +++ b/src/listeners/member-custom/bushUpdateModlog.ts @@ -15,7 +15,7 @@ export default class BushUpdateModlogListener extends BushListener { if (!logChannel) return; const logEmbed = new Embed() - .setColor(util.colors.BLURPLE) + .setColor(util.colors.Blurple) .setTimestamp() .setAuthor({ name: moderator.user.tag, diff --git a/src/listeners/member-custom/bushUpdateSettings.ts b/src/listeners/member-custom/bushUpdateSettings.ts index dbf3c9c..c4f71ff 100644 --- a/src/listeners/member-custom/bushUpdateSettings.ts +++ b/src/listeners/member-custom/bushUpdateSettings.ts @@ -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 Embed().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 cbcf8db..229438c 100644 --- a/src/listeners/member-custom/bushWarn.ts +++ b/src/listeners/member-custom/bushWarn.ts @@ -16,7 +16,7 @@ export default class BushWarnListener extends BushListener { const user = victim instanceof GuildMember ? victim.user : victim; const logEmbed = new Embed() - .setColor(util.colors.YELLOW) + .setColor(util.colors.Yellow) .setTimestamp() .setFooter({ text: `CaseID: ${caseID}` }) .setAuthor({ name: user.tag, iconURL: user.avatarURL({ extension: 'png', size: 4096 }) ?? undefined }) diff --git a/src/listeners/message/autoThread.ts b/src/listeners/message/autoThread.ts index aa17035..540f479 100644 --- a/src/listeners/message/autoThread.ts +++ b/src/listeners/message/autoThread.ts @@ -50,7 +50,7 @@ export default class autoThreadListener extends BushListener { .setDescription( `Welcome to Moulberry Bush Support:tm:\n\nPlease make sure you have the latest version found in <#693586404256645231>.\nAdditionally if you need help installing the mod be sure to read <#737444942724726915> for a guide on how to do so.` ) - .setColor(client.consts.colors.BLURPLE); + .setColor(util.colors.Blurple); void thread .send({ embeds: [embed] }) .then(() => diff --git a/src/listeners/track-manual-punishments/modlogSyncBan.ts b/src/listeners/track-manual-punishments/modlogSyncBan.ts index 6048235..9886530 100644 --- a/src/listeners/track-manual-punishments/modlogSyncBan.ts +++ b/src/listeners/track-manual-punishments/modlogSyncBan.ts @@ -52,7 +52,7 @@ export default class ModlogSyncBanListener extends BushListener { if (!logChannel) return; const logEmbed = new Embed() - .setColor(util.colors.RED) + .setColor(util.colors.Red) .setTimestamp() .setFooter({ text: `CaseID: ${log.id}` }) .setAuthor({ diff --git a/src/listeners/track-manual-punishments/modlogSyncKick.ts b/src/listeners/track-manual-punishments/modlogSyncKick.ts index 814b624..b7762db 100644 --- a/src/listeners/track-manual-punishments/modlogSyncKick.ts +++ b/src/listeners/track-manual-punishments/modlogSyncKick.ts @@ -52,7 +52,7 @@ export default class ModlogSyncKickListener extends BushListener { if (!logChannel) return; const logEmbed = new Embed() - .setColor(util.colors.RED) + .setColor(util.colors.Red) .setTimestamp() .setFooter({ text: `CaseID: ${log.id}` }) .setAuthor({ diff --git a/src/listeners/track-manual-punishments/modlogSyncTimeout.ts b/src/listeners/track-manual-punishments/modlogSyncTimeout.ts index 1289f4c..21dde1a 100644 --- a/src/listeners/track-manual-punishments/modlogSyncTimeout.ts +++ b/src/listeners/track-manual-punishments/modlogSyncTimeout.ts @@ -57,7 +57,7 @@ export default class ModlogSyncTimeoutListener extends BushListener { if (!logChannel) return; const logEmbed = new Embed() - .setColor(util.colors[newTime ? 'ORANGE' : 'GREEN']) + .setColor(util.colors[newTime ? 'Orange' : 'Green']) .setTimestamp() .setFooter({ text: `CaseID: ${log.id}` }) .setAuthor({ diff --git a/src/listeners/track-manual-punishments/modlogSyncUnban.ts b/src/listeners/track-manual-punishments/modlogSyncUnban.ts index a92c1e9..a268ef4 100644 --- a/src/listeners/track-manual-punishments/modlogSyncUnban.ts +++ b/src/listeners/track-manual-punishments/modlogSyncUnban.ts @@ -51,7 +51,7 @@ export default class ModlogSyncUnbanListener extends BushListener { if (!logChannel) return; const logEmbed = new Embed() - .setColor(util.colors.ORANGE) + .setColor(util.colors.Orange) .setTimestamp() .setFooter({ text: `CaseID: ${log.id}` }) .setAuthor({ @@ -6,37 +6,37 @@ __metadata: cacheKey: 8 "@babel/runtime@npm:^7.16.7": - version: 7.17.0 - resolution: "@babel/runtime@npm:7.17.0" + version: 7.17.2 + resolution: "@babel/runtime@npm:7.17.2" dependencies: regenerator-runtime: ^0.13.4 - checksum: 1864ac3c6aa061798c706ce858af311f06f6ad6efafc20cca7029fdaa9786c58ccaf5bdb8bd133cb505f27bed7659b65f1503b8da58adbd1eb88f7333644e6ed + checksum: a48702d271ecc59c09c397856407afa29ff980ab537b3da58eeee1aeaa0f545402d340a1680c9af58aec94dfdcbccfb6abb211991b74686a86d03d3f6956cacd languageName: node linkType: hard "@discordjs/builders@npm:^0.13.0-dev": - version: 0.13.0-dev.1644067366.5f4b44d - resolution: "@discordjs/builders@npm:0.13.0-dev.1644067366.5f4b44d" + version: 0.13.0-dev.1644408664.fe11ff5 + resolution: "@discordjs/builders@npm:0.13.0-dev.1644408664.fe11ff5" dependencies: "@sindresorhus/is": ^4.4.0 discord-api-types: ^0.26.1 ts-mixer: ^6.0.0 tslib: ^2.3.1 zod: ^3.11.6 - checksum: fc4dda961d4df92e3c85601c1cf0eb7ff0df7e33a858a2cf55393b4bbcde6434968a4625ef369fcfc835675543506bde035845181d2d6eb5d4127d9be55dc62c + checksum: ac70f545ffd87e3bc4f794e4bd759ec9dfdffd02bc46f8d06257166345c5cd18f28dd67c98e225c8882a9417f2b8c1abea1f44aeadb4432281eb733ac1e009e4 languageName: node linkType: hard "@discordjs/collection@npm:^0.6.0-dev": - version: 0.6.0-dev.1644067357.5f4b44d - resolution: "@discordjs/collection@npm:0.6.0-dev.1644067357.5f4b44d" - checksum: 419c84a767cc3abaa30c9248c16c4725867bd5779df56bb389ec87728eb20dd74460cd1d491768ded43511c220c829ea987d9ec8774c6ed78e7ab4623b26f417 + version: 0.6.0-dev.1644408625.fe11ff5 + resolution: "@discordjs/collection@npm:0.6.0-dev.1644408625.fe11ff5" + checksum: 8035fc07ad1d7a302c8c70f3ee18db479dc51e07e9680f764af9039c8086001665722bb222fb5ebde633ca85690aac536403e03ad5dbd5cd7ffdc86690759cee languageName: node linkType: hard -"@discordjs/rest@npm:@notenoughupdates/rest@dev": - version: 0.3.0-dev.1644086576.90b011b - resolution: "@notenoughupdates/rest@npm:0.3.0-dev.1644086576.90b011b" +"@discordjs/rest@npm:^0.3.0-dev": + version: 0.3.0-dev.1644408653.fe11ff5 + resolution: "@discordjs/rest@npm:0.3.0-dev.1644408653.fe11ff5" dependencies: "@discordjs/collection": ^0.6.0-dev "@sapphire/async-queue": ^1.2.0 @@ -46,7 +46,7 @@ __metadata: form-data: ^4.0.0 node-fetch: ^2.6.7 tslib: ^2.3.1 - checksum: 011c317c7155205e1280c6d543730db5a5f19282103804212c31248e0e0e5e752fc73dd4d67c91b4040ddb5e2c95941ff67a552b0b5a1837146b845f78be4fab + checksum: 7d09819bfb5ce2032e9b11cfbea257c09a11ba0d38993f725d6d201ef5fdd828fbd013ef9174984ffc7310e848d49ca7b9d3e36ec1c6f3d004bf2d14c77b9f3c languageName: node linkType: hard @@ -207,97 +207,97 @@ __metadata: languageName: node linkType: hard -"@sentry/core@npm:6.17.4": - version: 6.17.4 - resolution: "@sentry/core@npm:6.17.4" +"@sentry/core@npm:6.17.6": + version: 6.17.6 + resolution: "@sentry/core@npm:6.17.6" dependencies: - "@sentry/hub": 6.17.4 - "@sentry/minimal": 6.17.4 - "@sentry/types": 6.17.4 - "@sentry/utils": 6.17.4 + "@sentry/hub": 6.17.6 + "@sentry/minimal": 6.17.6 + "@sentry/types": 6.17.6 + "@sentry/utils": 6.17.6 tslib: ^1.9.3 - checksum: daf80e9b2df5acaf8eeafabfddf24d30b2f9ab981843e1b01120f428803dc71c58e761005eec17d9004ffb483c210118bad50d774a4042929f0d55d3fb476104 + checksum: 66909a0db7301553581e85fb3df2e4b1b2050dc19e24d806d4551c1b5eed14ffa95462053d8e0e3f81ad32da0871b94945abad9f44ad9d5a178ecbf4ced3b326 languageName: node linkType: hard -"@sentry/hub@npm:6.17.4": - version: 6.17.4 - resolution: "@sentry/hub@npm:6.17.4" +"@sentry/hub@npm:6.17.6": + version: 6.17.6 + resolution: "@sentry/hub@npm:6.17.6" dependencies: - "@sentry/types": 6.17.4 - "@sentry/utils": 6.17.4 + "@sentry/types": 6.17.6 + "@sentry/utils": 6.17.6 tslib: ^1.9.3 - checksum: 61c27230a87c071050730a0d8cbd9ae1f92c5007c9852900d288fed5bf35303bdba8acdcb6cad849540085ce81e072b89ba0e1ede249f6d940e81e06c6452af6 + checksum: 6446505332a3d2fc07e50f456dcf8782a0c457da75df30e426bbe1f3a39b309232560074b18bc2b0cd355bec4d3be5eb99f013ef9379aadead9373dd06a02f80 languageName: node linkType: hard -"@sentry/integrations@npm:^6.17.4": - version: 6.17.4 - resolution: "@sentry/integrations@npm:6.17.4" +"@sentry/integrations@npm:^6.17.6": + version: 6.17.6 + resolution: "@sentry/integrations@npm:6.17.6" dependencies: - "@sentry/types": 6.17.4 - "@sentry/utils": 6.17.4 + "@sentry/types": 6.17.6 + "@sentry/utils": 6.17.6 localforage: ^1.8.1 tslib: ^1.9.3 - checksum: 25587c4b1aa54b35cfba16eb3423f82a2a533a35cdec06a7a3aedf354d74e9ed32bdf5021a6589a3b94c69430a971322db4c380a52942f49be6f9ee9193bf141 + checksum: 1b64ed2038b08b305a37aece683d25f7c3ff93b7508c630be50b3416252c701bcd93f4e9ae4310e57e2db442602947a9ee72eb26067e1875da35dacde61e9884 languageName: node linkType: hard -"@sentry/minimal@npm:6.17.4": - version: 6.17.4 - resolution: "@sentry/minimal@npm:6.17.4" +"@sentry/minimal@npm:6.17.6": + version: 6.17.6 + resolution: "@sentry/minimal@npm:6.17.6" dependencies: - "@sentry/hub": 6.17.4 - "@sentry/types": 6.17.4 + "@sentry/hub": 6.17.6 + "@sentry/types": 6.17.6 tslib: ^1.9.3 - checksum: e67efeaf1be5eda8afc1a9254f485fdf861361cc007cf2da18aad09fd7bae98600c94f013e673e907551dda80bc2925353ace2c7709cac42ba2e1924b6da6f04 + checksum: c721f5306369569af43a0dbe4d612e8ff7b0fb228b01313060bd207276b3f2302c3227fd776db2b0920fcec8ab7ed308545c4bb2e1b5d54ee2a70addb6232f22 languageName: node linkType: hard -"@sentry/node@npm:^6.17.4": - version: 6.17.4 - resolution: "@sentry/node@npm:6.17.4" +"@sentry/node@npm:^6.17.6": + version: 6.17.6 + resolution: "@sentry/node@npm:6.17.6" dependencies: - "@sentry/core": 6.17.4 - "@sentry/hub": 6.17.4 - "@sentry/tracing": 6.17.4 - "@sentry/types": 6.17.4 - "@sentry/utils": 6.17.4 + "@sentry/core": 6.17.6 + "@sentry/hub": 6.17.6 + "@sentry/tracing": 6.17.6 + "@sentry/types": 6.17.6 + "@sentry/utils": 6.17.6 cookie: ^0.4.1 https-proxy-agent: ^5.0.0 lru_map: ^0.3.3 tslib: ^1.9.3 - checksum: 2d1f7844b14b145cf8233b8363fb43240805407d1ee89354184d91fa98ece7d6285453a2d56a8d2c0b6800e28c50a271ce26e7c668995c43dde3f472887958cc + checksum: 2d66c5797605fc1a3c76da775565dee49dcbbfb874eeeb98c1d3b624dc8861ae880204b63dba5cda274b62af4d3d0169180eeb139a4ed5a108ee3e137f656d2a languageName: node linkType: hard -"@sentry/tracing@npm:6.17.4, @sentry/tracing@npm:^6.17.4": - version: 6.17.4 - resolution: "@sentry/tracing@npm:6.17.4" +"@sentry/tracing@npm:6.17.6, @sentry/tracing@npm:^6.17.6": + version: 6.17.6 + resolution: "@sentry/tracing@npm:6.17.6" dependencies: - "@sentry/hub": 6.17.4 - "@sentry/minimal": 6.17.4 - "@sentry/types": 6.17.4 - "@sentry/utils": 6.17.4 + "@sentry/hub": 6.17.6 + "@sentry/minimal": 6.17.6 + "@sentry/types": 6.17.6 + "@sentry/utils": 6.17.6 tslib: ^1.9.3 - checksum: 4f630fece6ff9dd2d9d281ec9d70b30bb2c61ae4673c3780595fbbbc45d855478f4e8d26f1155769ea59fb476e1e9c70a252922992e7a55f935cbfc2696fe9c4 + checksum: 2f46a6f2a79152efc2639dc50e6df1c9b29db4f9bc7eaaae5251be7b998ecb7685fe003644b7b250637cdd8a3a30ab1dfe78687661ec726a1cb8016aafb0a154 languageName: node linkType: hard -"@sentry/types@npm:6.17.4, @sentry/types@npm:^6.17.4": - version: 6.17.4 - resolution: "@sentry/types@npm:6.17.4" - checksum: e2c514b42cb27143150bcbea3438e65b96deebf5804ffbe6d889c5997cd448ec61ed486a4b903fd57d7297cfcc9cb33d2dd0b3a394830a66fe3b99c0fee05aab +"@sentry/types@npm:6.17.6, @sentry/types@npm:^6.17.6": + version: 6.17.6 + resolution: "@sentry/types@npm:6.17.6" + checksum: c8b080202271f5cbacc91e070f6d02ce4fd87089e7ad038036b1b03b46340ed9e5edbea4ce47738107c547fd6aabd687ca376419dcb2343faad8a5f7b7de4873 languageName: node linkType: hard -"@sentry/utils@npm:6.17.4": - version: 6.17.4 - resolution: "@sentry/utils@npm:6.17.4" +"@sentry/utils@npm:6.17.6": + version: 6.17.6 + resolution: "@sentry/utils@npm:6.17.6" dependencies: - "@sentry/types": 6.17.4 + "@sentry/types": 6.17.6 tslib: ^1.9.3 - checksum: 9c82b947d20a5324573963517fbde006f4b2b9568a788bd24889451eb922e4c726ff239793380d5af1a255c915f86d0c22d118e83eeedb5e0ec61c1b742127e9 + checksum: b57ce769e41b98d93ba5ed719998b93fd93a52c9dd7465b19d44c82d2a0974e72eea417e1b97ca471cd6a81474e28aaf62eee8712d5adfb2b93f10c8ba881799 languageName: node linkType: hard @@ -375,9 +375,9 @@ __metadata: linkType: hard "@types/estree@npm:*": - version: 0.0.50 - resolution: "@types/estree@npm:0.0.50" - checksum: 9a2b6a4a8c117f34d08fbda5e8f69b1dfb109f7d149b60b00fd7a9fb6ac545c078bc590aa4ec2f0a256d680cf72c88b3b28b60c326ee38a7bc8ee1ee95624922 + version: 0.0.51 + resolution: "@types/estree@npm:0.0.51" + checksum: e56a3bcf759fd9185e992e7fdb3c6a5f81e8ff120e871641607581fb3728d16c811702a7d40fa5f869b7f7b4437ab6a87eb8d98ffafeee51e85bbe955932a189 languageName: node linkType: hard @@ -489,10 +489,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:^17.0.15": - version: 17.0.15 - resolution: "@types/node@npm:17.0.15" - checksum: aa64ecf4fbcf9888e794dcdc20e98c49cdcb102b17e57c44ca56943904732d6cc250e766f8448a3cd71d6a40a4b597bd83c565e5bd9b982733fa3f9813d5c291 +"@types/node@npm:*, @types/node@npm:^17.0.17": + version: 17.0.17 + resolution: "@types/node@npm:17.0.17" + checksum: 8ddba2829acdf1684fbd8fd248ec13f033efb70ecd1085677b547c40ef8e936a006b95eac3bdc28c47939c62526f3f027afeb4a930e30e4394923bbae4626476 languageName: node linkType: hard @@ -514,10 +514,10 @@ __metadata: languageName: node linkType: hard -"@types/prettier@npm:^2.4.3": - version: 2.4.3 - resolution: "@types/prettier@npm:2.4.3" - checksum: b240434daabac54700c862b0bb52a83fec396e0e9c847447119ba41fd8404d79aadfa174e6306fb094b29efadac586344b7606c3a71c286b71755ab2579d54df +"@types/prettier@npm:^2.4.4": + version: 2.4.4 + resolution: "@types/prettier@npm:2.4.4" + checksum: 2c2cc57efd49c7d8907415a72f96c84a6dd8696dd3bf8aa4ca3a667427bebf71cbfbc912673624bdfc935d272d1c008c639cf155f6449315990a4dc110f0d216 languageName: node linkType: hard @@ -587,13 +587,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^5.10.2": - version: 5.10.2 - resolution: "@typescript-eslint/eslint-plugin@npm:5.10.2" +"@typescript-eslint/eslint-plugin@npm:^5.11.0": + version: 5.11.0 + resolution: "@typescript-eslint/eslint-plugin@npm:5.11.0" dependencies: - "@typescript-eslint/scope-manager": 5.10.2 - "@typescript-eslint/type-utils": 5.10.2 - "@typescript-eslint/utils": 5.10.2 + "@typescript-eslint/scope-manager": 5.11.0 + "@typescript-eslint/type-utils": 5.11.0 + "@typescript-eslint/utils": 5.11.0 debug: ^4.3.2 functional-red-black-tree: ^1.0.1 ignore: ^5.1.8 @@ -606,53 +606,53 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 460808a3c7d0390a7dcc1b2e717c2c4e303a31f9161fbc8c4ecc7bec076285d636d505d2f1ca9932c7a7989ea0fc3a78023be9f342bd8c4bdfe4a9842d0c053a + checksum: fa546ba4397f3e693870c39d1e8df6feccb728a7092be6312b78806a64c4ff4648cff0462503d3e510e8b173b9704c19e78d2a7af790ab1c0309782e33a89c32 languageName: node linkType: hard "@typescript-eslint/experimental-utils@npm:^5.0.0": - version: 5.10.2 - resolution: "@typescript-eslint/experimental-utils@npm:5.10.2" + version: 5.11.0 + resolution: "@typescript-eslint/experimental-utils@npm:5.11.0" dependencies: - "@typescript-eslint/utils": 5.10.2 + "@typescript-eslint/utils": 5.11.0 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: 49945b0652d431d4caa3618807c69bd2585e38ffc31b72379d27f43213b793b1193948b2e23dac9aa0c7afe01d0d4dbef589a0a64caf514623b73ee89beb6a43 + checksum: aa74dab82946132cf2fc0b620e200e31a02021ba2459eafaba404c9be7f50b576fb09b359f5e45836ac6bbb85cc11fcafe3682bc92e1d1af38cf28e461066cc6 languageName: node linkType: hard -"@typescript-eslint/parser@npm:^5.10.2": - version: 5.10.2 - resolution: "@typescript-eslint/parser@npm:5.10.2" +"@typescript-eslint/parser@npm:^5.11.0": + version: 5.11.0 + resolution: "@typescript-eslint/parser@npm:5.11.0" dependencies: - "@typescript-eslint/scope-manager": 5.10.2 - "@typescript-eslint/types": 5.10.2 - "@typescript-eslint/typescript-estree": 5.10.2 + "@typescript-eslint/scope-manager": 5.11.0 + "@typescript-eslint/types": 5.11.0 + "@typescript-eslint/typescript-estree": 5.11.0 debug: ^4.3.2 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: c83e3afee090e9cc830d6c59cd87681a83ae95f2daa848040f2e67ef34f87c5ec707a571b3ccb31b67adc0447b22b62c048a6cb088e661801dacb9c2cf070a9c + checksum: 521b6e701d877dc0514c6a3992f4900aa6fea28ba7c0bc03c634dad2b50aa195401e45683dfebd9e8492a857cd84bba3b585d8fe8d0cd1d7e2720372c34c50a3 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.10.2": - version: 5.10.2 - resolution: "@typescript-eslint/scope-manager@npm:5.10.2" +"@typescript-eslint/scope-manager@npm:5.11.0": + version: 5.11.0 + resolution: "@typescript-eslint/scope-manager@npm:5.11.0" dependencies: - "@typescript-eslint/types": 5.10.2 - "@typescript-eslint/visitor-keys": 5.10.2 - checksum: 22c8ac9047a1a276e0b911eca0eee30c4f7f7089688dca36314da28143d349c504e542116d3e201d52da50b212f38b2125e3918e6ae2e2b0b57964fb1cdf8fcd + "@typescript-eslint/types": 5.11.0 + "@typescript-eslint/visitor-keys": 5.11.0 + checksum: bf7feaed495ed4cafa1b89a2b73781b30061d019e1c1b3765dc8006e7f36b537f6f451e37c77400067771318b4f0c5915804084dc6299ea7c6ecde2daf0aca1c languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.10.2": - version: 5.10.2 - resolution: "@typescript-eslint/type-utils@npm:5.10.2" +"@typescript-eslint/type-utils@npm:5.11.0": + version: 5.11.0 + resolution: "@typescript-eslint/type-utils@npm:5.11.0" dependencies: - "@typescript-eslint/utils": 5.10.2 + "@typescript-eslint/utils": 5.11.0 debug: ^4.3.2 tsutils: ^3.21.0 peerDependencies: @@ -660,23 +660,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 7732c826ef6c798af0f45b85f0389688e614de16c7c2c7e446a664787df360242cf2bc9d68d6ce1993f1bfc289b5d6a75a400fc968b7ded187c30c40f978de52 + checksum: fd570806d82874289ded6bfd90ff5414d4365b95b4a2e911f7ff2fee6e2c7675d0f2f71580c24cb8be733c3dfe2cd33eedff99ae2aa50f61b1b5af76499074eb languageName: node linkType: hard -"@typescript-eslint/types@npm:5.10.2": - version: 5.10.2 - resolution: "@typescript-eslint/types@npm:5.10.2" - checksum: fa44dbd31d12f16ada6a6e7dba61ff90bf955b400f314f7378d9775cc8e13ef5da3318e89a90c3c3f75d50179e6be104ed8f90d4e77a02d6f7793b346bf25f15 +"@typescript-eslint/types@npm:5.11.0": + version: 5.11.0 + resolution: "@typescript-eslint/types@npm:5.11.0" + checksum: b1531481da75a6c89510ad03f3db68e4797b25438bb902ee322bd1c154b83396016271cc00356dcdbc300a8ee421493aae803b8c716f36d7b4808fe045ae3a2a languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.10.2": - version: 5.10.2 - resolution: "@typescript-eslint/typescript-estree@npm:5.10.2" +"@typescript-eslint/typescript-estree@npm:5.11.0": + version: 5.11.0 + resolution: "@typescript-eslint/typescript-estree@npm:5.11.0" dependencies: - "@typescript-eslint/types": 5.10.2 - "@typescript-eslint/visitor-keys": 5.10.2 + "@typescript-eslint/types": 5.11.0 + "@typescript-eslint/visitor-keys": 5.11.0 debug: ^4.3.2 globby: ^11.0.4 is-glob: ^4.0.3 @@ -685,33 +685,33 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 2fdad1448578ee5c7f5876c998de50e2fa5fd6eed9effbfa9b0cf2579afe195964f0e4ebaa5d94ae228096cddf016500e9c8cc2f60c3dff981f09ebb42e5de53 + checksum: 7bda55501c586efd7f8065b4158016486d8af92b8419931fbea7cec9bfe074075de8cdebec8baa1ac8a5c3f973599b9dd44a51fced1792176e49cd60cc8e5442 languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.10.2": - version: 5.10.2 - resolution: "@typescript-eslint/utils@npm:5.10.2" +"@typescript-eslint/utils@npm:5.11.0": + version: 5.11.0 + resolution: "@typescript-eslint/utils@npm:5.11.0" dependencies: "@types/json-schema": ^7.0.9 - "@typescript-eslint/scope-manager": 5.10.2 - "@typescript-eslint/types": 5.10.2 - "@typescript-eslint/typescript-estree": 5.10.2 + "@typescript-eslint/scope-manager": 5.11.0 + "@typescript-eslint/types": 5.11.0 + "@typescript-eslint/typescript-estree": 5.11.0 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: d0dde3066f52405dffc2cbccd43d2aa2d9336510f178aa43812d616c951ea45f83693e2f6a88e3abfc94e2cc5f9eb3f2be9221a38848fe70aaffc294794c9d53 + checksum: 5ab1a15db1e0a2fbb857a8a16325459ad3d5239066f2641aa93ad9f7d08252d3a4ca6ae356c51cba1c6c81a65d84883436566b01932fa55b64a69796b950900d languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.10.2": - version: 5.10.2 - resolution: "@typescript-eslint/visitor-keys@npm:5.10.2" +"@typescript-eslint/visitor-keys@npm:5.11.0": + version: 5.11.0 + resolution: "@typescript-eslint/visitor-keys@npm:5.11.0" dependencies: - "@typescript-eslint/types": 5.10.2 + "@typescript-eslint/types": 5.11.0 eslint-visitor-keys: ^3.0.0 - checksum: f80caa1f0d71da096e9e18728b76046286cad691b178c0d101b71e5b553ee4a427ae2c2f8b9bc789dce266f62b026b7ca88ddafd52fde4f0dbb24e05765629b7 + checksum: 8f0b6fe1e86bc93825a137be3220f57e3a4bee410cca5d35963a0cd416750b31291a73c4294676d94ed0f5066b4cfb3a8f512d409881daa550d1645f4381eb21 languageName: node linkType: hard @@ -731,6 +731,13 @@ __metadata: languageName: node linkType: hard +"acorn-walk@npm:^8.2.0": + version: 8.2.0 + resolution: "acorn-walk@npm:8.2.0" + checksum: 1715e76c01dd7b2d4ca472f9c58968516a4899378a63ad5b6c2d668bba8da21a71976c14ec5f5b75f887b6317c4ae0b897ab141c831d741dc76024d8745f1ad1 + languageName: node + linkType: hard + "acorn@npm:^8.7.0": version: 8.7.0 resolution: "acorn@npm:8.7.0" @@ -815,6 +822,16 @@ __metadata: languageName: node linkType: hard +"are-we-there-yet@npm:^3.0.0": + version: 3.0.0 + resolution: "are-we-there-yet@npm:3.0.0" + dependencies: + delegates: ^1.0.0 + readable-stream: ^3.6.0 + checksum: 348edfdd931b0b50868b55402c01c3f64df1d4c229ab6f063539a5025fd6c5f5bb8a0cab409bbed8d75d34762d22aa91b7c20b4204eb8177063158d9ba792981 + languageName: node + linkType: hard + "argparse@npm:^2.0.1": version: 2.0.1 resolution: "argparse@npm:2.0.1" @@ -897,30 +914,29 @@ __metadata: version: 0.0.0-use.local resolution: "bush-bot@workspace:." dependencies: - "@discordjs/rest": "npm:@notenoughupdates/rest@dev" "@notenoughupdates/discord.js-minesweeper": ^1.0.10 "@notenoughupdates/events-intercept": ^3.0.1 "@notenoughupdates/humanize-duration": ^4.0.1 "@notenoughupdates/simplify-number": ^1.0.1 "@notenoughupdates/wolfram-alpha-api": ^1.0.1 "@sapphire/snowflake": ^3.1.0 - "@sentry/integrations": ^6.17.4 - "@sentry/node": ^6.17.4 - "@sentry/tracing": ^6.17.4 - "@sentry/types": ^6.17.4 + "@sentry/integrations": ^6.17.6 + "@sentry/node": ^6.17.6 + "@sentry/tracing": ^6.17.6 + "@sentry/types": ^6.17.6 "@types/eslint": ^8.4.1 "@types/express": ^4.17.13 "@types/lodash": ^4.14.178 - "@types/node": ^17.0.15 + "@types/node": ^17.0.17 "@types/node-os-utils": ^1.2.0 "@types/numeral": ^2.0.2 "@types/pg": ^8.6.4 - "@types/prettier": ^2.4.3 + "@types/prettier": ^2.4.4 "@types/rimraf": ^3.0.2 "@types/tinycolor2": ^1.4.3 "@types/validator": ^13.7.1 - "@typescript-eslint/eslint-plugin": ^5.10.2 - "@typescript-eslint/parser": ^5.10.2 + "@typescript-eslint/eslint-plugin": ^5.11.0 + "@typescript-eslint/parser": ^5.11.0 canvas: ^2.9.0 chalk: ^5.0.0 deep-lock: ^1.0.0 @@ -948,7 +964,7 @@ __metadata: sequelize: 6.13.0 tinycolor2: ^1.4.2 typescript: ^4.5.5 - vm2: ^3.9.5 + vm2: ^3.9.7 languageName: unknown linkType: soft @@ -1274,9 +1290,9 @@ __metadata: linkType: hard "discord-akairo@npm:@notenoughupdates/discord-akairo@dev": - version: 9.0.10-dev.1644004093.1012474 - resolution: "@notenoughupdates/discord-akairo@npm:9.0.10-dev.1644004093.1012474" - checksum: 4d3787b6818e68ef88a00ca6d819d0e38251c19bfeb15da76682e29879516d347670e24d42e7bf5a9b6ff3b60627c951ccb90eb936688b21f63556fac4cc3434 + version: 9.0.10-dev.1644108723.7814d7c + resolution: "@notenoughupdates/discord-akairo@npm:9.0.10-dev.1644108723.7814d7c" + checksum: a55770b6f1dec4edd3bc2771cb896aeb12b329d6ed9b007c3fc111430665a1e84fb46d64e0cc8682d4092e9c70d3cf28cfdc77d6a171fda3d8d5cfce7edbfdf5 languageName: node linkType: hard @@ -1288,18 +1304,18 @@ __metadata: linkType: hard "discord.js@npm:@notenoughupdates/discord.js@dev": - version: 14.0.0-dev.1644086580.90b011b - resolution: "@notenoughupdates/discord.js@npm:14.0.0-dev.1644086580.90b011b" + version: 14.0.0-dev.1644471352.7179c1b + resolution: "@notenoughupdates/discord.js@npm:14.0.0-dev.1644471352.7179c1b" dependencies: "@discordjs/builders": ^0.13.0-dev "@discordjs/collection": ^0.6.0-dev - "@discordjs/rest": "npm:@notenoughupdates/rest@dev" + "@discordjs/rest": ^0.3.0-dev "@sapphire/snowflake": ^3.1.0 "@types/ws": ^8.2.2 discord-api-types: ^0.26.1 node-fetch: ^2.6.7 ws: ^8.4.2 - checksum: d0b0e5fa11d32a3ffc16d860fe5d400059619afeab33cce60ba873089453a11c90ca9285033abf936743d6bb6cab5de32c9c052bf95235a452919a12bb018110 + checksum: 222e8a3f1389ce50bc4489abf3dcee99b9eb058888f00d0fb32247263215598c9c94ae6c58f48c6e8498ec854e90838c95d2edeb51101af89d705ce2dfbeeb81 languageName: node linkType: hard @@ -1808,9 +1824,9 @@ __metadata: linkType: hard "fraction.js@npm:^4.1.2": - version: 4.1.2 - resolution: "fraction.js@npm:4.1.2" - checksum: a67eff2b599cb6546b77ce9c913bd0cccd646e1a525c793ba4e0bf5a399fc403f379227fca83423a6ea79d01e35c2f2b0f141ffa1d09e41377041268a53fb150 + version: 4.1.3 + resolution: "fraction.js@npm:4.1.3" + checksum: d00065afce4814998b6e42fd439bbed17edbd9616b134927dbd75ebe1b94d6eb0820c0ce0e2cf8f26100e552cb72aff83f4816ef90cb1b329b6d12a531a26aaa languageName: node linkType: hard @@ -2400,11 +2416,11 @@ __metadata: linkType: hard "keyv@npm:^4.0.0": - version: 4.1.0 - resolution: "keyv@npm:4.1.0" + version: 4.1.1 + resolution: "keyv@npm:4.1.1" dependencies: json-buffer: 3.0.1 - checksum: 3f2f15b3e47fb2ac4bcf0323c814db18f92596d0cd7ec938dbe89947e54ce64ab4fac87ec87404213a410b50493648613c30afcf313acf98bcd47f052b8ea831 + checksum: b141fe29405413e7ca4ea0dfd19a48e25d909834f032aafdf4b0c6be177087cc1177b9c0ffdabd41ac8a65c13b92dcd2ec8688f540fbb458efdb9c8730bbd102 languageName: node linkType: hard @@ -2597,11 +2613,11 @@ __metadata: linkType: hard "minimatch@npm:^3.0.4": - version: 3.0.4 - resolution: "minimatch@npm:3.0.4" + version: 3.0.5 + resolution: "minimatch@npm:3.0.5" dependencies: brace-expansion: ^1.1.7 - checksum: 66ac295f8a7b59788000ea3749938b0970344c841750abd96694f80269b926ebcafad3deeb3f1da2522978b119e6ae3a5869b63b13a7859a456b3408bd18a078 + checksum: a3b84b426eafca947741b864502cee02860c4e7b145de11ad98775cfcf3066fef422583bc0ffce0952ddf4750c1ccf4220b1556430d4ce10139f66247d87d69e languageName: node linkType: hard @@ -2850,14 +2866,14 @@ __metadata: linkType: hard "npmlog@npm:^6.0.0": - version: 6.0.0 - resolution: "npmlog@npm:6.0.0" + version: 6.0.1 + resolution: "npmlog@npm:6.0.1" dependencies: - are-we-there-yet: ^2.0.0 + are-we-there-yet: ^3.0.0 console-control-strings: ^1.1.0 gauge: ^4.0.0 set-blocking: ^2.0.0 - checksum: 33d8a7fe3d63bf83b16655b6588ae7ba10b5f37b067a661e7cab6508660d7c3204ae716ee2c5ce4eb9626fd1489cf2fa7645d789bc3b704f8c3ccb04a532a50b + checksum: f1a4078a73ebc89896a832bbf869f491c32ecb12e0434b9a7499878ce8f29f22e72befe3c53cd8cdc9dbf4b4057297e783ab0b6746a8b067734de6205af4d538 languageName: node linkType: hard @@ -3485,7 +3501,7 @@ __metadata: languageName: node linkType: hard -"smart-buffer@npm:^4.1.0": +"smart-buffer@npm:^4.2.0": version: 4.2.0 resolution: "smart-buffer@npm:4.2.0" checksum: b5167a7142c1da704c0e3af85c402002b597081dd9575031a90b4f229ca5678e9a36e8a374f1814c8156a725d17008ae3bde63b92f9cfd132526379e580bec8b @@ -3504,12 +3520,12 @@ __metadata: linkType: hard "socks@npm:^2.6.1": - version: 2.6.1 - resolution: "socks@npm:2.6.1" + version: 2.6.2 + resolution: "socks@npm:2.6.2" dependencies: ip: ^1.1.5 - smart-buffer: ^4.1.0 - checksum: 2ca9d616e424f645838ebaabb04f85d94ea999e0f8393dc07f86c435af22ed88cb83958feeabd1bb7bc537c635ed47454255635502c6808a6df61af1f41af750 + smart-buffer: ^4.2.0 + checksum: dd9194293059d737759d5c69273850ad4149f448426249325c4bea0e340d1cf3d266c3b022694b0dcf5d31f759de23657244c481fc1e8322add80b7985c36b5e languageName: node linkType: hard @@ -3829,12 +3845,15 @@ __metadata: languageName: node linkType: hard -"vm2@npm:^3.9.5": - version: 3.9.5 - resolution: "vm2@npm:3.9.5" +"vm2@npm:^3.9.7": + version: 3.9.7 + resolution: "vm2@npm:3.9.7" + dependencies: + acorn: ^8.7.0 + acorn-walk: ^8.2.0 bin: vm2: bin/vm2 - checksum: d83dbe929ca4d1c9fca71cda34a5aee9a6b4bdc1de1ddb11777c4f6e1e48a471764195258dbf608f962df1a1c3d6ae917c9755f11a8f37b9e0bbf691313a725c + checksum: d85dc2ea3219daed7b9ad6d3bd17e405c60155cf162d977e28d8e12f237a95d8ed2d9ad34df2c89bab40a738cc717e3f83feb206df0c1a4964d891b1e39dbd54 languageName: node linkType: hard @@ -3919,8 +3938,8 @@ __metadata: linkType: hard "ws@npm:^8.4.2": - version: 8.4.2 - resolution: "ws@npm:8.4.2" + version: 8.5.0 + resolution: "ws@npm:8.5.0" peerDependencies: bufferutil: ^4.0.1 utf-8-validate: ^5.0.2 @@ -3929,7 +3948,7 @@ __metadata: optional: true utf-8-validate: optional: true - checksum: 4369caaac8d1092a73871f5cf1d87fcbb995dc4183a1bc48e4f451bc2d02d0a8bf7c17edf1da18e2be3c773b09262275356b256d1c55bc7ca096154293ba2a8c + checksum: 76f2f90e40344bf18fd544194e7067812fb1372b2a37865678d8f12afe4b478ff2ebc0c7c0aff82cd5e6b66fc43d889eec0f1865c2365d8f7a66d92da7744a77 languageName: node linkType: hard |