diff options
227 files changed, 747 insertions, 706 deletions
diff --git a/.vscode/settings.json b/.vscode/settings.json index 95ec3b3..1dd2bce 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,7 +7,8 @@ "**/.DS_Store": true, "dist": false, ".pnp.js": true, - "**/node_modules": true + "**/node_modules": true, + "**/dist/**/*.js.map": true }, "javascript.preferences.importModuleSpecifier": "project-relative", "typescript.preferences.importModuleSpecifier": "project-relative", diff --git a/package.json b/package.json index 65f2051..dea44ed 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "3.0.0", "description": "A multipurpose moderation bot developed for Moulberry's Bush.", "main": "dist/src/bot.js", - "type": "commonjs", + "type": "module", "repository": "https://github.com/NotEnoughUpdates/bush-bot-3.0", "author": "IRONM00N#0001 (@IRONM00N)", "contributors": [ @@ -15,17 +15,21 @@ "Zordlan#3560 (@Zordlan)" ], "license": "CC-BY-NC-SA-4.0", - "_moduleAliases": { - "@root": ".", - "@lib": "dist/src/lib" + "imports": { + "#root": { + "default/*": "./*" + }, + "#lib": { + "default": "./src/lib/index.js" + } }, "scripts": { - "build:esbuild": "yarn rimraf dist && yarn esbuild --sourcemap=inline --outdir=dist --platform=node --target=es2020 --format=cjs --log-level=warning src/**/*.ts", + "build:esbuild": "yarn rimraf dist && yarn esbuild --sourcemap=inline --outdir=dist --platform=node --target=es2020 --format=esm --log-level=warning src/**/*.ts", "build:tsc": "yarn rimraf dist && yarn tsc", "build:tsc:no-emit": "yarn rimraf dist && yarn tsc --noEmit", - "_start": "yarn build:esbuild && node --trace-warnings dist/src/bot.js", - "start": "yarn build:tsc && node --trace-warnings dist/src/bot.js", - "dev": "yarn build:tsc && node --trace-warnings dist/src/bot.js", + "_start": "yarn build:esbuild && node --experimental-json-modules --no-warnings dist/src/bot.js", + "start": "yarn build:tsc && node --experimental-json-modules --no-warnings dist/src/bot.js", + "dev": "yarn build:tsc && node --experimental-json-modules --no-warnings dist/src/bot.js", "test": "yarn lint && yarn tsc --noEmit", "format": "yarn prettier . --write", "lint": "yarn eslint --ext js,jsx,ts,tsx src", @@ -50,7 +54,6 @@ "humanize-duration": "^3.27.0", "lodash": "^4.17.21", "mathjs": "^9.5.0", - "module-alias": "^2.2.2", "moment": "^2.29.1", "nanoid": "^3.1.28", "node-os-utils": "^1.3.5", @@ -72,7 +75,6 @@ "@types/express": "^4.17.13", "@types/humanize-duration": "^3.25.1", "@types/lodash": "^4.14.176", - "@types/module-alias": "^2.0.1", "@types/node": "^16.11.6", "@types/node-os-utils": "^1.2.0", "@types/numeral": "^2.0.2", @@ -184,4 +186,4 @@ ] }, "packageManager": "yarn@3.1.0" -}
\ No newline at end of file +} diff --git a/src/arguments/abbreviatedNumber.ts b/src/arguments/abbreviatedNumber.ts index a95b3e2..4dae2ff 100644 --- a/src/arguments/abbreviatedNumber.ts +++ b/src/arguments/abbreviatedNumber.ts @@ -1,4 +1,4 @@ -import { type BushArgumentTypeCaster } from '@lib'; +import { type BushArgumentTypeCaster } from '#lib'; import numeral from 'numeral'; export const abbreviatedNumberTypeCaster: BushArgumentTypeCaster = (_, phrase): number | null => { diff --git a/src/arguments/contentWithDuration.ts b/src/arguments/contentWithDuration.ts index 782cf76..9bebaef 100644 --- a/src/arguments/contentWithDuration.ts +++ b/src/arguments/contentWithDuration.ts @@ -1,4 +1,4 @@ -import { type BushArgumentTypeCaster } from '@lib'; +import { type BushArgumentTypeCaster } from '#lib'; export const contentWithDurationTypeCaster: BushArgumentTypeCaster = async ( _, diff --git a/src/arguments/discordEmoji.ts b/src/arguments/discordEmoji.ts index 551cf11..6fb971a 100644 --- a/src/arguments/discordEmoji.ts +++ b/src/arguments/discordEmoji.ts @@ -1,5 +1,5 @@ +import { type BushArgumentTypeCaster } from '#lib'; import { type Snowflake } from 'discord-api-types'; -import { type BushArgumentTypeCaster } from '../lib'; export const discordEmojiTypeCaster: BushArgumentTypeCaster = (_, phrase): { name: string; id: Snowflake } | null => { if (!phrase) return null; diff --git a/src/arguments/duration.ts b/src/arguments/duration.ts index f2da700..e369ddd 100644 --- a/src/arguments/duration.ts +++ b/src/arguments/duration.ts @@ -1,4 +1,4 @@ -import { type BushArgumentTypeCaster } from '@lib'; +import { type BushArgumentTypeCaster } from '#lib'; export const durationTypeCaster: BushArgumentTypeCaster = (_, phrase): number | null => { return client.util.parseDuration(phrase).duration; diff --git a/src/arguments/durationSeconds.ts b/src/arguments/durationSeconds.ts index 9882740..78be1ce 100644 --- a/src/arguments/durationSeconds.ts +++ b/src/arguments/durationSeconds.ts @@ -1,4 +1,4 @@ -import { type BushArgumentTypeCaster } from '@lib'; +import { type BushArgumentTypeCaster } from '#lib'; export const durationSecondsTypeCaster: BushArgumentTypeCaster = (_, phrase): number | null => { phrase += 's'; diff --git a/src/arguments/globalUser.ts b/src/arguments/globalUser.ts index 6a20260..344fe78 100644 --- a/src/arguments/globalUser.ts +++ b/src/arguments/globalUser.ts @@ -1,4 +1,4 @@ -import { BushUser, type BushArgumentTypeCaster } from '@lib'; +import { BushUser, type BushArgumentTypeCaster } from '#lib'; // resolve non-cached users export const globalUserTypeCaster: BushArgumentTypeCaster = async (_, phrase): Promise<BushUser | null> => { diff --git a/src/arguments/permission.ts b/src/arguments/permission.ts index 614a1c7..4f335dc 100644 --- a/src/arguments/permission.ts +++ b/src/arguments/permission.ts @@ -1,4 +1,4 @@ -import { type BushArgumentTypeCaster } from '@lib'; +import { type BushArgumentTypeCaster } from '#lib'; import { Permissions } from 'discord.js'; export const permissionTypeCaster: BushArgumentTypeCaster = (_, phrase) => { diff --git a/src/arguments/roleWithDuation.ts b/src/arguments/roleWithDuration.ts index c139d94..455ad76 100644 --- a/src/arguments/roleWithDuation.ts +++ b/src/arguments/roleWithDuration.ts @@ -1,4 +1,4 @@ -import { type BushArgumentTypeCaster } from '@lib'; +import { type BushArgumentTypeCaster } from '#lib'; export const roleWithDurationTypeCaster: BushArgumentTypeCaster = async ( message, diff --git a/src/arguments/snowflake.ts b/src/arguments/snowflake.ts index 290dc5b..03d78c2 100644 --- a/src/arguments/snowflake.ts +++ b/src/arguments/snowflake.ts @@ -1,4 +1,4 @@ -import { type BushArgumentTypeCaster } from '@lib'; +import { type BushArgumentTypeCaster } from '#lib'; import { type Snowflake } from 'discord.js'; export const snowflakeTypeCaster: BushArgumentTypeCaster = (_, phrase): Snowflake | null => { @@ -1,9 +1,11 @@ -import 'module-alias/register'; -import 'source-map-support/register'; -import config from './config/options'; -import { BushClient } from './lib'; -import { Sentry } from './lib/common/Sentry'; +import { dirname } from 'path'; +import 'source-map-support/register.js'; +import { fileURLToPath } from 'url'; +import config from './config/options.js'; +import { Sentry } from './lib/common/Sentry.js'; +import { BushClient } from './lib/index.js'; +const __dirname = dirname(fileURLToPath(import.meta.url)); global.__rootdir__ = __dirname || process.cwd(); new Sentry(); BushClient.init(); diff --git a/src/commands/_fake-command/ironmoon.ts b/src/commands/_fake-command/ironmoon.ts index dc34ab6..b13d1d3 100644 --- a/src/commands/_fake-command/ironmoon.ts +++ b/src/commands/_fake-command/ironmoon.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; export default class IronmoonCommand extends BushCommand { public constructor() { diff --git a/src/commands/admin/channelPermissions.ts b/src/commands/admin/channelPermissions.ts index 3b0b5f1..befa3ea 100644 --- a/src/commands/admin/channelPermissions.ts +++ b/src/commands/admin/channelPermissions.ts @@ -1,4 +1,4 @@ -import { BushCommand, ButtonPaginator, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, ButtonPaginator, type BushMessage, type BushSlashMessage } from '#lib'; import { MessageEmbed, type GuildMember, type PermissionString, type Role } from 'discord.js'; export default class ChannelPermissionsCommand extends BushCommand { diff --git a/src/commands/admin/roleAll.ts b/src/commands/admin/roleAll.ts index a9db11d..3c6b629 100644 --- a/src/commands/admin/roleAll.ts +++ b/src/commands/admin/roleAll.ts @@ -1,4 +1,4 @@ -import { AllowedMentions, BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { AllowedMentions, BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; import { type GuildMember, type Role } from 'discord.js'; export default class RoleAllCommand extends BushCommand { diff --git a/src/commands/config/blacklist.ts b/src/commands/config/blacklist.ts index bac3ef3..f0173a4 100644 --- a/src/commands/config/blacklist.ts +++ b/src/commands/config/blacklist.ts @@ -1,4 +1,4 @@ -import { AllowedMentions, BushCommand, Global, type BushMessage, type BushSlashMessage } from '@lib'; +import { AllowedMentions, BushCommand, Global, type BushMessage, type BushSlashMessage } from '#lib'; import { User, type Channel } from 'discord.js'; export default class BlacklistCommand extends BushCommand { diff --git a/src/commands/config/config.ts b/src/commands/config/config.ts index 555b47d..99a1147 100644 --- a/src/commands/config/config.ts +++ b/src/commands/config/config.ts @@ -1,19 +1,19 @@ -import { BushCommand, guildSettingsObj, settingsArr, type BushMessage, type BushSlashMessage, type GuildSettings } from '@lib'; +import { BushCommand, guildSettingsObj, settingsArr, type BushMessage, type BushSlashMessage, type GuildSettings } from '#lib'; import { type ArgumentOptions, type Flag } from 'discord-akairo'; import { - Channel, - Formatters, - GuildMember, - MessageActionRow, - MessageButton, - MessageEmbed, - MessageSelectMenu, - Role, - User, - type Message, - type MessageComponentInteraction, - type MessageOptions, - type Snowflake + Channel, + Formatters, + GuildMember, + MessageActionRow, + MessageButton, + MessageEmbed, + MessageSelectMenu, + Role, + User, + type Message, + type MessageComponentInteraction, + type MessageOptions, + type Snowflake } from 'discord.js'; import _ from 'lodash'; diff --git a/src/commands/config/customAutomodPhrases.ts b/src/commands/config/customAutomodPhrases.ts index 25201ff..9fbebf5 100644 --- a/src/commands/config/customAutomodPhrases.ts +++ b/src/commands/config/customAutomodPhrases.ts @@ -1,4 +1,4 @@ -// import { BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +// import { BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; // export default class CustomAutomodPhrasesCommand extends BushCommand { // public constructor() { diff --git a/src/commands/config/disable.ts b/src/commands/config/disable.ts index 3ada74e..a04850c 100644 --- a/src/commands/config/disable.ts +++ b/src/commands/config/disable.ts @@ -1,4 +1,4 @@ -import { AllowedMentions, BushCommand, Global, type BushMessage, type BushSlashMessage } from '@lib'; +import { AllowedMentions, BushCommand, Global, type BushMessage, type BushSlashMessage } from '#lib'; export default class DisableCommand extends BushCommand { public constructor() { diff --git a/src/commands/config/features.ts b/src/commands/config/features.ts index 065253c..7f9ffc9 100644 --- a/src/commands/config/features.ts +++ b/src/commands/config/features.ts @@ -1,4 +1,10 @@ -import { BushCommand, guildFeaturesArr, guildFeaturesObj, type BushMessage, type BushSlashMessage, type GuildFeatures } from '@lib'; +import { + BushCommand, + guildFeaturesArr, guildFeaturesObj, + type BushMessage, + type BushSlashMessage, + type GuildFeatures +} from '#lib'; import { MessageActionRow, MessageEmbed, MessageSelectMenu, type Message, type SelectMenuInteraction } from 'discord.js'; export default class FeaturesCommand extends BushCommand { diff --git a/src/commands/config/levelRoles.ts b/src/commands/config/levelRoles.ts index e788615..e7b4505 100644 --- a/src/commands/config/levelRoles.ts +++ b/src/commands/config/levelRoles.ts @@ -1,4 +1,4 @@ -// import { BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +// import { BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; // export default class LevelRolesCommand extends BushCommand { // public constructor() { diff --git a/src/commands/config/log.ts b/src/commands/config/log.ts index af68483..cccef8c 100644 --- a/src/commands/config/log.ts +++ b/src/commands/config/log.ts @@ -1,4 +1,4 @@ -import { BushCommand, guildLogsArr, type BushMessage, type BushSlashMessage, type GuildLogType } from '@lib'; +import { BushCommand, guildLogsArr, type BushMessage, type BushSlashMessage, type GuildLogType } from '#lib'; import { type ArgumentOptions, type Flag } from 'discord-akairo'; import { type TextChannel } from 'discord.js'; diff --git a/src/commands/dev/__template.ts b/src/commands/dev/__template.ts index 85cc06e..fe685ff 100644 --- a/src/commands/dev/__template.ts +++ b/src/commands/dev/__template.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; export default class TemplateCommand extends BushCommand { public constructor() { diff --git a/src/commands/dev/eval.ts b/src/commands/dev/eval.ts index e22f937..b82534c 100644 --- a/src/commands/dev/eval.ts +++ b/src/commands/dev/eval.ts @@ -1,9 +1,11 @@ -import { BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; import { exec } from 'child_process'; import { MessageEmbed as _MessageEmbed } from 'discord.js'; -import { transpile } from 'typescript'; +import ts from 'typescript'; import { promisify } from 'util'; +const { transpile } = ts; + export default class EvalCommand extends BushCommand { public constructor() { super('eval', { @@ -98,7 +100,7 @@ export default class EvalCommand extends BushCommand { roles = message.guild?.roles, emojis = util.emojis, colors = util.colors, - { ActivePunishment, Global, Guild, Level, ModLog, StickyRole } = await import('@lib'), + { ActivePunishment, Global, Guild, Level, ModLog, StickyRole } = await import('#lib'), { ButtonInteraction, Collection, diff --git a/src/commands/dev/reload.ts b/src/commands/dev/reload.ts index 7920a37..cbabb48 100644 --- a/src/commands/dev/reload.ts +++ b/src/commands/dev/reload.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; export default class ReloadCommand extends BushCommand { public constructor() { diff --git a/src/commands/dev/say.ts b/src/commands/dev/say.ts index 3a8b2de..400a132 100644 --- a/src/commands/dev/say.ts +++ b/src/commands/dev/say.ts @@ -1,4 +1,4 @@ -import { AllowedMentions, BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { AllowedMentions, BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; export default class SayCommand extends BushCommand { public constructor() { diff --git a/src/commands/dev/servers.ts b/src/commands/dev/servers.ts index 4b98ed9..e8a2fe4 100644 --- a/src/commands/dev/servers.ts +++ b/src/commands/dev/servers.ts @@ -1,4 +1,4 @@ -import { BushCommand, ButtonPaginator, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, ButtonPaginator, type BushMessage, type BushSlashMessage } from '#lib'; import { type Guild, type MessageEmbedOptions } from 'discord.js'; export default class ServersCommand extends BushCommand { diff --git a/src/commands/dev/sh.ts b/src/commands/dev/sh.ts index e32408d..83432f4 100644 --- a/src/commands/dev/sh.ts +++ b/src/commands/dev/sh.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; import chalk from 'chalk'; import { exec } from 'child_process'; import { MessageEmbed, Util } from 'discord.js'; diff --git a/src/commands/dev/superUser.ts b/src/commands/dev/superUser.ts index 41cd7eb..17d81ac 100644 --- a/src/commands/dev/superUser.ts +++ b/src/commands/dev/superUser.ts @@ -1,4 +1,4 @@ -import { BushCommand, Global, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, Global, type BushMessage, type BushSlashMessage } from '#lib'; import { type ArgumentOptions, type Flag } from 'discord-akairo'; import { type User } from 'discord.js'; diff --git a/src/commands/dev/test.ts b/src/commands/dev/test.ts index d6c20f7..d4109f4 100644 --- a/src/commands/dev/test.ts +++ b/src/commands/dev/test.ts @@ -1,11 +1,11 @@ -import { BushCommand, ButtonPaginator, type BushMessage } from '@lib'; +import { BushCommand, ButtonPaginator, type BushMessage } from '#lib'; import { - Constants as jsConstants, - MessageActionRow, - MessageButton, - MessageEmbed, - type ApplicationCommand, - type Collection + Constants as jsConstants, + MessageActionRow, + MessageButton, + MessageEmbed, + type ApplicationCommand, + type Collection } from 'discord.js'; export default class TestCommand extends BushCommand { diff --git a/src/commands/fun/coinflip.ts b/src/commands/fun/coinflip.ts index ef55518..83de5ba 100644 --- a/src/commands/fun/coinflip.ts +++ b/src/commands/fun/coinflip.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; export default class CoinFlipCommand extends BushCommand { public constructor() { diff --git a/src/commands/fun/dice.ts b/src/commands/fun/dice.ts index fef5c7a..74f387e 100644 --- a/src/commands/fun/dice.ts +++ b/src/commands/fun/dice.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; export default class EightBallCommand extends BushCommand { public constructor() { diff --git a/src/commands/fun/eightBall.ts b/src/commands/fun/eightBall.ts index 2555fdb..fc662ad 100644 --- a/src/commands/fun/eightBall.ts +++ b/src/commands/fun/eightBall.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; export default class EightBallCommand extends BushCommand { public constructor() { diff --git a/src/commands/fun/minesweeper.ts b/src/commands/fun/minesweeper.ts index 6c6d4f4..71c5055 100644 --- a/src/commands/fun/minesweeper.ts +++ b/src/commands/fun/minesweeper.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; import Minesweeper from 'discord.js-minesweeper'; export default class MinesweeperCommand extends BushCommand { diff --git a/src/commands/info/avatar.ts b/src/commands/info/avatar.ts index 10994d9..e8b213f 100644 --- a/src/commands/info/avatar.ts +++ b/src/commands/info/avatar.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; import { GuildMember, MessageEmbed, type User } from 'discord.js'; export default class AvatarCommand extends BushCommand { diff --git a/src/commands/info/botInfo.ts b/src/commands/info/botInfo.ts index d5f37e8..f100317 100644 --- a/src/commands/info/botInfo.ts +++ b/src/commands/info/botInfo.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; import { MessageEmbed, version as discordJSVersion } from 'discord.js'; import * as os from 'os'; import prettyBytes from 'pretty-bytes'; diff --git a/src/commands/info/color.ts b/src/commands/info/color.ts index 5c3f14c..8fed7da 100644 --- a/src/commands/info/color.ts +++ b/src/commands/info/color.ts @@ -1,4 +1,4 @@ -import { AllowedMentions, BushCommand, type BushGuildMember, type BushMessage, type BushRole, type BushSlashMessage } from '@lib'; +import { AllowedMentions, BushCommand, type BushGuildMember, type BushMessage, type BushRole, type BushSlashMessage } from '#lib'; import { Argument } from 'discord-akairo'; import { MessageEmbed, Role, type Message } from 'discord.js'; import tinycolor from 'tinycolor2'; diff --git a/src/commands/info/guildInfo.ts b/src/commands/info/guildInfo.ts index 3c287dd..facbb45 100644 --- a/src/commands/info/guildInfo.ts +++ b/src/commands/info/guildInfo.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; import { Guild, MessageEmbed, type BaseGuildVoiceChannel, type GuildPreview, type Snowflake, type Vanity } from 'discord.js'; export default class GuildInfoCommand extends BushCommand { diff --git a/src/commands/info/help.ts b/src/commands/info/help.ts index e22aa5d..f956405 100644 --- a/src/commands/info/help.ts +++ b/src/commands/info/help.ts @@ -1,4 +1,4 @@ -import { BushCommand, BushMessage, BushSlashMessage } from '@lib'; +import { BushCommand, BushMessage, BushSlashMessage } from '#lib'; import { MessageActionRow, MessageButton, MessageEmbed } from 'discord.js'; import packageDotJSON from '../../../package.json'; diff --git a/src/commands/info/icon.ts b/src/commands/info/icon.ts index b9cc4e0..fa4968c 100644 --- a/src/commands/info/icon.ts +++ b/src/commands/info/icon.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; import { MessageEmbed } from 'discord.js'; export default class IconCommand extends BushCommand { diff --git a/src/commands/info/links.ts b/src/commands/info/links.ts index d4bcff0..935dca0 100644 --- a/src/commands/info/links.ts +++ b/src/commands/info/links.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; import { MessageActionRow, MessageButton } from 'discord.js'; import packageDotJSON from '../../../package.json'; diff --git a/src/commands/info/ping.ts b/src/commands/info/ping.ts index 831eeb7..1d3f75a 100644 --- a/src/commands/info/ping.ts +++ b/src/commands/info/ping.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; import { MessageEmbed, type Message } from 'discord.js'; export default class PingCommand extends BushCommand { diff --git a/src/commands/info/pronouns.ts b/src/commands/info/pronouns.ts index 390d1bb..db1a3a4 100644 --- a/src/commands/info/pronouns.ts +++ b/src/commands/info/pronouns.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; import { MessageEmbed, type User } from 'discord.js'; export default class PronounsCommand extends BushCommand { diff --git a/src/commands/info/snowflake.ts b/src/commands/info/snowflake.ts index 2b3c816..a6de675 100644 --- a/src/commands/info/snowflake.ts +++ b/src/commands/info/snowflake.ts @@ -1,20 +1,20 @@ -import { BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; import { - MessageEmbed, - SnowflakeUtil, - VoiceChannel, - type CategoryChannel, - type Channel, - type DeconstructedSnowflake, - type DMChannel, - type Emoji, - type Guild, - type NewsChannel, - type Role, - type Snowflake, - type StageChannel, - type TextChannel, - type User + MessageEmbed, + SnowflakeUtil, + VoiceChannel, + type CategoryChannel, + type Channel, + type DeconstructedSnowflake, + type DMChannel, + type Emoji, + type Guild, + type NewsChannel, + type Role, + type Snowflake, + type StageChannel, + type TextChannel, + type User } from 'discord.js'; export default class SnowflakeCommand extends BushCommand { diff --git a/src/commands/info/userInfo.ts b/src/commands/info/userInfo.ts index fe4fd85..3afdff2 100644 --- a/src/commands/info/userInfo.ts +++ b/src/commands/info/userInfo.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage, type BushSlashMessage, type BushUser } from '@lib'; +import { BushCommand, type BushMessage, type BushSlashMessage, type BushUser } from '#lib'; import { MessageEmbed, type Snowflake } from 'discord.js'; // TODO: Add bot information diff --git a/src/commands/leveling/leaderboard.ts b/src/commands/leveling/leaderboard.ts index baede6c..19387f9 100644 --- a/src/commands/leveling/leaderboard.ts +++ b/src/commands/leveling/leaderboard.ts @@ -1,4 +1,4 @@ -import { BushCommand, ButtonPaginator, Level, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, ButtonPaginator, Level, type BushMessage, type BushSlashMessage } from '#lib'; import { MessageEmbed } from 'discord.js'; export default class LeaderboardCommand extends BushCommand { diff --git a/src/commands/leveling/level.ts b/src/commands/leveling/level.ts index 9f2e6bb..0da0bf0 100644 --- a/src/commands/leveling/level.ts +++ b/src/commands/leveling/level.ts @@ -1,7 +1,16 @@ -import { AllowedMentions, BushCommand, CanvasProgressBar, Level, type BushGuild, type BushMessage, type BushSlashMessage, type BushUser } from '@lib'; +import { + AllowedMentions, + BushCommand, + CanvasProgressBar, + Level, + type BushGuild, + type BushMessage, + type BushSlashMessage, + type BushUser +} from '#lib'; import canvas from 'canvas'; import { MessageAttachment } from 'discord.js'; -import got from 'got/dist/source'; +import got from 'got'; import { join } from 'path'; import SimplifyNumber from 'simplify-number'; diff --git a/src/commands/leveling/setLevel.ts b/src/commands/leveling/setLevel.ts index 9e73308..499463a 100644 --- a/src/commands/leveling/setLevel.ts +++ b/src/commands/leveling/setLevel.ts @@ -1,4 +1,4 @@ -import { AllowedMentions, BushCommand, Level, type BushMessage, type BushSlashMessage } from '@lib'; +import { AllowedMentions, BushCommand, Level, type BushMessage, type BushSlashMessage } from '#lib'; import { type User } from 'discord.js'; export default class SetLevelCommand extends BushCommand { diff --git a/src/commands/leveling/setXp.ts b/src/commands/leveling/setXp.ts index a00bfc9..2f2a6fa 100644 --- a/src/commands/leveling/setXp.ts +++ b/src/commands/leveling/setXp.ts @@ -1,4 +1,4 @@ -import { AllowedMentions, BushCommand, Level, type BushMessage, type BushSlashMessage } from '@lib'; +import { AllowedMentions, BushCommand, Level, type BushMessage, type BushSlashMessage } from '#lib'; import { type User } from 'discord.js'; export default class SetXpCommand extends BushCommand { diff --git a/src/commands/moderation/_lockdown.ts b/src/commands/moderation/_lockdown.ts index e71bd80..029db29 100644 --- a/src/commands/moderation/_lockdown.ts +++ b/src/commands/moderation/_lockdown.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage, type BushNewsChannel, type BushSlashMessage, type BushTextChannel } from '@lib'; +import { BushCommand, type BushMessage, type BushNewsChannel, type BushSlashMessage, type BushTextChannel } from '#lib'; export default class LockdownCommand extends BushCommand { public constructor() { diff --git a/src/commands/moderation/ban.ts b/src/commands/moderation/ban.ts index 660235f..7c0d010 100644 --- a/src/commands/moderation/ban.ts +++ b/src/commands/moderation/ban.ts @@ -1,4 +1,4 @@ -import { AllowedMentions, BushCommand, Moderation, type BushMessage, type BushSlashMessage } from '@lib'; +import { AllowedMentions, BushCommand, Moderation, type BushMessage, type BushSlashMessage } from '#lib'; import { type Snowflake, type User } from 'discord.js'; export default class BanCommand extends BushCommand { diff --git a/src/commands/moderation/evidence.ts b/src/commands/moderation/evidence.ts index a2fa40b..0204d84 100644 --- a/src/commands/moderation/evidence.ts +++ b/src/commands/moderation/evidence.ts @@ -1,4 +1,4 @@ -import { BushCommand, ModLog, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, ModLog, type BushMessage, type BushSlashMessage } from '#lib'; import { type ArgumentOptions, type Flag } from 'discord-akairo'; export default class EvidenceCommand extends BushCommand { diff --git a/src/commands/moderation/hideCase.ts b/src/commands/moderation/hideCase.ts index 44170a9..9c22e63 100644 --- a/src/commands/moderation/hideCase.ts +++ b/src/commands/moderation/hideCase.ts @@ -1,4 +1,4 @@ -import { BushCommand, ModLog, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, ModLog, type BushMessage, type BushSlashMessage } from '#lib'; export default class HideCaseCommand extends BushCommand { public constructor() { diff --git a/src/commands/moderation/kick.ts b/src/commands/moderation/kick.ts index 858a392..1f1c2fb 100644 --- a/src/commands/moderation/kick.ts +++ b/src/commands/moderation/kick.ts @@ -1,4 +1,4 @@ -import { AllowedMentions, BushCommand, Moderation, type BushMessage, type BushSlashMessage, type BushUser } from '@lib'; +import { AllowedMentions, BushCommand, Moderation, type BushMessage, type BushSlashMessage, type BushUser } from '#lib'; export default class KickCommand extends BushCommand { public constructor() { diff --git a/src/commands/moderation/modlog.ts b/src/commands/moderation/modlog.ts index 35ac6f6..8bdee59 100644 --- a/src/commands/moderation/modlog.ts +++ b/src/commands/moderation/modlog.ts @@ -1,4 +1,4 @@ -import { BushCommand, ButtonPaginator, ModLog, type BushMessage, type BushSlashMessage, type BushUser } from '@lib'; +import { BushCommand, ButtonPaginator, ModLog, type BushMessage, type BushSlashMessage, type BushUser } from '#lib'; import { MessageEmbed, User } from 'discord.js'; export default class ModlogCommand extends BushCommand { diff --git a/src/commands/moderation/mute.ts b/src/commands/moderation/mute.ts index 9938d3f..44e1db4 100644 --- a/src/commands/moderation/mute.ts +++ b/src/commands/moderation/mute.ts @@ -1,4 +1,4 @@ -import { AllowedMentions, BushCommand, Moderation, type BushMessage, type BushSlashMessage, type BushUser } from '@lib'; +import { AllowedMentions, BushCommand, Moderation, type BushMessage, type BushSlashMessage, type BushUser } from '#lib'; export default class MuteCommand extends BushCommand { public constructor() { diff --git a/src/commands/moderation/purge.ts b/src/commands/moderation/purge.ts index ef2b0b5..4d8db08 100644 --- a/src/commands/moderation/purge.ts +++ b/src/commands/moderation/purge.ts @@ -1,4 +1,4 @@ -import { BushCommand, BushMessage } from '@lib'; +import { BushCommand, BushMessage } from '#lib'; import { Collection, type Snowflake } from 'discord.js'; export default class PurgeCommand extends BushCommand { diff --git a/src/commands/moderation/removeReactionEmoji.ts b/src/commands/moderation/removeReactionEmoji.ts index 1645b46..80f2c01 100644 --- a/src/commands/moderation/removeReactionEmoji.ts +++ b/src/commands/moderation/removeReactionEmoji.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage } from '@lib'; +import { BushCommand, type BushMessage } from '#lib'; import { type Emoji, type Snowflake } from 'discord.js'; export default class RemoveReactionEmojiCommand extends BushCommand { diff --git a/src/commands/moderation/role.ts b/src/commands/moderation/role.ts index 73901e5..dd74bb4 100644 --- a/src/commands/moderation/role.ts +++ b/src/commands/moderation/role.ts @@ -1,4 +1,4 @@ -import { AllowedMentions, BushCommand, type BushGuildMember, type BushMessage, type BushRole, type BushSlashMessage } from '@lib'; +import { AllowedMentions, BushCommand, type BushGuildMember, type BushMessage, type BushRole, type BushSlashMessage } from '#lib'; import { type ArgumentOptions, type Flag } from 'discord-akairo'; export default class RoleCommand extends BushCommand { diff --git a/src/commands/moderation/slowmode.ts b/src/commands/moderation/slowmode.ts index 40b5ed1..5b77096 100644 --- a/src/commands/moderation/slowmode.ts +++ b/src/commands/moderation/slowmode.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage, type BushNewsChannel, type BushSlashMessage, type BushTextChannel, type BushThreadChannel } from '@lib'; +import { BushCommand, type BushMessage, type BushNewsChannel, type BushSlashMessage, type BushTextChannel, type BushThreadChannel } from '#lib'; import { Argument } from 'discord-akairo'; import { TextChannel, ThreadChannel, type NewsChannel } from 'discord.js'; diff --git a/src/commands/moderation/unban.ts b/src/commands/moderation/unban.ts index ec610d9..1492b63 100644 --- a/src/commands/moderation/unban.ts +++ b/src/commands/moderation/unban.ts @@ -1,4 +1,4 @@ -import { AllowedMentions, BushCommand, type BushMessage, type BushSlashMessage, type BushUser } from '@lib'; +import { AllowedMentions, BushCommand, type BushMessage, type BushSlashMessage, type BushUser } from '#lib'; export default class UnbanCommand extends BushCommand { public constructor() { diff --git a/src/commands/moderation/unmute.ts b/src/commands/moderation/unmute.ts index f0e0899..e1bda63 100644 --- a/src/commands/moderation/unmute.ts +++ b/src/commands/moderation/unmute.ts @@ -1,4 +1,4 @@ -import { AllowedMentions, BushCommand, Moderation, type BushGuildMember, type BushMessage, type BushSlashMessage, type BushUser } from '@lib'; +import { AllowedMentions, BushCommand, Moderation, type BushGuildMember, type BushMessage, type BushSlashMessage, type BushUser } from '#lib'; export default class UnmuteCommand extends BushCommand { public constructor() { diff --git a/src/commands/moderation/warn.ts b/src/commands/moderation/warn.ts index a050351..25b47ec 100644 --- a/src/commands/moderation/warn.ts +++ b/src/commands/moderation/warn.ts @@ -1,4 +1,4 @@ -import { AllowedMentions, BushCommand, Moderation, type BushGuildMember, type BushMessage, type BushSlashMessage, type BushUser } from '@lib'; +import { AllowedMentions, BushCommand, Moderation, type BushGuildMember, type BushMessage, type BushSlashMessage, type BushUser } from '#lib'; export default class WarnCommand extends BushCommand { public constructor() { diff --git a/src/commands/moulberry-bush/capePerms.ts b/src/commands/moulberry-bush/capePerms.ts index 703f32e..237ca89 100644 --- a/src/commands/moulberry-bush/capePerms.ts +++ b/src/commands/moulberry-bush/capePerms.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; import { MessageEmbed } from 'discord.js'; import got from 'got'; diff --git a/src/commands/moulberry-bush/capes.ts b/src/commands/moulberry-bush/capes.ts index fab70df..0af0125 100644 --- a/src/commands/moulberry-bush/capes.ts +++ b/src/commands/moulberry-bush/capes.ts @@ -1,4 +1,4 @@ -import { BushCommand, ButtonPaginator, DeleteButton, type BushMessage } from '@lib'; +import { BushCommand, ButtonPaginator, DeleteButton, type BushMessage } from '#lib'; import { type MessageEmbedOptions } from 'discord.js'; import got from 'got'; diff --git a/src/commands/moulberry-bush/giveawayPing.ts b/src/commands/moulberry-bush/giveawayPing.ts index 54a31e7..d76964c 100644 --- a/src/commands/moulberry-bush/giveawayPing.ts +++ b/src/commands/moulberry-bush/giveawayPing.ts @@ -1,4 +1,4 @@ -import { AllowedMentions, BushCommand, type BushMessage } from '@lib'; +import { AllowedMentions, BushCommand, type BushMessage } from '#lib'; export default class GiveawayPingCommand extends BushCommand { public constructor() { diff --git a/src/commands/moulberry-bush/moulHammer.ts b/src/commands/moulberry-bush/moulHammer.ts index 2c10bd4..98ef78f 100644 --- a/src/commands/moulberry-bush/moulHammer.ts +++ b/src/commands/moulberry-bush/moulHammer.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage } from '@lib'; +import { BushCommand, type BushMessage } from '#lib'; import { MessageEmbed, type User } from 'discord.js'; export default class MoulHammerCommand extends BushCommand { diff --git a/src/commands/moulberry-bush/report.ts b/src/commands/moulberry-bush/report.ts index 9a69c4a..2888051 100644 --- a/src/commands/moulberry-bush/report.ts +++ b/src/commands/moulberry-bush/report.ts @@ -1,4 +1,4 @@ -import { AllowedMentions, BushCommand, type BushMessage } from '@lib'; +import { AllowedMentions, BushCommand, type BushMessage } from '#lib'; import { MessageEmbed, type GuildMember } from 'discord.js'; import moment from 'moment'; diff --git a/src/commands/moulberry-bush/rule.ts b/src/commands/moulberry-bush/rule.ts index 6beb6b4..fb322ff 100644 --- a/src/commands/moulberry-bush/rule.ts +++ b/src/commands/moulberry-bush/rule.ts @@ -1,4 +1,4 @@ -import { AllowedMentions, BushCommand, type BushMessage } from '@lib'; +import { AllowedMentions, BushCommand, type BushMessage } from '#lib'; import { MessageEmbed, type User } from 'discord.js'; const rules = [ diff --git a/src/commands/moulberry-bush/serverStatus.ts b/src/commands/moulberry-bush/serverStatus.ts index 17f1090..ff0023e 100644 --- a/src/commands/moulberry-bush/serverStatus.ts +++ b/src/commands/moulberry-bush/serverStatus.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage } from '@lib'; +import { BushCommand, type BushMessage } from '#lib'; import { MessageEmbed } from 'discord.js'; import got from 'got'; diff --git a/src/commands/utilities/activity.ts b/src/commands/utilities/activity.ts index 91d6328..3fca2b6 100644 --- a/src/commands/utilities/activity.ts +++ b/src/commands/utilities/activity.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; import { DiscordAPIError, Message, VoiceChannel } from 'discord.js'; const activityMap = { diff --git a/src/commands/utilities/calculator.ts b/src/commands/utilities/calculator.ts index 1df4264..277947b 100644 --- a/src/commands/utilities/calculator.ts +++ b/src/commands/utilities/calculator.ts @@ -1,4 +1,4 @@ -import { AllowedMentions, BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { AllowedMentions, BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; import { MessageEmbed } from 'discord.js'; import { evaluate } from 'mathjs'; diff --git a/src/commands/utilities/decode.ts b/src/commands/utilities/decode.ts index 5ecd6f1..7f0c7d4 100644 --- a/src/commands/utilities/decode.ts +++ b/src/commands/utilities/decode.ts @@ -1,4 +1,4 @@ -import { AllowedMentions, BushCommand, type BushMessage } from '@lib'; +import { AllowedMentions, BushCommand, type BushMessage } from '#lib'; import { type AkairoMessage } from 'discord-akairo'; import { MessageEmbed } from 'discord.js'; diff --git a/src/commands/utilities/hash.ts b/src/commands/utilities/hash.ts index 5b3bcfb..62791c9 100644 --- a/src/commands/utilities/hash.ts +++ b/src/commands/utilities/hash.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage } from '@lib'; +import { BushCommand, type BushMessage } from '#lib'; import crypto from 'crypto'; import got from 'got'; diff --git a/src/commands/utilities/price.ts b/src/commands/utilities/price.ts index 333bfea..b852a53 100644 --- a/src/commands/utilities/price.ts +++ b/src/commands/utilities/price.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage } from '@lib'; +import { BushCommand, type BushMessage } from '#lib'; import { MessageEmbed } from 'discord.js'; import Fuse from 'fuse.js'; import got from 'got'; diff --git a/src/commands/utilities/steal.ts b/src/commands/utilities/steal.ts index 4ee7fb1..3d230c5 100644 --- a/src/commands/utilities/steal.ts +++ b/src/commands/utilities/steal.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage } from '@lib'; +import { BushCommand, type BushMessage } from '#lib'; import { type Snowflake } from 'discord.js'; export default class StealCommand extends BushCommand { diff --git a/src/commands/utilities/suicide.ts b/src/commands/utilities/suicide.ts index 8050dcb..beb7309 100644 --- a/src/commands/utilities/suicide.ts +++ b/src/commands/utilities/suicide.ts @@ -1,4 +1,4 @@ -import { AllowedMentions, BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { AllowedMentions, BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; import { MessageEmbed } from 'discord.js'; export default class TemplateCommand extends BushCommand { diff --git a/src/commands/utilities/uuid.ts b/src/commands/utilities/uuid.ts index 64e5b56..556a4de 100644 --- a/src/commands/utilities/uuid.ts +++ b/src/commands/utilities/uuid.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage } from '@lib'; +import { BushCommand, type BushMessage } from '#lib'; export default class UuidCommand extends BushCommand { public constructor() { diff --git a/src/commands/utilities/viewRaw.ts b/src/commands/utilities/viewRaw.ts index 45939b0..4719da1 100644 --- a/src/commands/utilities/viewRaw.ts +++ b/src/commands/utilities/viewRaw.ts @@ -1,4 +1,4 @@ -import { BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; import { MessageEmbed, type DMChannel, type NewsChannel, type Snowflake, type TextChannel } from 'discord.js'; export default class ViewRawCommand extends BushCommand { diff --git a/src/commands/utilities/whoHasRole.ts b/src/commands/utilities/whoHasRole.ts index 69285d8..a457756 100644 --- a/src/commands/utilities/whoHasRole.ts +++ b/src/commands/utilities/whoHasRole.ts @@ -1,4 +1,4 @@ -import { BushCommand, ButtonPaginator, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushCommand, ButtonPaginator, type BushMessage, type BushSlashMessage } from '#lib'; import { Util, type CommandInteraction, type Role } from 'discord.js'; export default class WhoHasRoleCommand extends BushCommand { diff --git a/src/commands/utilities/wolframAlpha.ts b/src/commands/utilities/wolframAlpha.ts index a2b4036..bc5f939 100644 --- a/src/commands/utilities/wolframAlpha.ts +++ b/src/commands/utilities/wolframAlpha.ts @@ -1,4 +1,4 @@ -import { AllowedMentions, BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { AllowedMentions, BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; import { MessageEmbed, type MessageOptions } from 'discord.js'; import WolframAlphaAPI from 'wolfram-alpha-api'; diff --git a/src/config/example-options.ts b/src/config/example-options.ts index aafda05..21c99ad 100644 --- a/src/config/example-options.ts +++ b/src/config/example-options.ts @@ -1,4 +1,4 @@ -import { Config } from '@lib'; +import { Config } from '#lib'; export default new Config({ credentials: { diff --git a/src/context-menu-commands/message/viewRaw.ts b/src/context-menu-commands/message/viewRaw.ts index 4af6fa1..2d718dc 100644 --- a/src/context-menu-commands/message/viewRaw.ts +++ b/src/context-menu-commands/message/viewRaw.ts @@ -1,7 +1,7 @@ -import { type BushMessage } from '@lib'; +import { type BushMessage } from '#lib'; import { ContextMenuCommand } from 'discord-akairo'; import { type ContextMenuInteraction } from 'discord.js'; -import ViewRawCommand from '../../commands/utilities/viewRaw'; +import ViewRawCommand from '../../commands/utilities/viewRaw.js'; export default class ViewRawContextMenuCommand extends ContextMenuCommand { public constructor() { diff --git a/src/inhibitors/blacklist/channelGlobalBlacklist.ts b/src/inhibitors/blacklist/channelGlobalBlacklist.ts index c2aad0e..019b778 100644 --- a/src/inhibitors/blacklist/channelGlobalBlacklist.ts +++ b/src/inhibitors/blacklist/channelGlobalBlacklist.ts @@ -1,4 +1,4 @@ -import { BushInhibitor, type BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushInhibitor, type BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; export default class UserGlobalBlacklistInhibitor extends BushInhibitor { public constructor() { diff --git a/src/inhibitors/blacklist/channelGuildBlacklist.ts b/src/inhibitors/blacklist/channelGuildBlacklist.ts index 6725068..60bf452 100644 --- a/src/inhibitors/blacklist/channelGuildBlacklist.ts +++ b/src/inhibitors/blacklist/channelGuildBlacklist.ts @@ -1,4 +1,4 @@ -import { BushInhibitor, type BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushInhibitor, type BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; export default class ChannelGuildBlacklistInhibitor extends BushInhibitor { public constructor() { diff --git a/src/inhibitors/blacklist/guildBlacklist.ts b/src/inhibitors/blacklist/guildBlacklist.ts index f3ae7c7..be7ac22 100644 --- a/src/inhibitors/blacklist/guildBlacklist.ts +++ b/src/inhibitors/blacklist/guildBlacklist.ts @@ -1,4 +1,4 @@ -import { BushInhibitor, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushInhibitor, type BushMessage, type BushSlashMessage } from '#lib'; export default class GuildBlacklistInhibitor extends BushInhibitor { public constructor() { diff --git a/src/inhibitors/blacklist/userGlobalBlacklist.ts b/src/inhibitors/blacklist/userGlobalBlacklist.ts index 8b5d00c..36d4b44 100644 --- a/src/inhibitors/blacklist/userGlobalBlacklist.ts +++ b/src/inhibitors/blacklist/userGlobalBlacklist.ts @@ -1,4 +1,4 @@ -import { BushInhibitor, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushInhibitor, type BushMessage, type BushSlashMessage } from '#lib'; export default class UserGlobalBlacklistInhibitor extends BushInhibitor { public constructor() { diff --git a/src/inhibitors/blacklist/userGuildBlacklist.ts b/src/inhibitors/blacklist/userGuildBlacklist.ts index ed87cf8..dc299c3 100644 --- a/src/inhibitors/blacklist/userGuildBlacklist.ts +++ b/src/inhibitors/blacklist/userGuildBlacklist.ts @@ -1,4 +1,4 @@ -import { BushInhibitor, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushInhibitor, type BushMessage, type BushSlashMessage } from '#lib'; export default class UserGuildBlacklistInhibitor extends BushInhibitor { public constructor() { diff --git a/src/inhibitors/checks/fatal.ts b/src/inhibitors/checks/fatal.ts index 01ff78c..1913fb6 100644 --- a/src/inhibitors/checks/fatal.ts +++ b/src/inhibitors/checks/fatal.ts @@ -1,4 +1,4 @@ -import { BushInhibitor, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushInhibitor, type BushMessage, type BushSlashMessage } from '#lib'; export default class FatalInhibitor extends BushInhibitor { public constructor() { diff --git a/src/inhibitors/checks/guildUnavailable.ts b/src/inhibitors/checks/guildUnavailable.ts index ad70e4b..2ac491d 100644 --- a/src/inhibitors/checks/guildUnavailable.ts +++ b/src/inhibitors/checks/guildUnavailable.ts @@ -1,4 +1,4 @@ -import { BushInhibitor, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushInhibitor, type BushMessage, type BushSlashMessage } from '#lib'; export default class GuildUnavailableInhibitor extends BushInhibitor { public constructor() { diff --git a/src/inhibitors/command/dm.ts b/src/inhibitors/command/dm.ts index 5e1f32d..c52425e 100644 --- a/src/inhibitors/command/dm.ts +++ b/src/inhibitors/command/dm.ts @@ -1,4 +1,4 @@ -import { BushInhibitor, type BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushInhibitor, type BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; export default class DMInhibitor extends BushInhibitor { public constructor() { diff --git a/src/inhibitors/command/globalDisabledCommand.ts b/src/inhibitors/command/globalDisabledCommand.ts index 09fc54a..80c1735 100644 --- a/src/inhibitors/command/globalDisabledCommand.ts +++ b/src/inhibitors/command/globalDisabledCommand.ts @@ -1,4 +1,4 @@ -import { BushInhibitor, type BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushInhibitor, type BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; export default class DisabledGuildCommandInhibitor extends BushInhibitor { public constructor() { diff --git a/src/inhibitors/command/guild.ts b/src/inhibitors/command/guild.ts index a0d3da1..d5f4f17 100644 --- a/src/inhibitors/command/guild.ts +++ b/src/inhibitors/command/guild.ts @@ -1,4 +1,4 @@ -import { BushInhibitor, type BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushInhibitor, type BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; export default class GuildInhibitor extends BushInhibitor { public constructor() { diff --git a/src/inhibitors/command/guildDisabledCommand.ts b/src/inhibitors/command/guildDisabledCommand.ts index defed50..6b69e41 100644 --- a/src/inhibitors/command/guildDisabledCommand.ts +++ b/src/inhibitors/command/guildDisabledCommand.ts @@ -1,4 +1,4 @@ -import { BushInhibitor, type BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushInhibitor, type BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; export default class DisabledGuildCommandInhibitor extends BushInhibitor { public constructor() { diff --git a/src/inhibitors/command/nsfw.ts b/src/inhibitors/command/nsfw.ts index ba798c2..3944fe3 100644 --- a/src/inhibitors/command/nsfw.ts +++ b/src/inhibitors/command/nsfw.ts @@ -1,4 +1,4 @@ -import { BushInhibitor, type BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushInhibitor, type BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; import { type TextChannel } from 'discord.js'; export default class NsfwInhibitor extends BushInhibitor { diff --git a/src/inhibitors/command/owner.ts b/src/inhibitors/command/owner.ts index 92c8d34..816db0b 100644 --- a/src/inhibitors/command/owner.ts +++ b/src/inhibitors/command/owner.ts @@ -1,4 +1,4 @@ -import { BushInhibitor, type BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushInhibitor, type BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; export default class OwnerInhibitor extends BushInhibitor { public constructor() { diff --git a/src/inhibitors/command/restrictedChannel.ts b/src/inhibitors/command/restrictedChannel.ts index 9dab7e2..0f5efce 100644 --- a/src/inhibitors/command/restrictedChannel.ts +++ b/src/inhibitors/command/restrictedChannel.ts @@ -1,4 +1,4 @@ -import { BushInhibitor, type BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushInhibitor, type BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; export default class RestrictedChannelInhibitor extends BushInhibitor { public constructor() { diff --git a/src/inhibitors/command/restrictedGuild.ts b/src/inhibitors/command/restrictedGuild.ts index d7eb5f1..7b5dc58 100644 --- a/src/inhibitors/command/restrictedGuild.ts +++ b/src/inhibitors/command/restrictedGuild.ts @@ -1,4 +1,4 @@ -import { BushInhibitor, type BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushInhibitor, type BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; export default class RestrictedGuildInhibitor extends BushInhibitor { public constructor() { diff --git a/src/inhibitors/command/superUser.ts b/src/inhibitors/command/superUser.ts index 2430982..12f7246 100644 --- a/src/inhibitors/command/superUser.ts +++ b/src/inhibitors/command/superUser.ts @@ -1,4 +1,4 @@ -import { BushInhibitor, type BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { BushInhibitor, type BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; export default class SuperUserInhibitor extends BushInhibitor { public constructor() { diff --git a/src/lib/badwords.ts b/src/lib/badwords.ts index 18c7755..2401a15 100644 --- a/src/lib/badwords.ts +++ b/src/lib/badwords.ts @@ -1,4 +1,4 @@ -import { Severity, type BadWords } from "./common/AutoMod"; +import { Severity, type BadWords } from "./common/AutoMod.js"; export default { /* -------------------------------------------------------------------------- */ diff --git a/src/lib/common/AutoMod.ts b/src/lib/common/AutoMod.ts index c749a33..8b31e55 100644 --- a/src/lib/common/AutoMod.ts +++ b/src/lib/common/AutoMod.ts @@ -1,8 +1,8 @@ -import { Moderation, type BushButtonInteraction, type BushMessage } from '@lib'; +import { Moderation, type BushButtonInteraction, type BushMessage } from '#lib'; import { GuildMember, MessageActionRow, MessageButton, MessageEmbed, type TextChannel } from 'discord.js'; -import badLinksArray from '../badlinks'; -import badLinksSecretArray from '../badlinks-secret'; // I cannot make this public so just make a new file that export defaults an empty array -import badWords from '../badwords'; +import badLinksSecretArray from '../badlinks-secret.js'; // I cannot make this public so just make a new file that export defaults an empty array +import badLinksArray from '../badlinks.js'; +import badWords from '../badwords.js'; export class AutoMod { private message: BushMessage; diff --git a/src/lib/common/ButtonPaginator.ts b/src/lib/common/ButtonPaginator.ts index 58134b5..6a2dba2 100644 --- a/src/lib/common/ButtonPaginator.ts +++ b/src/lib/common/ButtonPaginator.ts @@ -1,11 +1,11 @@ -import { DeleteButton, type BushMessage, type BushSlashMessage } from '@lib'; +import { DeleteButton, type BushMessage, type BushSlashMessage } from '#lib'; import { - Constants, - MessageActionRow, - MessageButton, - MessageEmbed, - type MessageComponentInteraction, - type MessageEmbedOptions + Constants, + MessageActionRow, + MessageButton, + MessageEmbed, + type MessageComponentInteraction, + type MessageEmbedOptions } from 'discord.js'; export class ButtonPaginator { diff --git a/src/lib/common/DeleteButton.ts b/src/lib/common/DeleteButton.ts index 95bae24..4792cf7 100644 --- a/src/lib/common/DeleteButton.ts +++ b/src/lib/common/DeleteButton.ts @@ -1,4 +1,4 @@ -import { PaginateEmojis, type BushMessage, type BushSlashMessage } from '@lib'; +import { PaginateEmojis, type BushMessage, type BushSlashMessage } from '#lib'; import { Constants, MessageActionRow, MessageButton, type MessageComponentInteraction, type MessageOptions } from 'discord.js'; export class DeleteButton { diff --git a/src/lib/common/Format.ts b/src/lib/common/Format.ts index 2557b17..55a6666 100644 --- a/src/lib/common/Format.ts +++ b/src/lib/common/Format.ts @@ -1,4 +1,4 @@ -import { type CodeBlockLang } from '@lib'; +import { type CodeBlockLang } from '#lib'; import { Formatters, Util } from 'discord.js'; /** diff --git a/src/lib/common/Moderation.ts b/src/lib/common/Moderation.ts index d0367d5..13ebf69 100644 --- a/src/lib/common/Moderation.ts +++ b/src/lib/common/Moderation.ts @@ -1,13 +1,13 @@ import { - ActivePunishment, - ActivePunishmentType, - Guild, - ModLog, - ModLogType, - type BushGuildMember, - type BushGuildMemberResolvable, - type BushGuildResolvable -} from '@lib'; + ActivePunishment, + ActivePunishmentType, + Guild, + ModLog, + ModLogType, + type BushGuildMember, + type BushGuildMemberResolvable, + type BushGuildResolvable +} from '#lib'; import { type Snowflake } from 'discord.js'; export class Moderation { diff --git a/src/lib/common/Sentry.ts b/src/lib/common/Sentry.ts index 2040536..1de09ac 100644 --- a/src/lib/common/Sentry.ts +++ b/src/lib/common/Sentry.ts @@ -1,5 +1,5 @@ import * as SentryNode from '@sentry/node'; -import config from './../../config/options'; +import config from './../../config/options.js'; export class Sentry { public constructor() { diff --git a/src/lib/common/util/Arg.ts b/src/lib/common/util/Arg.ts index 3c8e642..ee9aee0 100644 --- a/src/lib/common/util/Arg.ts +++ b/src/lib/common/util/Arg.ts @@ -1,4 +1,4 @@ -import { type BushArgumentType, type BushMessage, type BushSlashMessage } from '@lib'; +import { type BushArgumentType, type BushMessage, type BushSlashMessage } from '#lib'; import { Argument, type ArgumentTypeCaster, type Flag, type ParsedValuePredicate } from 'discord-akairo'; import { type Message } from 'discord.js'; diff --git a/src/lib/extensions/discord-akairo/BushArgumentTypeCaster.ts b/src/lib/extensions/discord-akairo/BushArgumentTypeCaster.ts index c07644c..f27fb89 100644 --- a/src/lib/extensions/discord-akairo/BushArgumentTypeCaster.ts +++ b/src/lib/extensions/discord-akairo/BushArgumentTypeCaster.ts @@ -1,3 +1,3 @@ -import { type BushMessage } from '@lib'; +import { type BushMessage } from '#lib'; export type BushArgumentTypeCaster = (message: BushMessage, phrase: string) => any; diff --git a/src/lib/extensions/discord-akairo/BushClient.ts b/src/lib/extensions/discord-akairo/BushClient.ts index 8f7533c..6b25aaa 100644 --- a/src/lib/extensions/discord-akairo/BushClient.ts +++ b/src/lib/extensions/discord-akairo/BushClient.ts @@ -1,12 +1,24 @@ +import type { + BushApplicationCommand, + BushBaseGuildEmojiManager, + BushChannel, + BushChannelManager, + BushClientEvents, + BushClientUser, + BushGuildManager, + BushReactionEmoji, + BushUserManager, + Config +} from '#lib'; import * as Sentry from '@sentry/node'; import { AkairoClient, ContextMenuCommandHandler, version as akairoVersion } from 'discord-akairo'; import { - DMChannel, - Intents, Options, - Structures, version as discordJsVersion, + Intents, + Options, + Structures, + version as discordJsVersion, type Awaitable, - type Collection, - type InteractionReplyOptions, + type Collection, type DMChannel, type InteractionReplyOptions, type Message, type MessageEditOptions, type MessageOptions, @@ -18,66 +30,59 @@ import { } from 'discord.js'; //@ts-ignore: no typings import eventsIntercept from 'events-intercept'; -import path from 'path'; +import path, { dirname } from 'path'; import readline from 'readline'; -import { Sequelize } from 'sequelize'; -import { abbreviatedNumberTypeCaster } from '../../../arguments/abbreviatedNumber'; -import { contentWithDurationTypeCaster } from '../../../arguments/contentWithDuration'; -import { discordEmojiTypeCaster } from '../../../arguments/discordEmoji'; -import { durationTypeCaster } from '../../../arguments/duration'; -import { durationSecondsTypeCaster } from '../../../arguments/durationSeconds'; -import { globalUserTypeCaster } from '../../../arguments/globalUser'; -import { permissionTypeCaster } from '../../../arguments/permission'; -import { roleWithDurationTypeCaster } from '../../../arguments/roleWithDuation'; -import { snowflakeTypeCaster } from '../../../arguments/snowflake'; -import UpdateCacheTask from '../../../tasks/updateCache'; -import UpdateStatsTask from '../../../tasks/updateStats'; -import { ActivePunishment } from '../../models/ActivePunishment'; -import { Global } from '../../models/Global'; -import { Guild as GuildModel } from '../../models/Guild'; -import { Level } from '../../models/Level'; -import { ModLog } from '../../models/ModLog'; -import { Stat } from '../../models/Stat'; -import { StickyRole } from '../../models/StickyRole'; -import { AllowedMentions } from '../../utils/AllowedMentions'; -import { BushCache } from '../../utils/BushCache'; -import { BushConstants } from '../../utils/BushConstants'; -import { BushLogger } from '../../utils/BushLogger'; -import { Config } from '../../utils/Config'; -import { BushApplicationCommand } from '../discord.js/BushApplicationCommand'; -import { BushBaseGuildEmojiManager } from '../discord.js/BushBaseGuildEmojiManager'; -import { BushButtonInteraction } from '../discord.js/BushButtonInteraction'; -import { BushCategoryChannel } from '../discord.js/BushCategoryChannel'; -import { BushChannel } from '../discord.js/BushChannel'; -import { BushChannelManager } from '../discord.js/BushChannelManager'; -import { BushClientEvents } from '../discord.js/BushClientEvents'; -import { BushClientUser } from '../discord.js/BushClientUser'; -import { BushCommandInteraction } from '../discord.js/BushCommandInteraction'; -import { BushDMChannel } from '../discord.js/BushDMChannel'; -import { BushGuild } from '../discord.js/BushGuild'; -import { BushGuildEmoji } from '../discord.js/BushGuildEmoji'; -import { BushGuildManager } from '../discord.js/BushGuildManager'; -import { BushGuildMember } from '../discord.js/BushGuildMember'; -import { BushMessage } from '../discord.js/BushMessage'; -import { BushMessageReaction } from '../discord.js/BushMessageReaction'; -import { BushNewsChannel } from '../discord.js/BushNewsChannel'; -import { BushPresence } from '../discord.js/BushPresence'; -import { BushReactionEmoji } from '../discord.js/BushReactionEmoji'; -import { BushRole } from '../discord.js/BushRole'; -import { BushSelectMenuInteraction } from '../discord.js/BushSelectMenuInteraction'; -import { BushStoreChannel } from '../discord.js/BushStoreChannel'; -import { BushTextChannel } from '../discord.js/BushTextChannel'; -import { BushThreadChannel } from '../discord.js/BushThreadChannel'; -import { BushThreadMember } from '../discord.js/BushThreadMember'; -import { BushUser } from '../discord.js/BushUser'; -import { BushUserManager } from '../discord.js/BushUserManager'; -import { BushVoiceChannel } from '../discord.js/BushVoiceChannel'; -import { BushVoiceState } from '../discord.js/BushVoiceState'; -import { BushClientUtil } from './BushClientUtil'; -import { BushCommandHandler } from './BushCommandHandler'; -import { BushInhibitorHandler } from './BushInhibitorHandler'; -import { BushListenerHandler } from './BushListenerHandler'; -import { BushTaskHandler } from './BushTaskHandler'; +import type { Sequelize as SequelizeType } from 'sequelize'; +import { fileURLToPath } from 'url'; +import { abbreviatedNumberTypeCaster } from '../../../arguments/abbreviatedNumber.js'; +import { contentWithDurationTypeCaster } from '../../../arguments/contentWithDuration.js'; +import { discordEmojiTypeCaster } from '../../../arguments/discordEmoji.js'; +import { durationTypeCaster } from '../../../arguments/duration.js'; +import { durationSecondsTypeCaster } from '../../../arguments/durationSeconds.js'; +import { globalUserTypeCaster } from '../../../arguments/globalUser.js'; +import { permissionTypeCaster } from '../../../arguments/permission.js'; +import { roleWithDurationTypeCaster } from '../../../arguments/roleWithDuration.js'; +import { snowflakeTypeCaster } from '../../../arguments/snowflake.js'; +import UpdateCacheTask from '../../../tasks/updateCache.js'; +import UpdateStatsTask from '../../../tasks/updateStats.js'; +import { ActivePunishment } from '../../models/ActivePunishment.js'; +import { Global } from '../../models/Global.js'; +import { Guild as GuildModel } from '../../models/Guild.js'; +import { Level } from '../../models/Level.js'; +import { ModLog } from '../../models/ModLog.js'; +import { Stat } from '../../models/Stat.js'; +import { StickyRole } from '../../models/StickyRole.js'; +import { AllowedMentions } from '../../utils/AllowedMentions.js'; +import { BushCache } from '../../utils/BushCache.js'; +import { BushConstants } from '../../utils/BushConstants.js'; +import { BushLogger } from '../../utils/BushLogger.js'; +import { BushButtonInteraction } from '../discord.js/BushButtonInteraction.js'; +import { BushCategoryChannel } from '../discord.js/BushCategoryChannel.js'; +import { BushCommandInteraction } from '../discord.js/BushCommandInteraction.js'; +import { BushDMChannel } from '../discord.js/BushDMChannel.js'; +import { BushGuild } from '../discord.js/BushGuild.js'; +import { BushGuildEmoji } from '../discord.js/BushGuildEmoji.js'; +import { BushGuildMember } from '../discord.js/BushGuildMember.js'; +import { BushMessage } from '../discord.js/BushMessage.js'; +import { BushMessageReaction } from '../discord.js/BushMessageReaction.js'; +import { BushNewsChannel } from '../discord.js/BushNewsChannel.js'; +import { BushPresence } from '../discord.js/BushPresence.js'; +import { BushRole } from '../discord.js/BushRole.js'; +import { BushSelectMenuInteraction } from '../discord.js/BushSelectMenuInteraction.js'; +import { BushStoreChannel } from '../discord.js/BushStoreChannel.js'; +import { BushTextChannel } from '../discord.js/BushTextChannel.js'; +import { BushThreadChannel } from '../discord.js/BushThreadChannel.js'; +import { BushThreadMember } from '../discord.js/BushThreadMember.js'; +import { BushUser } from '../discord.js/BushUser.js'; +import { BushVoiceChannel } from '../discord.js/BushVoiceChannel.js'; +import { BushVoiceState } from '../discord.js/BushVoiceState.js'; +import { BushClientUtil } from './BushClientUtil.js'; +import { BushCommandHandler } from './BushCommandHandler.js'; +import { BushInhibitorHandler } from './BushInhibitorHandler.js'; +import { BushListenerHandler } from './BushListenerHandler.js'; +import { BushTaskHandler } from './BushTaskHandler.js'; +const { Sequelize } = (await import('sequelize')).default; + export type BushReplyMessageType = string | MessagePayload | ReplyMessageOptions; export type BushEditMessageType = string | MessageEditOptions | MessagePayload; @@ -110,6 +115,8 @@ const rl = readline.createInterface({ type If<T extends boolean, A, B = null> = T extends true ? A : T extends false ? B : A | B; +const __dirname = dirname(fileURLToPath(import.meta.url)); + export class BushClient<Ready extends boolean = boolean> extends AkairoClient<Ready> { public static init(): void { Structures.extend('GuildEmoji', () => BushGuildEmoji); @@ -150,7 +157,7 @@ export class BushClient<Ready extends boolean = boolean> extends AkairoClient<Re public contextMenuCommandHandler: ContextMenuCommandHandler; public declare util: BushClientUtil; public declare ownerID: Snowflake[]; - public db: Sequelize; + public db: SequelizeType; public logger = BushLogger; public constants = BushConstants; public cache = BushCache; diff --git a/src/lib/extensions/discord-akairo/BushClientUtil.ts b/src/lib/extensions/discord-akairo/BushClientUtil.ts index 4507458..594c9af 100644 --- a/src/lib/extensions/discord-akairo/BushClientUtil.ts +++ b/src/lib/extensions/discord-akairo/BushClientUtil.ts @@ -4,12 +4,19 @@ import { Global, type BushCache, type BushClient, + type BushInspectOptions, type BushMessage, + type BushNewsChannel, + type BushSlashEditMessageType, type BushSlashMessage, + type BushSlashSendMessageType, + type BushTextChannel, type BushUser, + type BushUserResolvable, + type CodeBlockLang, type Pronoun, type PronounCode -} from '@lib'; +} from '#lib'; import { exec } from 'child_process'; import { ClientUtil, Util as AkairoUtil } from 'discord-akairo'; import { APIMessage } from 'discord-api-types'; @@ -33,13 +40,8 @@ import humanizeDuration from 'humanize-duration'; import _ from 'lodash'; import moment from 'moment'; import { inspect, promisify } from 'util'; -import CommandErrorListener from '../../../listeners/commands/commandError'; -import { Format } from '../../common/Format'; -import { BushInspectOptions } from '../../common/typings/BushInspectOptions'; -import { CodeBlockLang } from '../../common/typings/CodeBlockLang'; -import { BushNewsChannel } from '../discord.js/BushNewsChannel'; -import { BushTextChannel } from '../discord.js/BushTextChannel'; -import { BushSlashEditMessageType, BushSlashSendMessageType, BushUserResolvable } from './BushClient'; +import CommandErrorListener from '../../../listeners/commands/commandError.js'; +import { Format } from '../../common/Format.js'; export class BushClientUtil extends ClientUtil { /** diff --git a/src/lib/extensions/discord-akairo/BushCommand.ts b/src/lib/extensions/discord-akairo/BushCommand.ts index 40c5974..b079649 100644 --- a/src/lib/extensions/discord-akairo/BushCommand.ts +++ b/src/lib/extensions/discord-akairo/BushCommand.ts @@ -1,4 +1,4 @@ -import { type BushClient, type BushCommandHandler, type BushMessage, type BushSlashMessage } from '@lib'; +import { type BushClient, type BushCommandHandler, type BushMessage, type BushSlashMessage } from '#lib'; import { Command, type ArgumentOptions, type ArgumentPromptOptions, type ArgumentTypeCaster, type CommandOptions } from 'discord-akairo'; import { type PermissionResolvable, type Snowflake } from 'discord.js'; diff --git a/src/lib/extensions/discord-akairo/BushCommandHandler.ts b/src/lib/extensions/discord-akairo/BushCommandHandler.ts index 09cb303..2a74aa4 100644 --- a/src/lib/extensions/discord-akairo/BushCommandHandler.ts +++ b/src/lib/extensions/discord-akairo/BushCommandHandler.ts @@ -1,4 +1,4 @@ -import { type BushClient, type BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { type BushClient, type BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; import { CommandHandler, type Category, type CommandHandlerEvents, type CommandHandlerOptions } from 'discord-akairo'; import { type Collection, type PermissionString } from 'discord.js'; diff --git a/src/lib/extensions/discord-akairo/BushCommandUtil.ts b/src/lib/extensions/discord-akairo/BushCommandUtil.ts index 04533bd..f7dd631 100644 --- a/src/lib/extensions/discord-akairo/BushCommandUtil.ts +++ b/src/lib/extensions/discord-akairo/BushCommandUtil.ts @@ -1,4 +1,4 @@ -import { type BushCommand, type BushCommandHandler, type BushMessage, type BushSlashMessage } from '@lib'; +import { type BushCommand, type BushCommandHandler, type BushMessage, type BushSlashMessage } from '#lib'; import { CommandUtil, type ParsedComponentData } from 'discord-akairo'; import { type Collection, type Snowflake } from 'discord.js'; diff --git a/src/lib/extensions/discord-akairo/BushInhibitor.ts b/src/lib/extensions/discord-akairo/BushInhibitor.ts index 638f663..78563c9 100644 --- a/src/lib/extensions/discord-akairo/BushInhibitor.ts +++ b/src/lib/extensions/discord-akairo/BushInhibitor.ts @@ -1,4 +1,4 @@ -import { type BushClient, type BushCommand, type BushMessage, type BushSlashMessage } from '@lib'; +import { type BushClient, type BushCommand, type BushMessage, type BushSlashMessage } from '#lib'; import { Inhibitor } from 'discord-akairo'; export class BushInhibitor extends Inhibitor { diff --git a/src/lib/extensions/discord-akairo/BushInhibitorHandler.ts b/src/lib/extensions/discord-akairo/BushInhibitorHandler.ts index 4984934..a607bf7 100644 --- a/src/lib/extensions/discord-akairo/BushInhibitorHandler.ts +++ b/src/lib/extensions/discord-akairo/BushInhibitorHandler.ts @@ -1,4 +1,4 @@ -import { type BushClient } from '@lib'; +import { type BushClient } from '#lib'; import { InhibitorHandler } from 'discord-akairo'; export class BushInhibitorHandler extends InhibitorHandler { diff --git a/src/lib/extensions/discord-akairo/BushListener.ts b/src/lib/extensions/discord-akairo/BushListener.ts index e3c845c..28aefe5 100644 --- a/src/lib/extensions/discord-akairo/BushListener.ts +++ b/src/lib/extensions/discord-akairo/BushListener.ts @@ -1,4 +1,4 @@ -import { type BushClient } from '@lib'; +import { type BushClient } from '#lib'; import { Listener } from 'discord-akairo'; import type EventEmitter from 'events'; diff --git a/src/lib/extensions/discord-akairo/BushListenerHandler.ts b/src/lib/extensions/discord-akairo/BushListenerHandler.ts index f5354e4..5a556c3 100644 --- a/src/lib/extensions/discord-akairo/BushListenerHandler.ts +++ b/src/lib/extensions/discord-akairo/BushListenerHandler.ts @@ -1,4 +1,4 @@ -import { type BushClient } from '@lib'; +import { type BushClient } from '#lib'; import { ListenerHandler } from 'discord-akairo'; export class BushListenerHandler extends ListenerHandler { diff --git a/src/lib/extensions/discord-akairo/BushSlashMessage.ts b/src/lib/extensions/discord-akairo/BushSlashMessage.ts index fd248b1..4e0c297 100644 --- a/src/lib/extensions/discord-akairo/BushSlashMessage.ts +++ b/src/lib/extensions/discord-akairo/BushSlashMessage.ts @@ -1,4 +1,4 @@ -import { type BushClient, type BushCommandUtil, type BushGuild, type BushGuildMember, type BushUser } from '@lib'; +import { type BushClient, type BushCommandUtil, type BushGuild, type BushGuildMember, type BushUser } from '#lib'; import { AkairoMessage } from 'discord-akairo'; import { type CommandInteraction } from 'discord.js'; diff --git a/src/lib/extensions/discord-akairo/BushTask.ts b/src/lib/extensions/discord-akairo/BushTask.ts index 299e977..4a2068d 100644 --- a/src/lib/extensions/discord-akairo/BushTask.ts +++ b/src/lib/extensions/discord-akairo/BushTask.ts @@ -1,4 +1,4 @@ -import { type BushClient } from '@lib'; +import { type BushClient } from '#lib'; import { Task, type TaskOptions } from 'discord-akairo'; export class BushTask extends Task { diff --git a/src/lib/extensions/discord-akairo/BushTaskHandler.ts b/src/lib/extensions/discord-akairo/BushTaskHandler.ts index 8531ff1..d5ccad6 100644 --- a/src/lib/extensions/discord-akairo/BushTaskHandler.ts +++ b/src/lib/extensions/discord-akairo/BushTaskHandler.ts @@ -1,4 +1,4 @@ -import { type BushClient } from '@lib'; +import { type BushClient } from '#lib'; import { TaskHandler, type AkairoHandlerOptions } from 'discord-akairo'; export type BushTaskHandlerOptions = AkairoHandlerOptions; diff --git a/src/lib/extensions/discord.js/BushActivity.ts b/src/lib/extensions/discord.js/BushActivity.ts index 1da5fac..10d7f05 100644 --- a/src/lib/extensions/discord.js/BushActivity.ts +++ b/src/lib/extensions/discord.js/BushActivity.ts @@ -1,6 +1,6 @@ -import { type BushEmoji, type BushPresence } from '@lib'; +import type { BushEmoji, BushPresence } from '#lib'; import { Activity } from 'discord.js'; -import { type RawActivityData } from 'discord.js/typings/rawDataTypes'; +import type { RawActivityData } from 'discord.js/typings/rawDataTypes'; export class BushActivity extends Activity { public declare emoji: BushEmoji | null; diff --git a/src/lib/extensions/discord.js/BushApplicationCommand.ts b/src/lib/extensions/discord.js/BushApplicationCommand.ts index 9dfba65..35d598d 100644 --- a/src/lib/extensions/discord.js/BushApplicationCommand.ts +++ b/src/lib/extensions/discord.js/BushApplicationCommand.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/ban-types */ -import { type BushClient, type BushGuild } from '@lib'; +import type { BushClient, BushGuild } from '#lib'; import { ApplicationCommand, type Snowflake } from 'discord.js'; -import { type RawApplicationCommandData } from 'discord.js/typings/rawDataTypes'; +import type { RawApplicationCommandData } from 'discord.js/typings/rawDataTypes'; export class BushApplicationCommand<PermissionsFetchType = {}> extends ApplicationCommand<PermissionsFetchType> { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushApplicationCommandManager.d.ts b/src/lib/extensions/discord.js/BushApplicationCommandManager.d.ts index 89ad55d..7947acd 100644 --- a/src/lib/extensions/discord.js/BushApplicationCommandManager.d.ts +++ b/src/lib/extensions/discord.js/BushApplicationCommandManager.d.ts @@ -1,12 +1,18 @@ +import type { + BushApplicationCommand, + BushApplicationCommandPermissionsManager, + BushApplicationCommandResolvable, + BushClient, + BushGuildResolvable +} from '#lib'; +import type { APIApplicationCommand } from 'discord-api-types'; import { - type BushApplicationCommand, - type BushApplicationCommandPermissionsManager, - type BushApplicationCommandResolvable, - type BushClient, - type BushGuildResolvable -} from '@lib'; -import { type APIApplicationCommand } from 'discord-api-types'; -import { CachedManager, type ApplicationCommandData, type Collection, type FetchApplicationCommandOptions, type Snowflake } from 'discord.js'; + CachedManager, + type ApplicationCommandData, + type Collection, + type FetchApplicationCommandOptions, + type Snowflake +} from 'discord.js'; export class BushApplicationCommandManager< ApplicationCommandScope = BushApplicationCommand<{ guild: BushGuildResolvable }>, diff --git a/src/lib/extensions/discord.js/BushApplicationCommandPermissionsManager.d.ts b/src/lib/extensions/discord.js/BushApplicationCommandPermissionsManager.d.ts index 0fd47ac..5f2e4da 100644 --- a/src/lib/extensions/discord.js/BushApplicationCommandPermissionsManager.d.ts +++ b/src/lib/extensions/discord.js/BushApplicationCommandPermissionsManager.d.ts @@ -1,7 +1,8 @@ -import { type BushClient, type BushRoleResolvable, type BushUserResolvable } from '@lib'; -import { type APIApplicationCommandPermission } from 'discord-api-types'; +import type { BushClient, BushRoleResolvable, BushUserResolvable } from '#lib'; +import type { APIApplicationCommandPermission } from 'discord-api-types'; import { - BaseManager, type ApplicationCommand, + BaseManager, + type ApplicationCommand, type ApplicationCommandManager, type ApplicationCommandPermissionData, type ApplicationCommandPermissions, @@ -10,7 +11,7 @@ import { type GuildApplicationCommandPermissionData, type Snowflake } from 'discord.js'; -import { type ApplicationCommandPermissionTypes } from 'discord.js/typings/enums'; +import type { ApplicationCommandPermissionTypes } from 'discord.js/typings/enums'; export class BushApplicationCommandPermissionsManager< BaseOptions, diff --git a/src/lib/extensions/discord.js/BushBaseGuildEmojiManager.d.ts b/src/lib/extensions/discord.js/BushBaseGuildEmojiManager.d.ts index b3704b6..7c913a9 100644 --- a/src/lib/extensions/discord.js/BushBaseGuildEmojiManager.d.ts +++ b/src/lib/extensions/discord.js/BushBaseGuildEmojiManager.d.ts @@ -1,4 +1,4 @@ -import { type BushClient, type BushEmojiIdentifierResolvable, type BushEmojiResolvable, type BushGuildEmoji } from '@lib'; +import type { BushClient, BushEmojiIdentifierResolvable, BushEmojiResolvable, BushGuildEmoji } from '#lib'; import { CachedManager, type Snowflake } from 'discord.js'; import { type RawGuildEmojiData } from 'discord.js/typings/rawDataTypes'; diff --git a/src/lib/extensions/discord.js/BushBaseGuildTextChannel.ts b/src/lib/extensions/discord.js/BushBaseGuildTextChannel.ts index 38a8a7d..652a50f 100644 --- a/src/lib/extensions/discord.js/BushBaseGuildTextChannel.ts +++ b/src/lib/extensions/discord.js/BushBaseGuildTextChannel.ts @@ -1,11 +1,11 @@ -import { - type BushCategoryChannel, - type BushClient, - type BushGuild, - type BushGuildMember, - type BushMessageManager, - type BushThreadManager -} from '@lib'; +import type { + BushCategoryChannel, + BushClient, + BushGuild, + BushGuildMember, + BushMessageManager, + BushThreadManager +} from '#lib'; import { BaseGuildTextChannel, type AllowedThreadTypeForNewsChannel, @@ -13,7 +13,7 @@ import { type Collection, type Snowflake } from 'discord.js'; -import { type RawGuildChannelData } from 'discord.js/typings/rawDataTypes'; +import type { RawGuildChannelData } from 'discord.js/typings/rawDataTypes'; export class BushBaseGuildTextChannel extends BaseGuildTextChannel { public constructor(guild: BushGuild, data?: RawGuildChannelData, client?: BushClient, immediatePatch?: boolean) { diff --git a/src/lib/extensions/discord.js/BushButtonInteraction.ts b/src/lib/extensions/discord.js/BushButtonInteraction.ts index 2146e5c..03ec881 100644 --- a/src/lib/extensions/discord.js/BushButtonInteraction.ts +++ b/src/lib/extensions/discord.js/BushButtonInteraction.ts @@ -1,7 +1,7 @@ -import { type BushClient, type BushGuild, type BushGuildMember, type BushTextBasedChannels, type BushUser } from '@lib'; -import { type APIInteractionGuildMember } from 'discord-api-types/v9'; +import type { BushClient, BushGuild, BushGuildMember, BushTextBasedChannels, BushUser } from '#lib'; +import type { APIInteractionGuildMember } from 'discord-api-types/v9'; import { ButtonInteraction, type CacheType, type CacheTypeReducer } from 'discord.js'; -import { type RawMessageButtonInteractionData } from 'discord.js/typings/rawDataTypes'; +import type { RawMessageButtonInteractionData } from 'discord.js/typings/rawDataTypes'; export class BushButtonInteraction<Cached extends CacheType = CacheType> extends ButtonInteraction<Cached> { public declare readonly channel: CacheTypeReducer<Cached, BushTextBasedChannels | null>; diff --git a/src/lib/extensions/discord.js/BushCategoryChannel.ts b/src/lib/extensions/discord.js/BushCategoryChannel.ts index a97c21b..90f52dd 100644 --- a/src/lib/extensions/discord.js/BushCategoryChannel.ts +++ b/src/lib/extensions/discord.js/BushCategoryChannel.ts @@ -1,4 +1,4 @@ -import { type BushClient, type BushGuild, type BushGuildChannel, type BushGuildMember } from '@lib'; +import { type BushClient, type BushGuild, type BushGuildChannel, type BushGuildMember } from '#lib'; import { CategoryChannel, type Collection, type Snowflake } from 'discord.js'; import { type RawGuildChannelData } from 'discord.js/typings/rawDataTypes'; diff --git a/src/lib/extensions/discord.js/BushChannel.d.ts b/src/lib/extensions/discord.js/BushChannel.d.ts index 1c47018..9a78b9a 100644 --- a/src/lib/extensions/discord.js/BushChannel.d.ts +++ b/src/lib/extensions/discord.js/BushChannel.d.ts @@ -1,7 +1,7 @@ -import { type BushClient, type BushStageChannel, type BushTextBasedChannels, type BushThreadChannel, type BushVoiceChannel } from '@lib'; +import type { BushClient, BushStageChannel, BushTextBasedChannels, BushThreadChannel, BushVoiceChannel } from '#lib'; import { Channel, type ChannelMention, type Snowflake } from 'discord.js'; -import { type ChannelTypes } from 'discord.js/typings/enums'; -import { type RawChannelData } from 'discord.js/typings/rawDataTypes'; +import type { ChannelTypes } from 'discord.js/typings/enums'; +import type { RawChannelData } from 'discord.js/typings/rawDataTypes'; export class BushChannel extends Channel { public constructor(client: BushClient, data?: RawChannelData, immediatePatch?: boolean); diff --git a/src/lib/extensions/discord.js/BushChannelManager.d.ts b/src/lib/extensions/discord.js/BushChannelManager.d.ts index 7ebeb79..843b956 100644 --- a/src/lib/extensions/discord.js/BushChannelManager.d.ts +++ b/src/lib/extensions/discord.js/BushChannelManager.d.ts @@ -1,6 +1,6 @@ -import { type BushChannel, type BushChannelResolvable } from '@lib'; +import type { BushChannel, BushChannelResolvable } from '#lib'; import { CachedManager, type Client, type FetchChannelOptions, type Snowflake } from 'discord.js'; -import { type RawChannelData } from 'discord.js/typings/rawDataTypes'; +import type { RawChannelData } from 'discord.js/typings/rawDataTypes'; export class BushChannelManager extends CachedManager<Snowflake, BushChannel, BushChannelResolvable> { public constructor(client: Client, iterable: Iterable<RawChannelData>); diff --git a/src/lib/extensions/discord.js/BushClientEvents.d.ts b/src/lib/extensions/discord.js/BushClientEvents.d.ts index 3e9fbf9..7d22064 100644 --- a/src/lib/extensions/discord.js/BushClientEvents.d.ts +++ b/src/lib/extensions/discord.js/BushClientEvents.d.ts @@ -1,41 +1,41 @@ -import { - type BushApplicationCommand, - type BushClient, - type BushDMChannel, - type BushGuild, - type BushGuildBan, - type BushGuildChannel, - type BushGuildEmoji, - type BushGuildMember, - type BushMessage, - type BushMessageReaction, - type BushNewsChannel, - type BushPresence, - type BushRole, - type BushStageInstance, - type BushTextBasedChannels, - type BushTextChannel, - type BushThreadChannel, - type BushThreadMember, - type BushUser, - type BushVoiceState, - type Guild, - type GuildSettings, - type PartialBushGuildMember, - type PartialBushMessage, - type PartialBushMessageReaction, - type PartialBushUser -} from '@lib'; -import { type AkairoClientEvents } from 'discord-akairo'; -import { - type Collection, - type Interaction, - type InvalidRequestWarningData, - type Invite, - type RateLimitData, - type Snowflake, - type Sticker, - type Typing +import type { + BushApplicationCommand, + BushClient, + BushDMChannel, + BushGuild, + BushGuildBan, + BushGuildChannel, + BushGuildEmoji, + BushGuildMember, + BushMessage, + BushMessageReaction, + BushNewsChannel, + BushPresence, + BushRole, + BushStageInstance, + BushTextBasedChannels, + BushTextChannel, + BushThreadChannel, + BushThreadMember, + BushUser, + BushVoiceState, + Guild, + GuildSettings, + PartialBushGuildMember, + PartialBushMessage, + PartialBushMessageReaction, + PartialBushUser +} from '#lib'; +import type { AkairoClientEvents } from 'discord-akairo'; +import type { + Collection, + Interaction, + InvalidRequestWarningData, + Invite, + RateLimitData, + Snowflake, + Sticker, + Typing } from 'discord.js'; export interface BushClientEvents extends AkairoClientEvents { diff --git a/src/lib/extensions/discord.js/BushClientUser.d.ts b/src/lib/extensions/discord.js/BushClientUser.d.ts index b045a75..c307553 100644 --- a/src/lib/extensions/discord.js/BushClientUser.d.ts +++ b/src/lib/extensions/discord.js/BushClientUser.d.ts @@ -1,11 +1,11 @@ -import { - type ActivityOptions, - type Base64Resolvable, - type BufferResolvable, - type ClientPresence, - type ClientUserEditData, - type PresenceData, - type PresenceStatusData +import type { + ActivityOptions, + Base64Resolvable, + BufferResolvable, + ClientPresence, + ClientUserEditData, + PresenceData, + PresenceStatusData } from 'discord.js'; import { BushUser } from './BushUser'; diff --git a/src/lib/extensions/discord.js/BushCommandInteraction.ts b/src/lib/extensions/discord.js/BushCommandInteraction.ts index 4202cfd..3cbef57 100644 --- a/src/lib/extensions/discord.js/BushCommandInteraction.ts +++ b/src/lib/extensions/discord.js/BushCommandInteraction.ts @@ -1,15 +1,15 @@ -import { - type BushApplicationCommand, - type BushGuild, - type BushGuildChannel, - type BushGuildEmoji, - type BushGuildMember, - type BushRole, - type BushUser -} from '@lib'; -import { type APIInteractionGuildMember } from 'discord-api-types/v9'; +import type { + BushApplicationCommand, + BushGuild, + BushGuildChannel, + BushGuildEmoji, + BushGuildMember, + BushRole, + BushUser +} from '#lib'; +import type { APIInteractionGuildMember } from 'discord-api-types/v9'; import { CommandInteraction, type CacheType, type CacheTypeReducer, type Invite, type Snowflake } from 'discord.js'; -import { type RawCommandInteractionData } from 'discord.js/typings/rawDataTypes'; +import type { RawCommandInteractionData } from 'discord.js/typings/rawDataTypes'; import { BushTextBasedChannels, type BushClient } from '../discord-akairo/BushClient'; export type BushGuildResolvable = BushGuild | BushGuildChannel | BushGuildMember | BushGuildEmoji | Invite | BushRole | Snowflake; diff --git a/src/lib/extensions/discord.js/BushDMChannel.ts b/src/lib/extensions/discord.js/BushDMChannel.ts index 9730c30..ca08d7e 100644 --- a/src/lib/extensions/discord.js/BushDMChannel.ts +++ b/src/lib/extensions/discord.js/BushDMChannel.ts @@ -1,6 +1,6 @@ -import { type BushClient, type BushMessageManager, type BushUser } from '@lib'; +import type { BushClient, BushMessageManager, BushUser } from '#lib'; import { DMChannel } from 'discord.js'; -import { type RawDMChannelData } from 'discord.js/typings/rawDataTypes'; +import type { RawDMChannelData } from 'discord.js/typings/rawDataTypes'; export class BushDMChannel extends DMChannel { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushEmoji.ts b/src/lib/extensions/discord.js/BushEmoji.ts index fc27a99..4c97fee 100644 --- a/src/lib/extensions/discord.js/BushEmoji.ts +++ b/src/lib/extensions/discord.js/BushEmoji.ts @@ -1,6 +1,6 @@ -import { type BushClient } from '@lib'; +import type { BushClient } from '#lib'; import { Emoji } from 'discord.js'; -import { type RawEmojiData } from 'discord.js/typings/rawDataTypes'; +import type { RawEmojiData } from 'discord.js/typings/rawDataTypes'; export class BushEmoji extends Emoji { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushGuild.ts b/src/lib/extensions/discord.js/BushGuild.ts index dff9d85..dd01c55 100644 --- a/src/lib/extensions/discord.js/BushGuild.ts +++ b/src/lib/extensions/discord.js/BushGuild.ts @@ -1,19 +1,19 @@ -import { - type BushClient, - type BushGuildMember, - type BushGuildMemberManager, - type BushTextChannel, - type BushUser, - type BushUserResolvable, - type GuildFeatures, - type GuildLogType, - type GuildModel -} from '@lib'; +import type { + BushClient, + BushGuildMember, + BushGuildMemberManager, + BushTextChannel, + BushUser, + BushUserResolvable, + GuildFeatures, + GuildLogType, + GuildModel +} from '#lib'; import { Guild, type MessageOptions, type UserResolvable } from 'discord.js'; -import { type RawGuildData } from 'discord.js/typings/rawDataTypes'; -import { Moderation } from '../../common/Moderation'; -import { Guild as GuildDB } from '../../models/Guild'; -import { ModLogType } from '../../models/ModLog'; +import type { RawGuildData } from 'discord.js/typings/rawDataTypes'; +import { Moderation } from '../../common/Moderation.js'; +import { Guild as GuildDB } from '../../models/Guild.js'; +import { ModLogType } from '../../models/ModLog.js'; export class BushGuild extends Guild { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushGuildApplicationCommandManager.d.ts b/src/lib/extensions/discord.js/BushGuildApplicationCommandManager.d.ts index 3c71a01..f8e80ae 100644 --- a/src/lib/extensions/discord.js/BushGuildApplicationCommandManager.d.ts +++ b/src/lib/extensions/discord.js/BushGuildApplicationCommandManager.d.ts @@ -5,9 +5,9 @@ import { type BushApplicationCommandResolvable, type BushClient, type BushGuild -} from '@lib'; -import { type ApplicationCommandData, type BaseFetchOptions, type Collection, type Snowflake } from 'discord.js'; -import { type RawApplicationCommandData } from 'discord.js/typings/rawDataTypes'; +} from '#lib'; +import type { ApplicationCommandData, BaseFetchOptions, Collection, Snowflake } from 'discord.js'; +import type { RawApplicationCommandData } from 'discord.js/typings/rawDataTypes'; export class BushGuildApplicationCommandManager extends BushApplicationCommandManager<BushApplicationCommand, {}, BushGuild> { public constructor(guild: BushGuild, iterable?: Iterable<RawApplicationCommandData>); diff --git a/src/lib/extensions/discord.js/BushGuildBan.d.ts b/src/lib/extensions/discord.js/BushGuildBan.d.ts index 5d50bb4..4287792 100644 --- a/src/lib/extensions/discord.js/BushGuildBan.d.ts +++ b/src/lib/extensions/discord.js/BushGuildBan.d.ts @@ -1,6 +1,6 @@ -import { type BushClient, type BushGuild, type BushUser } from '@lib'; +import type { BushClient, BushGuild, BushUser } from '#lib'; import { GuildBan } from 'discord.js'; -import { type RawGuildBanData } from 'discord.js/typings/rawDataTypes'; +import type { RawGuildBanData } from 'discord.js/typings/rawDataTypes'; export class BushGuildBan extends GuildBan { public constructor(client: BushClient, data: RawGuildBanData, guild: BushGuild); diff --git a/src/lib/extensions/discord.js/BushGuildChannel.ts b/src/lib/extensions/discord.js/BushGuildChannel.ts index ee51c3b..ddf4c9a 100644 --- a/src/lib/extensions/discord.js/BushGuildChannel.ts +++ b/src/lib/extensions/discord.js/BushGuildChannel.ts @@ -1,6 +1,6 @@ -import { type BushClient, type BushGuild } from '@lib'; +import type { BushClient, BushGuild } from '#lib'; import { GuildChannel } from 'discord.js'; -import { type RawGuildChannelData } from 'discord.js/typings/rawDataTypes'; +import type { RawGuildChannelData } from 'discord.js/typings/rawDataTypes'; export class BushGuildChannel extends GuildChannel { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushGuildEmoji.ts b/src/lib/extensions/discord.js/BushGuildEmoji.ts index 8d5493b..f3a7491 100644 --- a/src/lib/extensions/discord.js/BushGuildEmoji.ts +++ b/src/lib/extensions/discord.js/BushGuildEmoji.ts @@ -1,6 +1,6 @@ -import { type BushClient, type BushGuild, type BushGuildEmojiRoleManager, type BushUser } from '@lib'; +import type { BushClient, BushGuild, BushGuildEmojiRoleManager, BushUser } from '#lib'; import { GuildEmoji } from 'discord.js'; -import { type RawGuildEmojiData } from 'discord.js/typings/rawDataTypes'; +import type { RawGuildEmojiData } from 'discord.js/typings/rawDataTypes'; export class BushGuildEmoji extends GuildEmoji { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushGuildEmojiRoleManager.d.ts b/src/lib/extensions/discord.js/BushGuildEmojiRoleManager.d.ts index 8b886bd..3aae4f0 100644 --- a/src/lib/extensions/discord.js/BushGuildEmojiRoleManager.d.ts +++ b/src/lib/extensions/discord.js/BushGuildEmojiRoleManager.d.ts @@ -1,4 +1,4 @@ -import { type BushClient, type BushGuild, type BushGuildEmoji, type BushRole, type BushRoleResolvable } from '@lib'; +import type { BushClient, BushGuild, BushGuildEmoji, BushRole, BushRoleResolvable } from '#lib'; import { DataManager, type Collection, type Snowflake } from 'discord.js'; export class BushGuildEmojiRoleManager extends DataManager<Snowflake, BushRole, BushRoleResolvable> { diff --git a/src/lib/extensions/discord.js/BushGuildManager.d.ts b/src/lib/extensions/discord.js/BushGuildManager.d.ts index 1a56b8f..5bb8822 100644 --- a/src/lib/extensions/discord.js/BushGuildManager.d.ts +++ b/src/lib/extensions/discord.js/BushGuildManager.d.ts @@ -1,4 +1,4 @@ -import { type BushClient, type BushGuild, type BushGuildResolvable } from '@lib'; +import type { BushClient, BushGuild, BushGuildResolvable } from '#lib'; import { CachedManager, type Collection, diff --git a/src/lib/extensions/discord.js/BushGuildMember.ts b/src/lib/extensions/discord.js/BushGuildMember.ts index 32f0156..0667646 100644 --- a/src/lib/extensions/discord.js/BushGuildMember.ts +++ b/src/lib/extensions/discord.js/BushGuildMember.ts @@ -1,6 +1,6 @@ -import { Moderation, ModLogType, type BushClient, type BushGuild, type BushRole, type BushUser } from '@lib'; +import { Moderation, ModLogType, type BushClient, type BushGuild, type BushRole, type BushUser } from '#lib'; import { GuildMember, MessageEmbed, type Partialize, type Role } from 'discord.js'; -import { type RawGuildMemberData } from 'discord.js/typings/rawDataTypes'; +import type { RawGuildMemberData } from 'discord.js/typings/rawDataTypes'; interface BushPunishmentOptions { reason?: string | null; diff --git a/src/lib/extensions/discord.js/BushGuildMemberManager.d.ts b/src/lib/extensions/discord.js/BushGuildMemberManager.d.ts index f5e0846..8b1248c 100644 --- a/src/lib/extensions/discord.js/BushGuildMemberManager.d.ts +++ b/src/lib/extensions/discord.js/BushGuildMemberManager.d.ts @@ -1,11 +1,11 @@ -import { - type BushClient, - type BushGuild, - type BushGuildMember, - type BushGuildMemberResolvable, - type BushUser, - type BushUserResolvable -} from '@lib'; +import type { + BushClient, + BushGuild, + BushGuildMember, + BushGuildMemberResolvable, + BushUser, + BushUserResolvable +} from '#lib'; import { CachedManager, type AddGuildMemberOptions, @@ -19,7 +19,7 @@ import { type GuildSearchMembersOptions, type Snowflake } from 'discord.js'; -import { type RawGuildMemberData } from 'discord.js/typings/rawDataTypes'; +import type { RawGuildMemberData } from 'discord.js/typings/rawDataTypes'; export class BushGuildMemberManager extends CachedManager<Snowflake, BushGuildMember, BushGuildMemberResolvable> { public constructor(guild: BushGuild, iterable?: Iterable<RawGuildMemberData>); diff --git a/src/lib/extensions/discord.js/BushMessage.ts b/src/lib/extensions/discord.js/BushMessage.ts index d64ac6e..83ae59b 100644 --- a/src/lib/extensions/discord.js/BushMessage.ts +++ b/src/lib/extensions/discord.js/BushMessage.ts @@ -1,14 +1,14 @@ -import { - type BushClient, - type BushCommandUtil, - type BushGuild, - type BushGuildMember, - type BushGuildTextBasedChannel, - type BushTextBasedChannels, - type BushUser -} from '@lib'; +import type { + BushClient, + BushCommandUtil, + BushGuild, + BushGuildMember, + BushGuildTextBasedChannel, + BushTextBasedChannels, + BushUser +} from '#lib'; import { Message, type If, type Partialize } from 'discord.js'; -import { type RawMessageData } from 'discord.js/typings/rawDataTypes'; +import type { RawMessageData } from 'discord.js/typings/rawDataTypes'; export type PartialBushMessage = Partialize< BushMessage, diff --git a/src/lib/extensions/discord.js/BushMessageManager.d.ts b/src/lib/extensions/discord.js/BushMessageManager.d.ts index 98a24d8..9ded94c 100644 --- a/src/lib/extensions/discord.js/BushMessageManager.d.ts +++ b/src/lib/extensions/discord.js/BushMessageManager.d.ts @@ -1,13 +1,14 @@ -import { BushMessageResolvable, type BushMessage, type BushTextBasedChannels } from '@lib'; +import { BushMessageResolvable, type BushMessage, type BushTextBasedChannels } from '#lib'; import { - CachedManager, type BaseFetchOptions, - type ChannelLogsQueryOptions, - type Collection, - type EmojiIdentifierResolvable, - type MessageEditOptions, - type MessagePayload, type Snowflake + CachedManager, + type BaseFetchOptions, + type ChannelLogsQueryOptions, + type Collection, + type EmojiIdentifierResolvable, + type MessageEditOptions, + type MessagePayload, type Snowflake } from 'discord.js'; -import { type RawMessageData } from 'discord.js/typings/rawDataTypes'; +import type { RawMessageData } from 'discord.js/typings/rawDataTypes'; export class BushMessageManager extends CachedManager<Snowflake, BushMessage, BushMessageResolvable> { public constructor(channel: BushTextBasedChannels, iterable?: Iterable<RawMessageData>); diff --git a/src/lib/extensions/discord.js/BushMessageReaction.ts b/src/lib/extensions/discord.js/BushMessageReaction.ts index b56ae28..51b439a 100644 --- a/src/lib/extensions/discord.js/BushMessageReaction.ts +++ b/src/lib/extensions/discord.js/BushMessageReaction.ts @@ -1,6 +1,6 @@ -import { type BushClient, type BushGuildEmoji, type BushMessage, type BushReactionEmoji } from '@lib'; +import type { BushClient, BushGuildEmoji, BushMessage, BushReactionEmoji } from '#lib'; import { MessageReaction, type Partialize } from 'discord.js'; -import { type RawMessageReactionData } from 'discord.js/typings/rawDataTypes'; +import type { RawMessageReactionData } from 'discord.js/typings/rawDataTypes'; export type PartialBushMessageReaction = Partialize<BushMessageReaction, 'count'>; diff --git a/src/lib/extensions/discord.js/BushNewsChannel.ts b/src/lib/extensions/discord.js/BushNewsChannel.ts index f30de3e..716c57d 100644 --- a/src/lib/extensions/discord.js/BushNewsChannel.ts +++ b/src/lib/extensions/discord.js/BushNewsChannel.ts @@ -1,4 +1,4 @@ -import { type BushGuild, type BushGuildMember, type BushMessageManager, type BushThreadManager } from '@lib'; +import type { BushGuild, BushGuildMember, BushMessageManager, BushThreadManager } from '#lib'; import { NewsChannel, type AllowedThreadTypeForNewsChannel, type Collection, type Snowflake } from 'discord.js'; export class BushNewsChannel extends NewsChannel { diff --git a/src/lib/extensions/discord.js/BushPresence.ts b/src/lib/extensions/discord.js/BushPresence.ts index c5464a5..60408f0 100644 --- a/src/lib/extensions/discord.js/BushPresence.ts +++ b/src/lib/extensions/discord.js/BushPresence.ts @@ -1,6 +1,6 @@ -import { type BushClient, type BushGuild, type BushGuildMember, type BushUser } from '@lib'; +import type { BushClient, BushGuild, BushGuildMember, BushUser } from '#lib'; import { Presence } from 'discord.js'; -import { type RawPresenceData } from 'discord.js/typings/rawDataTypes'; +import type { RawPresenceData } from 'discord.js/typings/rawDataTypes'; export class BushPresence extends Presence { public declare guild: BushGuild | null; diff --git a/src/lib/extensions/discord.js/BushReactionEmoji.ts b/src/lib/extensions/discord.js/BushReactionEmoji.ts index 5dd3d92..2e87183 100644 --- a/src/lib/extensions/discord.js/BushReactionEmoji.ts +++ b/src/lib/extensions/discord.js/BushReactionEmoji.ts @@ -1,6 +1,6 @@ -import { type BushMessageReaction } from '@lib'; +import type { BushMessageReaction } from '#lib'; import { ReactionEmoji } from 'discord.js'; -import { type RawReactionEmojiData } from 'discord.js/typings/rawDataTypes'; +import type { RawReactionEmojiData } from 'discord.js/typings/rawDataTypes'; export class BushReactionEmoji extends ReactionEmoji { public declare reaction: BushMessageReaction; diff --git a/src/lib/extensions/discord.js/BushRole.ts b/src/lib/extensions/discord.js/BushRole.ts index b610699..10757c1 100644 --- a/src/lib/extensions/discord.js/BushRole.ts +++ b/src/lib/extensions/discord.js/BushRole.ts @@ -1,6 +1,6 @@ -import { type BushClient, type BushGuild, type BushGuildMember } from '@lib'; +import type { BushClient, BushGuild, BushGuildMember } from '#lib'; import { Role, type Collection, type Snowflake } from 'discord.js'; -import { type RawRoleData } from 'discord.js/typings/rawDataTypes'; +import type { RawRoleData } from 'discord.js/typings/rawDataTypes'; export class BushRole extends Role { public declare guild: BushGuild; diff --git a/src/lib/extensions/discord.js/BushSelectMenuInteraction.ts b/src/lib/extensions/discord.js/BushSelectMenuInteraction.ts index cffc099..7581236 100644 --- a/src/lib/extensions/discord.js/BushSelectMenuInteraction.ts +++ b/src/lib/extensions/discord.js/BushSelectMenuInteraction.ts @@ -1,7 +1,7 @@ -import { type BushClient, type BushGuild, type BushGuildMember, type BushTextBasedChannels, type BushUser } from '@lib'; -import { type APIInteractionGuildMember } from 'discord-api-types/v9'; +import type { BushClient, BushGuild, BushGuildMember, BushTextBasedChannels, BushUser } from '#lib'; +import type { APIInteractionGuildMember } from 'discord-api-types/v9'; import { SelectMenuInteraction, type CacheType, type CacheTypeReducer } from 'discord.js'; -import { type RawMessageSelectMenuInteractionData } from 'discord.js/typings/rawDataTypes'; +import type { RawMessageSelectMenuInteractionData } from 'discord.js/typings/rawDataTypes'; export class BushSelectMenuInteraction<Cached extends CacheType = CacheType> extends SelectMenuInteraction<Cached> { public declare readonly channel: CacheTypeReducer<Cached, BushTextBasedChannels | null>; diff --git a/src/lib/extensions/discord.js/BushStageChannel.ts b/src/lib/extensions/discord.js/BushStageChannel.ts index a5b6b53..5b1fd88 100644 --- a/src/lib/extensions/discord.js/BushStageChannel.ts +++ b/src/lib/extensions/discord.js/BushStageChannel.ts @@ -1,6 +1,6 @@ -import { type BushCategoryChannel, type BushGuild, type BushGuildMember, type BushStageInstance } from '@lib'; +import type { BushCategoryChannel, BushGuild, BushGuildMember, BushStageInstance } from '#lib'; import { StageChannel, type Collection, type Snowflake } from 'discord.js'; -import { type RawGuildChannelData } from 'discord.js/typings/rawDataTypes'; +import type { RawGuildChannelData } from 'discord.js/typings/rawDataTypes'; export class BushStageChannel extends StageChannel { public declare readonly instance: BushStageInstance | null; diff --git a/src/lib/extensions/discord.js/BushStageInstance.ts b/src/lib/extensions/discord.js/BushStageInstance.ts index 4ebfc3c..67b1030 100644 --- a/src/lib/extensions/discord.js/BushStageInstance.ts +++ b/src/lib/extensions/discord.js/BushStageInstance.ts @@ -1,6 +1,6 @@ -import { type BushClient, type BushGuild, type BushStageChannel } from '@lib'; +import type { BushClient, BushGuild, BushStageChannel } from '#lib'; import { StageInstance } from 'discord.js'; -import { type RawStageInstanceData } from 'discord.js/typings/rawDataTypes'; +import type { RawStageInstanceData } from 'discord.js/typings/rawDataTypes'; export class BushStageInstance extends StageInstance { public declare readonly channel: BushStageChannel | null; diff --git a/src/lib/extensions/discord.js/BushStoreChannel.ts b/src/lib/extensions/discord.js/BushStoreChannel.ts index 5b9def0..8540936 100644 --- a/src/lib/extensions/discord.js/BushStoreChannel.ts +++ b/src/lib/extensions/discord.js/BushStoreChannel.ts @@ -1,6 +1,6 @@ -import { type BushCategoryChannel, type BushClient, type BushGuild, type BushGuildMember } from '@lib'; +import type { BushCategoryChannel, BushClient, BushGuild, BushGuildMember } from '#lib'; import { StoreChannel, type Collection, type Snowflake } from 'discord.js'; -import { type RawGuildChannelData } from 'discord.js/typings/rawDataTypes'; +import type { RawGuildChannelData } from 'discord.js/typings/rawDataTypes'; export class BushStoreChannel extends StoreChannel { public declare guild: BushGuild; diff --git a/src/lib/extensions/discord.js/BushTextChannel.ts b/src/lib/extensions/discord.js/BushTextChannel.ts index 5001ddb..57a0598 100644 --- a/src/lib/extensions/discord.js/BushTextChannel.ts +++ b/src/lib/extensions/discord.js/BushTextChannel.ts @@ -1,6 +1,6 @@ -import { type BushGuild, type BushMessageManager, type BushThreadManager } from '@lib'; +import type { BushGuild, BushMessageManager, BushThreadManager } from '#lib'; import { TextChannel, type AllowedThreadTypeForTextChannel } from 'discord.js'; -import { type RawGuildChannelData } from 'discord.js/typings/rawDataTypes'; +import type { RawGuildChannelData } from 'discord.js/typings/rawDataTypes'; export class BushTextChannel extends TextChannel { public declare guild: BushGuild; diff --git a/src/lib/extensions/discord.js/BushThreadChannel.ts b/src/lib/extensions/discord.js/BushThreadChannel.ts index 9319651..ea4b07c 100644 --- a/src/lib/extensions/discord.js/BushThreadChannel.ts +++ b/src/lib/extensions/discord.js/BushThreadChannel.ts @@ -1,14 +1,14 @@ -import { - type BushClient, - type BushGuild, - type BushGuildMember, - type BushMessageManager, - type BushNewsChannel, - type BushTextChannel, - type BushThreadMemberManager -} from '@lib'; +import type { + BushClient, + BushGuild, + BushGuildMember, + BushMessageManager, + BushNewsChannel, + BushTextChannel, + BushThreadMemberManager +} from '#lib'; import { ThreadChannel, type Collection, type Snowflake } from 'discord.js'; -import { type RawThreadChannelData } from 'discord.js/typings/rawDataTypes'; +import type { RawThreadChannelData } from 'discord.js/typings/rawDataTypes'; export class BushThreadChannel extends ThreadChannel { public declare guild: BushGuild; diff --git a/src/lib/extensions/discord.js/BushThreadManager.d.ts b/src/lib/extensions/discord.js/BushThreadManager.d.ts index 86e85a9..6822a80 100644 --- a/src/lib/extensions/discord.js/BushThreadManager.d.ts +++ b/src/lib/extensions/discord.js/BushThreadManager.d.ts @@ -1,6 +1,6 @@ -import { - type BushThreadChannel -} from '@lib'; +import type { + BushThreadChannel +} from '#lib'; import { CachedManager, FetchedThreads, @@ -14,7 +14,7 @@ import { type ThreadChannelResolvable, type ThreadCreateOptions } from 'discord.js'; -import { type RawThreadChannelData } from 'discord.js/typings/rawDataTypes'; +import type { RawThreadChannelData } from 'discord.js/typings/rawDataTypes'; export class BushThreadManager<AllowedThreadType> extends CachedManager<Snowflake, BushThreadChannel, ThreadChannelResolvable> { public constructor(channel: TextChannel | NewsChannel, iterable?: Iterable<RawThreadChannelData>); diff --git a/src/lib/extensions/discord.js/BushThreadMember.ts b/src/lib/extensions/discord.js/BushThreadMember.ts index 70bd26f..db63d01 100644 --- a/src/lib/extensions/discord.js/BushThreadMember.ts +++ b/src/lib/extensions/discord.js/BushThreadMember.ts @@ -1,6 +1,6 @@ -import { type BushGuildMember, type BushThreadChannel, type BushUser } from '@lib'; +import type { BushGuildMember, BushThreadChannel, BushUser } from '#lib'; import { ThreadMember } from 'discord.js'; -import { type RawThreadMemberData } from 'discord.js/typings/rawDataTypes'; +import type { RawThreadMemberData } from 'discord.js/typings/rawDataTypes'; export class BushThreadMember extends ThreadMember { public declare readonly guildMember: BushGuildMember | null; diff --git a/src/lib/extensions/discord.js/BushThreadMemberManager.d.ts b/src/lib/extensions/discord.js/BushThreadMemberManager.d.ts index 34346aa..082d87c 100644 --- a/src/lib/extensions/discord.js/BushThreadMemberManager.d.ts +++ b/src/lib/extensions/discord.js/BushThreadMemberManager.d.ts @@ -1,4 +1,4 @@ -import { type BushClient, type BushThreadChannel, type BushThreadMember, type BushThreadMemberResolvable } from '@lib'; +import type { BushClient, BushThreadChannel, BushThreadMember, BushThreadMemberResolvable } from '#lib'; import { CachedManager, type BaseFetchOptions, @@ -6,7 +6,7 @@ import { type Snowflake, type UserResolvable } from 'discord.js'; -import { type RawThreadMemberData } from 'discord.js/typings/rawDataTypes'; +import type { RawThreadMemberData } from 'discord.js/typings/rawDataTypes'; export class BushThreadMemberManager extends CachedManager<Snowflake, BushThreadMember, BushThreadMemberResolvable> { public constructor(thread: BushThreadChannel, iterable?: Iterable<RawThreadMemberData>); diff --git a/src/lib/extensions/discord.js/BushUser.ts b/src/lib/extensions/discord.js/BushUser.ts index 6cfe6e9..e7f232a 100644 --- a/src/lib/extensions/discord.js/BushUser.ts +++ b/src/lib/extensions/discord.js/BushUser.ts @@ -1,6 +1,6 @@ -import { type BushClient, type BushDMChannel } from '@lib'; +import type { BushClient, BushDMChannel } from '#lib'; import { User, type Partialize } from 'discord.js'; -import { type RawUserData } from 'discord.js/typings/rawDataTypes'; +import type { RawUserData } from 'discord.js/typings/rawDataTypes'; export type PartialBushUser = Partialize<BushUser, 'username' | 'tag' | 'discriminator' | 'isOwner' | 'isSuperUser'>; diff --git a/src/lib/extensions/discord.js/BushUserManager.d.ts b/src/lib/extensions/discord.js/BushUserManager.d.ts index f3fffac..595332a 100644 --- a/src/lib/extensions/discord.js/BushUserManager.d.ts +++ b/src/lib/extensions/discord.js/BushUserManager.d.ts @@ -1,6 +1,6 @@ -import { type BushClient, type BushUser, type BushUserResolvable } from '@lib'; +import type { BushClient, BushUser, BushUserResolvable } from '#lib'; import { CachedManager, type BaseFetchOptions, type Snowflake } from 'discord.js'; -import { type RawUserData } from 'discord.js/typings/rawDataTypes'; +import type { RawUserData } from 'discord.js/typings/rawDataTypes'; export class BushUserManager extends CachedManager<Snowflake, BushUser, BushUserResolvable> { public constructor(client: BushClient, iterable?: Iterable<RawUserData>); diff --git a/src/lib/extensions/discord.js/BushVoiceChannel.ts b/src/lib/extensions/discord.js/BushVoiceChannel.ts index 15a402f..f65906e 100644 --- a/src/lib/extensions/discord.js/BushVoiceChannel.ts +++ b/src/lib/extensions/discord.js/BushVoiceChannel.ts @@ -1,6 +1,6 @@ -import { type BushClient, type BushGuild, type BushGuildMember } from '@lib'; +import type { BushClient, BushGuild, BushGuildMember } from '#lib'; import { VoiceChannel, type Collection, type Snowflake } from 'discord.js'; -import { type RawGuildChannelData } from 'discord.js/typings/rawDataTypes'; +import type { RawGuildChannelData } from 'discord.js/typings/rawDataTypes'; export class BushVoiceChannel extends VoiceChannel { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushVoiceState.ts b/src/lib/extensions/discord.js/BushVoiceState.ts index 7889f3b..167a369 100644 --- a/src/lib/extensions/discord.js/BushVoiceState.ts +++ b/src/lib/extensions/discord.js/BushVoiceState.ts @@ -1,6 +1,6 @@ -import { type BushGuild, type BushGuildMember, type BushStageChannel, type BushVoiceChannel } from '@lib'; +import type { BushGuild, BushGuildMember, BushStageChannel, BushVoiceChannel } from '#lib'; import { VoiceState } from 'discord.js'; -import { type RawVoiceStateData } from 'discord.js/typings/rawDataTypes'; +import type { RawVoiceStateData } from 'discord.js/typings/rawDataTypes'; export class BushVoiceState extends VoiceState { // public declare readonly client: BushClient; diff --git a/src/lib/extensions/global.d.ts b/src/lib/extensions/global.d.ts index 5274fd2..1a30056 100644 --- a/src/lib/extensions/global.d.ts +++ b/src/lib/extensions/global.d.ts @@ -1,6 +1,5 @@ /* eslint-disable no-var */ -import { BushClient } from './discord-akairo/BushClient'; -import { BushClientUtil } from './discord-akairo/BushClientUtil'; +import type { BushClient, BushClientUtil } from '#lib'; declare global { var client: BushClient; var util: BushClientUtil; diff --git a/src/lib/index.ts b/src/lib/index.ts index da02888..65a6e74 100644 --- a/src/lib/index.ts +++ b/src/lib/index.ts @@ -1,78 +1,78 @@ -export * from './common/AutoMod'; -export * from './common/ButtonPaginator'; -export * from './common/DeleteButton'; -export * from './common/Format'; -export * from './common/Moderation'; -export type { BushInspectOptions } from './common/typings/BushInspectOptions'; -export type { CodeBlockLang } from './common/typings/CodeBlockLang'; -export * from './common/util/Arg'; -export * from './extensions/discord-akairo/BushArgumentTypeCaster'; -export * from './extensions/discord-akairo/BushClient'; -export * from './extensions/discord-akairo/BushClientUtil'; -export * from './extensions/discord-akairo/BushCommand'; -export * from './extensions/discord-akairo/BushCommandHandler'; -export * from './extensions/discord-akairo/BushCommandUtil'; -export * from './extensions/discord-akairo/BushInhibitor'; -export * from './extensions/discord-akairo/BushInhibitorHandler'; -export * from './extensions/discord-akairo/BushListener'; -export * from './extensions/discord-akairo/BushListenerHandler'; -export * from './extensions/discord-akairo/BushSlashMessage'; -export * from './extensions/discord-akairo/BushTask'; -export * from './extensions/discord-akairo/BushTaskHandler'; -export * from './extensions/discord.js/BushActivity'; -export * from './extensions/discord.js/BushApplicationCommand'; -export type { BushApplicationCommandManager } from './extensions/discord.js/BushApplicationCommandManager'; -export type { BushApplicationCommandPermissionsManager } from './extensions/discord.js/BushApplicationCommandPermissionsManager'; -export type { BushBaseGuildEmojiManager } from './extensions/discord.js/BushBaseGuildEmojiManager'; -export * from './extensions/discord.js/BushButtonInteraction'; -export * from './extensions/discord.js/BushCategoryChannel'; -export type { BushChannel } from './extensions/discord.js/BushChannel'; -export type { BushChannelManager } from './extensions/discord.js/BushChannelManager'; -export type { BushClientEvents } from './extensions/discord.js/BushClientEvents'; -export type { BushClientUser } from './extensions/discord.js/BushClientUser'; -export * from './extensions/discord.js/BushCommandInteraction'; -export * from './extensions/discord.js/BushDMChannel'; -export * from './extensions/discord.js/BushEmoji'; -export * from './extensions/discord.js/BushGuild'; -export type { BushGuildApplicationCommandManager } from './extensions/discord.js/BushGuildApplicationCommandManager'; -export type { BushGuildBan } from './extensions/discord.js/BushGuildBan'; -export * from './extensions/discord.js/BushGuildChannel'; -export * from './extensions/discord.js/BushGuildEmoji'; -export type { BushGuildEmojiRoleManager } from './extensions/discord.js/BushGuildEmojiRoleManager'; -export type { BushGuildManager } from './extensions/discord.js/BushGuildManager'; -export * from './extensions/discord.js/BushGuildMember'; -export type { BushGuildMemberManager } from './extensions/discord.js/BushGuildMemberManager'; -export * from './extensions/discord.js/BushMessage'; -export type { BushMessageManager } from './extensions/discord.js/BushMessageManager'; -export * from './extensions/discord.js/BushMessageReaction'; -export * from './extensions/discord.js/BushNewsChannel'; -export * from './extensions/discord.js/BushPresence'; -export * from './extensions/discord.js/BushReactionEmoji'; -export * from './extensions/discord.js/BushRole'; -export * from './extensions/discord.js/BushSelectMenuInteraction'; -export * from './extensions/discord.js/BushStageChannel'; -export * from './extensions/discord.js/BushStageInstance'; -export * from './extensions/discord.js/BushStoreChannel'; -export * from './extensions/discord.js/BushTextChannel'; -export * from './extensions/discord.js/BushThreadChannel'; -export type { BushThreadManager } from './extensions/discord.js/BushThreadManager'; -export * from './extensions/discord.js/BushThreadMember'; -export type { BushThreadMemberManager } from './extensions/discord.js/BushThreadMemberManager'; -export * from './extensions/discord.js/BushUser'; -export type { BushUserManager } from './extensions/discord.js/BushUserManager'; -export * from './extensions/discord.js/BushVoiceChannel'; -export * from './extensions/discord.js/BushVoiceState'; -export * from './models/ActivePunishment'; -export * from './models/BaseModel'; -export * from './models/Global'; -export * from './models/Guild'; -export * from './models/Level'; -export * from './models/ModLog'; -export * from './models/Stat'; -export * from './models/StickyRole'; -export * from './utils/AllowedMentions'; -export * from './utils/BushCache'; -export * from './utils/BushConstants'; -export * from './utils/BushLogger'; -export * from './utils/CanvasProgressBar'; -export * from './utils/Config'; +export * from './common/AutoMod.js'; +export * from './common/ButtonPaginator.js'; +export * from './common/DeleteButton.js'; +export * from './common/Format.js'; +export * from './common/Moderation.js'; +export type { BushInspectOptions } from './common/typings/BushInspectOptions.js'; +export type { CodeBlockLang } from './common/typings/CodeBlockLang.js'; +export * from './common/util/Arg.js'; +export * from './extensions/discord-akairo/BushArgumentTypeCaster.js'; +export * from './extensions/discord-akairo/BushClient.js'; +export * from './extensions/discord-akairo/BushClientUtil.js'; +export * from './extensions/discord-akairo/BushCommand.js'; +export * from './extensions/discord-akairo/BushCommandHandler.js'; +export * from './extensions/discord-akairo/BushCommandUtil.js'; +export * from './extensions/discord-akairo/BushInhibitor.js'; +export * from './extensions/discord-akairo/BushInhibitorHandler.js'; +export * from './extensions/discord-akairo/BushListener.js'; +export * from './extensions/discord-akairo/BushListenerHandler.js'; +export * from './extensions/discord-akairo/BushSlashMessage.js'; +export * from './extensions/discord-akairo/BushTask.js'; +export * from './extensions/discord-akairo/BushTaskHandler.js'; +export * from './extensions/discord.js/BushActivity.js'; +export * from './extensions/discord.js/BushApplicationCommand.js'; +export type { BushApplicationCommandManager } from './extensions/discord.js/BushApplicationCommandManager.js'; +export type { BushApplicationCommandPermissionsManager } from './extensions/discord.js/BushApplicationCommandPermissionsManager.js'; +export type { BushBaseGuildEmojiManager } from './extensions/discord.js/BushBaseGuildEmojiManager.js'; +export * from './extensions/discord.js/BushButtonInteraction.js'; +export * from './extensions/discord.js/BushCategoryChannel.js'; +export type { BushChannel } from './extensions/discord.js/BushChannel.js'; +export type { BushChannelManager } from './extensions/discord.js/BushChannelManager.js'; +export type { BushClientEvents } from './extensions/discord.js/BushClientEvents.js'; +export type { BushClientUser } from './extensions/discord.js/BushClientUser.js'; +export * from './extensions/discord.js/BushCommandInteraction.js'; +export * from './extensions/discord.js/BushDMChannel.js'; +export * from './extensions/discord.js/BushEmoji.js'; +export * from './extensions/discord.js/BushGuild.js'; +export type { BushGuildApplicationCommandManager } from './extensions/discord.js/BushGuildApplicationCommandManager.js'; +export type { BushGuildBan } from './extensions/discord.js/BushGuildBan.js'; +export * from './extensions/discord.js/BushGuildChannel.js'; +export * from './extensions/discord.js/BushGuildEmoji.js'; +export type { BushGuildEmojiRoleManager } from './extensions/discord.js/BushGuildEmojiRoleManager.js'; +export type { BushGuildManager } from './extensions/discord.js/BushGuildManager.js'; +export * from './extensions/discord.js/BushGuildMember.js'; +export type { BushGuildMemberManager } from './extensions/discord.js/BushGuildMemberManager.js'; +export * from './extensions/discord.js/BushMessage.js'; +export type { BushMessageManager } from './extensions/discord.js/BushMessageManager.js'; +export * from './extensions/discord.js/BushMessageReaction.js'; +export * from './extensions/discord.js/BushNewsChannel.js'; +export * from './extensions/discord.js/BushPresence.js'; +export * from './extensions/discord.js/BushReactionEmoji.js'; +export * from './extensions/discord.js/BushRole.js'; +export * from './extensions/discord.js/BushSelectMenuInteraction.js'; +export * from './extensions/discord.js/BushStageChannel.js'; +export * from './extensions/discord.js/BushStageInstance.js'; +export * from './extensions/discord.js/BushStoreChannel.js'; +export * from './extensions/discord.js/BushTextChannel.js'; +export * from './extensions/discord.js/BushThreadChannel.js'; +export type { BushThreadManager } from './extensions/discord.js/BushThreadManager.js'; +export * from './extensions/discord.js/BushThreadMember.js'; +export type { BushThreadMemberManager } from './extensions/discord.js/BushThreadMemberManager.js'; +export * from './extensions/discord.js/BushUser.js'; +export type { BushUserManager } from './extensions/discord.js/BushUserManager.js'; +export * from './extensions/discord.js/BushVoiceChannel.js'; +export * from './extensions/discord.js/BushVoiceState.js'; +export * from './models/ActivePunishment.js'; +export * from './models/BaseModel.js'; +export * from './models/Global.js'; +export * from './models/Guild.js'; +export * from './models/Level.js'; +export * from './models/ModLog.js'; +export * from './models/Stat.js'; +export * from './models/StickyRole.js'; +export * from './utils/AllowedMentions.js'; +export * from './utils/BushCache.js'; +export * from './utils/BushConstants.js'; +export * from './utils/BushLogger.js'; +export * from './utils/CanvasProgressBar.js'; +export * from './utils/Config.js'; diff --git a/src/lib/models/ActivePunishment.ts b/src/lib/models/ActivePunishment.ts index 83ada29..23dd33b 100644 --- a/src/lib/models/ActivePunishment.ts +++ b/src/lib/models/ActivePunishment.ts @@ -1,7 +1,10 @@ import { type Snowflake } from 'discord.js'; import { nanoid } from 'nanoid'; -import { DataTypes, type Sequelize } from 'sequelize'; -import { BaseModel } from './BaseModel'; +import { type Sequelize } from 'sequelize'; +import { BaseModel } from './BaseModel.js'; + +const { DataTypes } = (await import('sequelize')).default + export enum ActivePunishmentType { BAN = 'BAN', diff --git a/src/lib/models/BaseModel.ts b/src/lib/models/BaseModel.ts index 8fba5e5..e503317 100644 --- a/src/lib/models/BaseModel.ts +++ b/src/lib/models/BaseModel.ts @@ -1,4 +1,4 @@ -import { Model } from 'sequelize'; +const { Model } = (await import('sequelize')).default; export abstract class BaseModel<A, B> extends Model<A, B> { /** diff --git a/src/lib/models/Global.ts b/src/lib/models/Global.ts index 6b6ebae..b096c7f 100644 --- a/src/lib/models/Global.ts +++ b/src/lib/models/Global.ts @@ -1,7 +1,9 @@ import { type Snowflake } from 'discord.js'; -import { DataTypes, type Sequelize } from 'sequelize'; -import { BaseModel } from './BaseModel'; -import { jsonArray } from './__helpers'; +import { type Sequelize } from 'sequelize'; +import { BaseModel } from './BaseModel.js'; +import { jsonArray } from './__helpers.js'; + +const { DataTypes } = (await import('sequelize')).default export interface GlobalModel { environment: 'production' | 'development' | 'beta'; diff --git a/src/lib/models/Guild.ts b/src/lib/models/Guild.ts index 583cbd7..78be846 100644 --- a/src/lib/models/Guild.ts +++ b/src/lib/models/Guild.ts @@ -1,9 +1,11 @@ import { type Snowflake } from 'discord.js'; -import { DataTypes, type Sequelize } from 'sequelize'; -import { type BadWords } from '../common/AutoMod'; -import { type BushClient } from '../extensions/discord-akairo/BushClient'; -import { BaseModel } from './BaseModel'; -import { jsonArray, jsonObject } from './__helpers'; +import { type Sequelize } from 'sequelize'; +import { type BadWords } from '../common/AutoMod.js'; +import { type BushClient } from '../extensions/discord-akairo/BushClient.js'; +import { BaseModel } from './BaseModel.js'; +import { jsonArray, jsonObject } from './__helpers.js'; + +const { DataTypes } = (await import('sequelize')).default export interface GuildModel { id: Snowflake; @@ -160,7 +162,7 @@ export class Guild extends BaseModel<GuildModel, GuildModelCreationAttributes> i levelRoles: jsonObject('levelRoles'), levelUpChannel: { type: DataTypes.STRING, allowNull: true } }, - { sequelize: sequelize } + { sequelize } ); } } diff --git a/src/lib/models/Level.ts b/src/lib/models/Level.ts index 6499bff..f1083fc 100644 --- a/src/lib/models/Level.ts +++ b/src/lib/models/Level.ts @@ -1,6 +1,8 @@ import { type Snowflake } from 'discord.js'; -import { DataTypes, type Sequelize } from 'sequelize'; -import { BaseModel } from './BaseModel'; +import { type Sequelize } from 'sequelize'; +import { BaseModel } from './BaseModel.js'; + +const { DataTypes } = (await import('sequelize')).default export interface LevelModel { user: Snowflake; diff --git a/src/lib/models/ModLog.ts b/src/lib/models/ModLog.ts index b2351b9..757ee66 100644 --- a/src/lib/models/ModLog.ts +++ b/src/lib/models/ModLog.ts @@ -1,8 +1,10 @@ import { type Snowflake } from 'discord.js'; import { nanoid } from 'nanoid'; -import { DataTypes, type Sequelize } from 'sequelize'; -import { BaseModel } from './BaseModel'; -import { jsonBoolean } from './__helpers'; +import { type Sequelize } from 'sequelize'; +import { BaseModel } from './BaseModel.js'; +import { jsonBoolean } from './__helpers.js'; + +const { DataTypes } = (await import('sequelize')).default export enum ModLogType { PERM_BAN = 'PERM_BAN', diff --git a/src/lib/models/Stat.ts b/src/lib/models/Stat.ts index a6e8f19..c5f02b8 100644 --- a/src/lib/models/Stat.ts +++ b/src/lib/models/Stat.ts @@ -1,6 +1,8 @@ -import { DataTypes, type Sequelize } from 'sequelize'; -import { BaseModel } from './BaseModel'; -import { jsonBigint } from './__helpers'; +import { type Sequelize } from 'sequelize'; +import { BaseModel } from './BaseModel.js'; +import { jsonBigint } from './__helpers.js'; + +const { DataTypes } = (await import('sequelize')).default type Environment = 'production' | 'development' | 'beta'; diff --git a/src/lib/models/StickyRole.ts b/src/lib/models/StickyRole.ts index 657bac6..a6f604d 100644 --- a/src/lib/models/StickyRole.ts +++ b/src/lib/models/StickyRole.ts @@ -1,7 +1,9 @@ import { type Snowflake } from 'discord.js'; -import { DataTypes, type Sequelize } from 'sequelize'; -import { BaseModel } from './BaseModel'; -import { jsonArray } from './__helpers'; +import { type Sequelize } from 'sequelize'; +import { BaseModel } from './BaseModel.js'; +import { jsonArray } from './__helpers.js'; + +const { DataTypes } = (await import('sequelize')).default export interface StickyRoleModel { user: Snowflake; diff --git a/src/lib/models/__helpers.ts b/src/lib/models/__helpers.ts index 3a958b9..3b7f4a4 100644 --- a/src/lib/models/__helpers.ts +++ b/src/lib/models/__helpers.ts @@ -1,4 +1,7 @@ -import { DataTypes, type Model } from 'sequelize'; +import { type Model } from 'sequelize'; + +const { DataTypes } = (await import('sequelize')).default + export function jsonParseGet(this: Model, key: string): any { return JSON.parse(this.getDataValue(key)); diff --git a/src/lib/utils/BushCache.ts b/src/lib/utils/BushCache.ts index a330224..d633898 100644 --- a/src/lib/utils/BushCache.ts +++ b/src/lib/utils/BushCache.ts @@ -1,5 +1,5 @@ import { Collection, type Snowflake } from 'discord.js'; -import { Guild } from '../models/Guild'; +import { Guild } from '../models/Guild.js'; export class BushCache { public static global = { diff --git a/src/listeners/client/interactionCreate.ts b/src/listeners/client/interactionCreate.ts index 6afc1a1..26aa0a9 100644 --- a/src/listeners/client/interactionCreate.ts +++ b/src/listeners/client/interactionCreate.ts @@ -1,4 +1,4 @@ -import { AutoMod, BushListener, type BushButtonInteraction, type BushClientEvents } from '@lib'; +import { AutoMod, BushListener, type BushButtonInteraction, type BushClientEvents } from '#lib'; export default class InteractionCreateListener extends BushListener { public constructor() { diff --git a/src/listeners/client/ready.ts b/src/listeners/client/ready.ts index a6188d1..05b8fa2 100644 --- a/src/listeners/client/ready.ts +++ b/src/listeners/client/ready.ts @@ -1,4 +1,4 @@ -import { BushListener, Guild } from '@lib'; +import { BushListener, Guild } from '#lib'; import chalk from 'chalk'; export default class ReadyListener extends BushListener { diff --git a/src/listeners/commands/commandBlocked.ts b/src/listeners/commands/commandBlocked.ts index 4f9f492..1435ae3 100644 --- a/src/listeners/commands/commandBlocked.ts +++ b/src/listeners/commands/commandBlocked.ts @@ -1,4 +1,4 @@ -import { BushListener, BushSlashMessage, type BushCommand, type BushCommandHandlerEvents, type BushMessage } from '@lib'; +import { BushListener, BushSlashMessage, type BushCommand, type BushCommandHandlerEvents, type BushMessage } from '#lib'; import { type InteractionReplyOptions, type Message, type MessagePayload, type ReplyMessageOptions } from 'discord.js'; export default class CommandBlockedListener extends BushListener { diff --git a/src/listeners/commands/commandCooldown.ts b/src/listeners/commands/commandCooldown.ts index b357ed8..74f6a47 100644 --- a/src/listeners/commands/commandCooldown.ts +++ b/src/listeners/commands/commandCooldown.ts @@ -1,4 +1,4 @@ -import { BushListener, type BushCommandHandlerEvents, type BushMessage } from '@lib'; +import { BushListener, type BushCommandHandlerEvents, type BushMessage } from '#lib'; export default class CommandCooldownListener extends BushListener { public constructor() { diff --git a/src/listeners/commands/commandError.ts b/src/listeners/commands/commandError.ts index a7303e8..6eceb68 100644 --- a/src/listeners/commands/commandError.ts +++ b/src/listeners/commands/commandError.ts @@ -1,8 +1,8 @@ -import { type BushCommandHandlerEvents } from '@lib'; +import { type BushCommandHandlerEvents } from '#lib'; import { Severity } from '@sentry/types'; import { Command, type AkairoMessage, type GuildTextBasedChannels } from 'discord-akairo'; import { Formatters, MessageEmbed, type DMChannel, type Message } from 'discord.js'; -import { BushListener } from '../../lib/extensions/discord-akairo/BushListener'; +import { BushListener } from '../../lib/extensions/discord-akairo/BushListener.js'; export default class CommandErrorListener extends BushListener { public constructor() { diff --git a/src/listeners/commands/commandMissingPermissions.ts b/src/listeners/commands/commandMissingPermissions.ts index 010682c..596a73f 100644 --- a/src/listeners/commands/commandMissingPermissions.ts +++ b/src/listeners/commands/commandMissingPermissions.ts @@ -1,4 +1,4 @@ -import { BushListener, type BushCommandHandlerEvents } from '@lib'; +import { BushListener, type BushCommandHandlerEvents } from '#lib'; export default class CommandMissingPermissionsListener extends BushListener { public constructor() { diff --git a/src/listeners/commands/commandStarted.ts b/src/listeners/commands/commandStarted.ts index eff8c94..b2d7470 100644 --- a/src/listeners/commands/commandStarted.ts +++ b/src/listeners/commands/commandStarted.ts @@ -1,4 +1,4 @@ -import { BushListener, type BushCommandHandlerEvents } from '@lib'; +import { BushListener, type BushCommandHandlerEvents } from '#lib'; import { Severity } from '@sentry/types'; import { type GuildTextBasedChannels } from 'discord-akairo'; import { type DMChannel } from 'discord.js'; diff --git a/src/listeners/commands/messageBlocked.ts b/src/listeners/commands/messageBlocked.ts index 7299eca..d567f8c 100644 --- a/src/listeners/commands/messageBlocked.ts +++ b/src/listeners/commands/messageBlocked.ts @@ -1,4 +1,4 @@ -import { BushListener, type BushCommandHandlerEvents } from '@lib'; +import { BushListener, type BushCommandHandlerEvents } from '#lib'; export default class MessageBlockedListener extends BushListener { public constructor() { diff --git a/src/listeners/commands/slashBlocked.ts b/src/listeners/commands/slashBlocked.ts index b5c57bf..6c0ed14 100644 --- a/src/listeners/commands/slashBlocked.ts +++ b/src/listeners/commands/slashBlocked.ts @@ -1,5 +1,5 @@ -import { BushListener, type BushCommandHandlerEvents } from '@lib'; -import CommandBlockedListener from './commandBlocked'; +import { BushListener, type BushCommandHandlerEvents } from '#lib'; +import CommandBlockedListener from './commandBlocked.js'; export default class SlashBlockedListener extends BushListener { public constructor() { diff --git a/src/listeners/commands/slashCommandError.ts b/src/listeners/commands/slashCommandError.ts index 435e449..5694391 100644 --- a/src/listeners/commands/slashCommandError.ts +++ b/src/listeners/commands/slashCommandError.ts @@ -1,5 +1,5 @@ -import { BushListener, type BushCommandHandlerEvents } from '@lib'; -import CommandErrorListener from './commandError'; +import { BushListener, type BushCommandHandlerEvents } from '#lib'; +import CommandErrorListener from './commandError.js'; export default class SlashCommandErrorListener extends BushListener { public constructor() { diff --git a/src/listeners/commands/slashMissingPermissions.ts b/src/listeners/commands/slashMissingPermissions.ts index 969c0e9..296f44b 100644 --- a/src/listeners/commands/slashMissingPermissions.ts +++ b/src/listeners/commands/slashMissingPermissions.ts @@ -1,5 +1,5 @@ -import { BushListener, type BushCommandHandlerEvents } from '@lib'; -import CommandMissingPermissionsListener from './commandMissingPermissions'; +import { BushListener, type BushCommandHandlerEvents } from '#lib'; +import CommandMissingPermissionsListener from './commandMissingPermissions.js'; export default class SlashMissingPermissionsListener extends BushListener { public constructor() { diff --git a/src/listeners/commands/slashNotFound.ts b/src/listeners/commands/slashNotFound.ts index 26635e8..a8e4267 100644 --- a/src/listeners/commands/slashNotFound.ts +++ b/src/listeners/commands/slashNotFound.ts @@ -1,4 +1,4 @@ -import { BushListener, type BushCommandHandlerEvents } from '@lib'; +import { BushListener, type BushCommandHandlerEvents } from '#lib'; export default class SlashNotFoundListener extends BushListener { public constructor() { diff --git a/src/listeners/commands/slashStarted.ts b/src/listeners/commands/slashStarted.ts index 46b6610..d742a75 100644 --- a/src/listeners/commands/slashStarted.ts +++ b/src/listeners/commands/slashStarted.ts @@ -1,4 +1,4 @@ -import { BushListener, type BushCommandHandlerEvents } from '@lib'; +import { BushListener, type BushCommandHandlerEvents } from '#lib'; export default class SlashStartedListener extends BushListener { public constructor() { diff --git a/src/listeners/custom/bushBan.ts b/src/listeners/custom/bushBan.ts index 8352099..b92a54b 100644 --- a/src/listeners/custom/bushBan.ts +++ b/src/listeners/custom/bushBan.ts @@ -1,4 +1,4 @@ -import { BushListener, type BushClientEvents } from '@lib'; +import { BushListener, type BushClientEvents } from '#lib'; import { GuildMember, MessageEmbed } from 'discord.js'; export default class BushBanListener extends BushListener { diff --git a/src/listeners/custom/bushKick.ts b/src/listeners/custom/bushKick.ts index ceb4d54..db478d0 100644 --- a/src/listeners/custom/bushKick.ts +++ b/src/listeners/custom/bushKick.ts @@ -1,4 +1,4 @@ -import { BushListener, type BushClientEvents } from '@lib'; +import { BushListener, type BushClientEvents } from '#lib'; import { GuildMember, MessageEmbed } from 'discord.js'; export default class BushKickListener extends BushListener { diff --git a/src/listeners/custom/bushLevelUpdate.ts b/src/listeners/custom/bushLevelUpdate.ts index a5aca7a..897def5 100644 --- a/src/listeners/custom/bushLevelUpdate.ts +++ b/src/listeners/custom/bushLevelUpdate.ts @@ -1,4 +1,4 @@ -import { BushListener, type BushClientEvents } from '@lib'; +import { BushListener, type BushClientEvents } from '#lib'; import { Formatters, type TextChannel } from 'discord.js'; export default class BushLevelUpdateListener extends BushListener { diff --git a/src/listeners/custom/bushMute.ts b/src/listeners/custom/bushMute.ts index 67200fe..dcc6db9 100644 --- a/src/listeners/custom/bushMute.ts +++ b/src/listeners/custom/bushMute.ts @@ -1,4 +1,4 @@ -import { BushListener, type BushClientEvents } from '@lib'; +import { BushListener, type BushClientEvents } from '#lib'; import { GuildMember, MessageEmbed } from 'discord.js'; export default class BushMuteListener extends BushListener { diff --git a/src/listeners/custom/bushPunishRole.ts b/src/listeners/custom/bushPunishRole.ts index b434cd3..05124a1 100644 --- a/src/listeners/custom/bushPunishRole.ts +++ b/src/listeners/custom/bushPunishRole.ts @@ -1,4 +1,4 @@ -import { BushListener, type BushClientEvents } from '@lib'; +import { BushListener, type BushClientEvents } from '#lib'; import { GuildMember, MessageEmbed } from 'discord.js'; export default class BushPunishRoleListener extends BushListener { diff --git a/src/listeners/custom/bushPunishRoleRemove.ts b/src/listeners/custom/bushPunishRoleRemove.ts index c147101..239ea20 100644 --- a/src/listeners/custom/bushPunishRoleRemove.ts +++ b/src/listeners/custom/bushPunishRoleRemove.ts @@ -1,4 +1,4 @@ -import { BushListener, type BushClientEvents } from '@lib'; +import { BushListener, type BushClientEvents } from '#lib'; import { GuildMember, MessageEmbed } from 'discord.js'; export default class BushPunishRoleRemoveListener extends BushListener { diff --git a/src/listeners/custom/bushPurge.ts b/src/listeners/custom/bushPurge.ts index aa43612..567a9e7 100644 --- a/src/listeners/custom/bushPurge.ts +++ b/src/listeners/custom/bushPurge.ts @@ -1,4 +1,4 @@ -import { BushListener, type BushClientEvents } from '@lib'; +import { BushListener, type BushClientEvents } from '#lib'; import { MessageEmbed } from 'discord.js'; export default class BushPurgeListener extends BushListener { diff --git a/src/listeners/custom/bushUnban.ts b/src/listeners/custom/bushUnban.ts index 7c8f3cb..b67f4f7 100644 --- a/src/listeners/custom/bushUnban.ts +++ b/src/listeners/custom/bushUnban.ts @@ -1,4 +1,4 @@ -import { BushListener, type BushClientEvents } from '@lib'; +import { BushListener, type BushClientEvents } from '#lib'; import { GuildMember, MessageEmbed } from 'discord.js'; export default class BushUnbanListener extends BushListener { diff --git a/src/listeners/custom/bushUnmute.ts b/src/listeners/custom/bushUnmute.ts index 7ef0745..fe6a947 100644 --- a/src/listeners/custom/bushUnmute.ts +++ b/src/listeners/custom/bushUnmute.ts @@ -1,4 +1,4 @@ -import { BushListener, type BushClientEvents } from '@lib'; +import { BushListener, type BushClientEvents } from '#lib'; import { GuildMember, MessageEmbed } from 'discord.js'; export default class BushUnmuteListener extends BushListener { diff --git a/src/listeners/custom/bushUpdateModlog.ts b/src/listeners/custom/bushUpdateModlog.ts index 105c6ad..6a03325 100644 --- a/src/listeners/custom/bushUpdateModlog.ts +++ b/src/listeners/custom/bushUpdateModlog.ts @@ -1,4 +1,4 @@ -import { BushListener, type BushClientEvents } from '@lib'; +import { BushListener, type BushClientEvents } from '#lib'; import { MessageEmbed } from 'discord.js'; export default class BushUpdateModlogListener extends BushListener { diff --git a/src/listeners/custom/bushUpdateSettings.ts b/src/listeners/custom/bushUpdateSettings.ts index 2a9421f..d34e8e2 100644 --- a/src/listeners/custom/bushUpdateSettings.ts +++ b/src/listeners/custom/bushUpdateSettings.ts @@ -1,4 +1,4 @@ -import { BushListener, type BushClientEvents } from '@lib'; +import { BushListener, type BushClientEvents } from '#lib'; import { MessageEmbed } from 'discord.js'; export default class BushUpdateSettingsListener extends BushListener { diff --git a/src/listeners/custom/bushWarn.ts b/src/listeners/custom/bushWarn.ts index 027cb65..fcae8ca 100644 --- a/src/listeners/custom/bushWarn.ts +++ b/src/listeners/custom/bushWarn.ts @@ -1,4 +1,4 @@ -import { BushListener, type BushClientEvents } from '@lib'; +import { BushListener, type BushClientEvents } from '#lib'; import { GuildMember, MessageEmbed } from 'discord.js'; export default class BushWarnListener extends BushListener { diff --git a/src/listeners/guild/guildCreate.ts b/src/listeners/guild/guildCreate.ts index 419d773..16b0862 100644 --- a/src/listeners/guild/guildCreate.ts +++ b/src/listeners/guild/guildCreate.ts @@ -1,4 +1,4 @@ -import { BushListener, Guild, type BushClientEvents } from '@lib'; +import { BushListener, Guild, type BushClientEvents } from '#lib'; export default class GuildCreateListener extends BushListener { public constructor() { diff --git a/src/listeners/guild/guildDelete.ts b/src/listeners/guild/guildDelete.ts index 674feb1..5480a7b 100644 --- a/src/listeners/guild/guildDelete.ts +++ b/src/listeners/guild/guildDelete.ts @@ -1,4 +1,4 @@ -import { BushListener, type BushClientEvents } from '@lib'; +import { BushListener, type BushClientEvents } from '#lib'; export default class GuildDeleteListener extends BushListener { public constructor() { diff --git a/src/listeners/guild/guildMemberAdd.ts b/src/listeners/guild/guildMemberAdd.ts index 264ea12..f10255d 100644 --- a/src/listeners/guild/guildMemberAdd.ts +++ b/src/listeners/guild/guildMemberAdd.ts @@ -1,4 +1,4 @@ -import { BushListener, StickyRole, type BushClientEvents, type BushGuildMember, type BushTextChannel } from '@lib'; +import { BushListener, StickyRole, type BushClientEvents, type BushGuildMember, type BushTextChannel } from '#lib'; import { MessageEmbed, Util, type Snowflake } from 'discord.js'; export default class GuildMemberAddListener extends BushListener { diff --git a/src/listeners/guild/guildMemberRemove.ts b/src/listeners/guild/guildMemberRemove.ts index d9c9b6f..ac0f341 100644 --- a/src/listeners/guild/guildMemberRemove.ts +++ b/src/listeners/guild/guildMemberRemove.ts @@ -1,4 +1,4 @@ -import { BushGuildMember, BushListener, BushTextChannel, StickyRole, type BushClientEvents, type PartialBushGuildMember } from '@lib'; +import { BushGuildMember, BushListener, BushTextChannel, StickyRole, type BushClientEvents, type PartialBushGuildMember } from '#lib'; import { MessageEmbed, Util } from 'discord.js'; export default class GuildMemberRemoveListener extends BushListener { diff --git a/src/listeners/guild/syncUnban.ts b/src/listeners/guild/syncUnban.ts index 2062679..01b2679 100644 --- a/src/listeners/guild/syncUnban.ts +++ b/src/listeners/guild/syncUnban.ts @@ -1,4 +1,4 @@ -import { ActivePunishment, ActivePunishmentType, BushListener, type BushClientEvents } from '@lib'; +import { ActivePunishment, ActivePunishmentType, BushListener, type BushClientEvents } from '#lib'; export default class SyncUnbanListener extends BushListener { public constructor() { diff --git a/src/listeners/message/autoPublisher.ts b/src/listeners/message/autoPublisher.ts index 2714296..be8fc3e 100644 --- a/src/listeners/message/autoPublisher.ts +++ b/src/listeners/message/autoPublisher.ts @@ -1,4 +1,4 @@ -import { BushListener, type BushClientEvents } from '@lib'; +import { BushListener, type BushClientEvents } from '#lib'; export default class autoPublisherListener extends BushListener { public constructor() { diff --git a/src/listeners/message/autoThread.ts b/src/listeners/message/autoThread.ts index 2f0dee8..f817802 100644 --- a/src/listeners/message/autoThread.ts +++ b/src/listeners/message/autoThread.ts @@ -1,4 +1,4 @@ -import { BushListener, type BushClientEvents, type BushTextChannel } from '@lib'; +import { BushListener, type BushClientEvents, type BushTextChannel } from '#lib'; import { type GuildTextBasedChannels } from 'discord-akairo'; import { MessageEmbed } from 'discord.js'; diff --git a/src/listeners/message/automodCreate.ts b/src/listeners/message/automodCreate.ts index 5182557..8824c72 100644 --- a/src/listeners/message/automodCreate.ts +++ b/src/listeners/message/automodCreate.ts @@ -1,4 +1,4 @@ -import { AutoMod, BushListener, type BushClientEvents } from '@lib'; +import { AutoMod, BushListener, type BushClientEvents } from '#lib'; export default class AutomodMessageCreateListener extends BushListener { public constructor() { diff --git a/src/listeners/message/automodUpdate.ts b/src/listeners/message/automodUpdate.ts index fc1f355..c96a5a9 100644 --- a/src/listeners/message/automodUpdate.ts +++ b/src/listeners/message/automodUpdate.ts @@ -1,4 +1,4 @@ -import { AutoMod, BushListener, type BushClientEvents, type BushMessage } from '@lib'; +import { AutoMod, BushListener, type BushClientEvents, type BushMessage } from '#lib'; export default class AutomodMessageUpdateListener extends BushListener { public constructor() { diff --git a/src/listeners/message/blacklistedFile.ts b/src/listeners/message/blacklistedFile.ts index bc8b335..26e1719 100644 --- a/src/listeners/message/blacklistedFile.ts +++ b/src/listeners/message/blacklistedFile.ts @@ -1,4 +1,4 @@ -import { BushListener, type BushClientEvents } from '@lib'; +import { BushListener, type BushClientEvents } from '#lib'; import * as crypto from 'crypto'; import got from 'got'; diff --git a/src/listeners/message/boosterMessage.ts b/src/listeners/message/boosterMessage.ts index 6fcd06e..0ebe393 100644 --- a/src/listeners/message/boosterMessage.ts +++ b/src/listeners/message/boosterMessage.ts @@ -1,4 +1,4 @@ -import { BushListener, type BushClientEvents } from '@lib'; +import { BushListener, type BushClientEvents } from '#lib'; export default class BoosterMessageListener extends BushListener { public constructor() { diff --git a/src/listeners/message/directMessage.ts b/src/listeners/message/directMessage.ts index 2162c3a..b6cdf59 100644 --- a/src/listeners/message/directMessage.ts +++ b/src/listeners/message/directMessage.ts @@ -1,4 +1,4 @@ -import { BushListener, type BushClientEvents } from '@lib'; +import { BushListener, type BushClientEvents } from '#lib'; import { MessageEmbed } from 'discord.js'; export default class DirectMessageListener extends BushListener { diff --git a/src/listeners/message/level.ts b/src/listeners/message/level.ts index 3702a05..bce4614 100644 --- a/src/listeners/message/level.ts +++ b/src/listeners/message/level.ts @@ -1,4 +1,4 @@ -import { BushListener, Level, type BushCommandHandlerEvents, type BushGuild, type BushMessage } from '@lib'; +import { BushListener, Level, type BushCommandHandlerEvents, type BushGuild, type BushMessage } from '#lib'; import { type MessageType } from 'discord.js'; export default class LevelListener extends BushListener { diff --git a/src/listeners/message/verbose.ts b/src/listeners/message/verbose.ts index fbbf055..cf5a698 100644 --- a/src/listeners/message/verbose.ts +++ b/src/listeners/message/verbose.ts @@ -1,4 +1,4 @@ -import { BushListener, type BushClientEvents } from '@lib'; +import { BushListener, type BushClientEvents } from '#lib'; export default class MessageVerboseListener extends BushListener { public constructor() { diff --git a/src/listeners/other/consoleListener.ts b/src/listeners/other/consoleListener.ts index fab9119..fca8255 100644 --- a/src/listeners/other/consoleListener.ts +++ b/src/listeners/other/consoleListener.ts @@ -1,4 +1,4 @@ -import { BushListener } from '@lib'; +import { BushListener } from '#lib'; import { exec } from 'child_process'; import { promisify } from 'util'; @@ -16,7 +16,7 @@ export default class ConsoleListener extends BushListener { const sh = promisify(exec), bot = client, config = client.config, - { ActivePunishment, Global, Guild, Level, ModLog, StickyRole } = await import('@lib'), + { ActivePunishment, Global, Guild, Level, ModLog, StickyRole } = await import('#lib'), { ButtonInteraction, Collector, diff --git a/src/listeners/other/exit.ts b/src/listeners/other/exit.ts index 4ea6068..26ed36f 100644 --- a/src/listeners/other/exit.ts +++ b/src/listeners/other/exit.ts @@ -1,4 +1,4 @@ -import { BushListener } from '@lib'; +import { BushListener } from '#lib'; export default class ExitListener extends BushListener { public constructor() { diff --git a/src/listeners/other/promiseRejection.ts b/src/listeners/other/promiseRejection.ts index ad16773..f7ca840 100644 --- a/src/listeners/other/promiseRejection.ts +++ b/src/listeners/other/promiseRejection.ts @@ -1,6 +1,6 @@ -import { BushListener } from '@lib'; +import { BushListener } from '#lib'; import { Severity } from '@sentry/node'; -import CommandErrorListener from '../commands/commandError'; +import CommandErrorListener from '../commands/commandError.js'; export default class PromiseRejectionListener extends BushListener { public constructor() { diff --git a/src/listeners/other/uncaughtException.ts b/src/listeners/other/uncaughtException.ts index 0f8c17c..096c1f0 100644 --- a/src/listeners/other/uncaughtException.ts +++ b/src/listeners/other/uncaughtException.ts @@ -1,6 +1,6 @@ -import { BushListener } from '@lib'; +import { BushListener } from '#lib'; import { Severity } from '@sentry/node'; -import CommandErrorListener from '../commands/commandError'; +import CommandErrorListener from '../commands/commandError.js'; export default class UncaughtExceptionListener extends BushListener { public constructor() { diff --git a/src/listeners/other/warning.ts b/src/listeners/other/warning.ts index bf1488f..4dd79fe 100644 --- a/src/listeners/other/warning.ts +++ b/src/listeners/other/warning.ts @@ -1,6 +1,6 @@ -import { BushListener } from '@lib'; +import { BushListener } from '#lib'; import { Severity } from '@sentry/node'; -import CommandErrorListener from '../commands/commandError'; +import CommandErrorListener from '../commands/commandError.js'; export default class WarningListener extends BushListener { public constructor() { diff --git a/src/tasks/cpuUsage.ts b/src/tasks/cpuUsage.ts index b22923a..e597b31 100644 --- a/src/tasks/cpuUsage.ts +++ b/src/tasks/cpuUsage.ts @@ -1,5 +1,5 @@ -import { BushTask } from '@lib'; -import * as osu from 'node-os-utils'; +import { BushTask } from '#lib'; +import osu from 'node-os-utils'; export default class CpuUsageTask extends BushTask { public constructor() { diff --git a/src/tasks/removeExpiredPunishements.ts b/src/tasks/removeExpiredPunishements.ts index dee6a89..6662292 100644 --- a/src/tasks/removeExpiredPunishements.ts +++ b/src/tasks/removeExpiredPunishements.ts @@ -1,5 +1,5 @@ -import { ActivePunishment, ActivePunishmentType, BushTask, type BushGuild, type BushUser } from '@lib'; -import { Op } from 'sequelize'; +import { ActivePunishment, ActivePunishmentType, BushTask, type BushGuild, type BushUser } from '#lib'; +const { Op } = (await import('sequelize')).default; export default class RemoveExpiredPunishmentsTask extends BushTask { public constructor() { diff --git a/src/tasks/updateCache.ts b/src/tasks/updateCache.ts index 6ccf609..16683f0 100644 --- a/src/tasks/updateCache.ts +++ b/src/tasks/updateCache.ts @@ -1,6 +1,6 @@ -import { Global, Guild, type BushClient } from '@lib'; -import { BushTask } from '../lib/extensions/discord-akairo/BushTask'; -import config from './../config/options'; +import { Global, Guild, type BushClient } from '#lib'; +import { BushTask } from '../lib/extensions/discord-akairo/BushTask.js'; +import config from './../config/options.js'; export default class UpdateCacheTask extends BushTask { public constructor() { diff --git a/src/tasks/updateStats.ts b/src/tasks/updateStats.ts index ad3cb45..d6cabaa 100644 --- a/src/tasks/updateStats.ts +++ b/src/tasks/updateStats.ts @@ -1,5 +1,5 @@ -import { Stat } from '@lib'; -import { BushTask } from '../lib/extensions/discord-akairo/BushTask'; +import { Stat } from '#lib'; +import { BushTask } from '../lib/extensions/discord-akairo/BushTask.js'; export default class UpdateStatsTask extends BushTask { public constructor() { diff --git a/src/tasks/updateSuperUsers.ts b/src/tasks/updateSuperUsers.ts index 72ae7ab..ffbf550 100644 --- a/src/tasks/updateSuperUsers.ts +++ b/src/tasks/updateSuperUsers.ts @@ -1,5 +1,5 @@ -import { BushTask } from '../lib/extensions/discord-akairo/BushTask'; -import { Global } from '../lib/models/Global'; +import { BushTask } from '../lib/extensions/discord-akairo/BushTask.js'; +import { Global } from '../lib/models/Global.js'; export default class UpdateSuperUsersTask extends BushTask { public constructor() { diff --git a/tsconfig.json b/tsconfig.json index c51f4d5..3feb2b4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,8 +1,8 @@ { "compilerOptions": { - "module": "CommonJS", - "moduleResolution": "Node", + "module": "ESNext", "target": "ESNext", + "moduleResolution": "Node", "outDir": "dist", "lib": [ "esnext", @@ -11,9 +11,9 @@ "esnext.intl", "esnext.symbol" ], - "sourceMap": false, - "inlineSourceMap": true, - "inlineSources": true, + "sourceMap": true, + // "inlineSourceMap": true, + // "inlineSources": true, "incremental": true, "experimentalDecorators": true, "emitDecoratorMetadata": true, @@ -28,16 +28,14 @@ "importHelpers": true, "esModuleInterop": true, // "importsNotUsedAsValues": "error", - // "preserveValueImports": true, + "preserveValueImports": true, + "removeComments": true, "paths": { - "src/*": [ - "./src/*" - ], - "@lib": [ - "./src/lib" + "#lib": [ + "./src/lib/index.js" ], - "@root": [ - "." + "#root/*": [ + "./*" ] } }, @@ -46,5 +44,8 @@ "lib/**/*.ts", "ecosystem.config.js" ], - "exclude": [] + "exclude": [ + "dist", + "node_modules" + ] }
\ No newline at end of file @@ -390,13 +390,6 @@ __metadata: languageName: node linkType: hard -"@types/module-alias@npm:^2.0.1": - version: 2.0.1 - resolution: "@types/module-alias@npm:2.0.1" - checksum: c6d6d30605833b03465c39760df42616fd24e4f532a29bb77954220885feb21eb2d84dd38eed68b0c18997e6930fdc5914d2dc6fd7cc5d110a42068d2204e11e - languageName: node - linkType: hard - "@types/node-fetch@npm:^2.5.12": version: 2.5.12 resolution: "@types/node-fetch@npm:2.5.12" @@ -485,11 +478,11 @@ __metadata: linkType: hard "@typescript-eslint/eslint-plugin@npm:^5.2.0": - version: 5.2.0 - resolution: "@typescript-eslint/eslint-plugin@npm:5.2.0" + version: 5.3.0 + resolution: "@typescript-eslint/eslint-plugin@npm:5.3.0" dependencies: - "@typescript-eslint/experimental-utils": 5.2.0 - "@typescript-eslint/scope-manager": 5.2.0 + "@typescript-eslint/experimental-utils": 5.3.0 + "@typescript-eslint/scope-manager": 5.3.0 debug: ^4.3.2 functional-red-black-tree: ^1.0.1 ignore: ^5.1.8 @@ -502,66 +495,66 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 65dd4a671c1e29aeff6b3796f52941474fbdede5aa9908deb339cea61930a4b783bdbb311524787fdeb2f2883c31a8d2c491e99355fa16ac289a94533d84e6a7 + checksum: dc053205db698c65905c7821ff7a61641f218b505c7cea690c01ac464d404973e5d71965040d3560da17024569c9a3836053037bea7bd1cfce4e448beaf179be languageName: node linkType: hard -"@typescript-eslint/experimental-utils@npm:5.2.0": - version: 5.2.0 - resolution: "@typescript-eslint/experimental-utils@npm:5.2.0" +"@typescript-eslint/experimental-utils@npm:5.3.0": + version: 5.3.0 + resolution: "@typescript-eslint/experimental-utils@npm:5.3.0" dependencies: "@types/json-schema": ^7.0.9 - "@typescript-eslint/scope-manager": 5.2.0 - "@typescript-eslint/types": 5.2.0 - "@typescript-eslint/typescript-estree": 5.2.0 + "@typescript-eslint/scope-manager": 5.3.0 + "@typescript-eslint/types": 5.3.0 + "@typescript-eslint/typescript-estree": 5.3.0 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 peerDependencies: eslint: "*" - checksum: f1082fff0be677ade9d578271b8a7c2b7e24c8c2a121333d0018f23e6d6d5619cb8c830017bac70843f0006b5bd34c9bd99024ca7fd73f38a2dfcd8e38d41a6a + checksum: 889d6e78f35ac637b1f31d802ba6c5c30c762a402ade341a8df70f447c39ba8ece0aafd9fbdf6bf8954c957daf69025907e0b9191b9c2e61ea056d2b01a8b3c5 languageName: node linkType: hard "@typescript-eslint/parser@npm:^5.2.0": - version: 5.2.0 - resolution: "@typescript-eslint/parser@npm:5.2.0" + version: 5.3.0 + resolution: "@typescript-eslint/parser@npm:5.3.0" dependencies: - "@typescript-eslint/scope-manager": 5.2.0 - "@typescript-eslint/types": 5.2.0 - "@typescript-eslint/typescript-estree": 5.2.0 + "@typescript-eslint/scope-manager": 5.3.0 + "@typescript-eslint/types": 5.3.0 + "@typescript-eslint/typescript-estree": 5.3.0 debug: ^4.3.2 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: cde4d8e7fe70811ea42b49b8efd96e5ea0c1e2d2bd24c76b7fd98c35bc5ffd63f05ebcc7cc41658ef83d8950bf53cc6518e795ffe3275c4dce61c6c9d50996fc + checksum: 7f523a32f4f44b87a1f907ae6206b47f6bfa892211fea0e670939b55aed3c027bc11e087979d0b798b12bc045dd2c7205035449caecc14b0810b38f44942bbb8 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.2.0": - version: 5.2.0 - resolution: "@typescript-eslint/scope-manager@npm:5.2.0" +"@typescript-eslint/scope-manager@npm:5.3.0": + version: 5.3.0 + resolution: "@typescript-eslint/scope-manager@npm:5.3.0" dependencies: - "@typescript-eslint/types": 5.2.0 - "@typescript-eslint/visitor-keys": 5.2.0 - checksum: aebd87d82c2adcbe24e7bca25888950527653106f02d498f2a06e84092e77d3b837059ef401dee69ce7c14b0a9e3da12945fb1d2e58e2415de71d17a4a55ef2a + "@typescript-eslint/types": 5.3.0 + "@typescript-eslint/visitor-keys": 5.3.0 + checksum: f2ca9416fccb811682650c2096b839e2af3c71459d98374fe446e4fced59917cb91ae83c351288eb955d00eaba6b77b9ea46272bef4e005fb368b65e8ff22976 languageName: node linkType: hard -"@typescript-eslint/types@npm:5.2.0": - version: 5.2.0 - resolution: "@typescript-eslint/types@npm:5.2.0" - checksum: dd283e682539900daf52f23d6983e2b083268502c2a6615a0411e6cfa3ae7ae09ad2f2260b4b35249de808d519588f76392b70c90c81839c8560b7af70f5b088 +"@typescript-eslint/types@npm:5.3.0": + version: 5.3.0 + resolution: "@typescript-eslint/types@npm:5.3.0" + checksum: 23abd7b953ec96d4ea78046b92e6ed4a67a3dfa3bfd4e90eb646769ff5124cd8ff237eb8da8c7b74bc944cbd770ce4bdded48f2595793be65ed55c1b8771e29c languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.2.0": - version: 5.2.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.2.0" +"@typescript-eslint/typescript-estree@npm:5.3.0": + version: 5.3.0 + resolution: "@typescript-eslint/typescript-estree@npm:5.3.0" dependencies: - "@typescript-eslint/types": 5.2.0 - "@typescript-eslint/visitor-keys": 5.2.0 + "@typescript-eslint/types": 5.3.0 + "@typescript-eslint/visitor-keys": 5.3.0 debug: ^4.3.2 globby: ^11.0.4 is-glob: ^4.0.3 @@ -570,17 +563,17 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 9b5a7406cbf7ab964b762153b8d5c66c21809c423822c114825d3d40f936cb9c7a78a95c1feb5139c27917254d811afe8c9995e8961314e03486892f04b28142 + checksum: 94f627ff7ce01bccddc0655d8a7d8818fcee2bbd42b39e4b2190bafd256325dd8f536325bb476fa17d13339004fd8aec9bce7665c757e51974122b76a84a669b languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.2.0": - version: 5.2.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.2.0" +"@typescript-eslint/visitor-keys@npm:5.3.0": + version: 5.3.0 + resolution: "@typescript-eslint/visitor-keys@npm:5.3.0" dependencies: - "@typescript-eslint/types": 5.2.0 + "@typescript-eslint/types": 5.3.0 eslint-visitor-keys: ^3.0.0 - checksum: 1afcfeaf01430d6e22e9ebfcb07c14aa586b6d9ccc968b634e54bf009efe5d6258cfb0680e97fa42ef94d4aecf10f36ce9d347289d0fe6dd2a48166a373c3f6e + checksum: 5c2be2c4540da9f7e1186a4f1fcca7411615f327c4476bf07853727c610d5b66990c7b3037b277310d0ebfc2f1548c2ff01ed1c535176ae6171f10a3de968a34 languageName: node linkType: hard @@ -829,7 +822,6 @@ __metadata: "@types/express": ^4.17.13 "@types/humanize-duration": ^3.25.1 "@types/lodash": ^4.14.176 - "@types/module-alias": ^2.0.1 "@types/node": ^16.11.6 "@types/node-os-utils": ^1.2.0 "@types/numeral": ^2.0.2 @@ -851,7 +843,6 @@ __metadata: humanize-duration: ^3.27.0 lodash: ^4.17.21 mathjs: ^9.5.0 - module-alias: ^2.2.2 moment: ^2.29.1 nanoid: ^3.1.28 node-os-utils: ^1.3.5 @@ -1176,12 +1167,12 @@ __metadata: linkType: hard "discord-akairo@npm:@notenoughupdates/discord-akairo@dev": - version: 9.0.5-dev.1635696379.8081025 - resolution: "@notenoughupdates/discord-akairo@npm:9.0.5-dev.1635696379.8081025" + version: 9.0.6-dev.1635795375.6fd4260 + resolution: "@notenoughupdates/discord-akairo@npm:9.0.6-dev.1635795375.6fd4260" dependencies: lodash: ^4.17.21 source-map-support: ^0.5.20 - checksum: 43e65077d70689453d44f80ea2d95176fe2a310bcc9fd0245c99b7c3632d02444a643bc91f77299a3abdf13f6d5b22fe1a7db26952193f93299fcf4430667110 + checksum: 6fec56826f0ef8bdcb4335c3c0a047384788404cddbf0b06c8f81e99c0ffc78f04dc8332cad7c3ee1448e762a2a3a2edd5132573d5e052cd210e09df639abc55 languageName: node linkType: hard @@ -1200,8 +1191,8 @@ __metadata: linkType: hard "discord.js@npm:@notenoughupdates/discord.js@dev": - version: 13.4.0-dev.1635682036.894403 - resolution: "@notenoughupdates/discord.js@npm:13.4.0-dev.1635682036.894403" + version: 13.4.0-dev.1635768518.894403 + resolution: "@notenoughupdates/discord.js@npm:13.4.0-dev.1635768518.894403" dependencies: "@discordjs/builders": ^0.8.1 "@discordjs/collection": ^0.3.2 @@ -1212,7 +1203,7 @@ __metadata: discord-api-types: ^0.24.0 node-fetch: ^2.6.1 ws: ^8.2.3 - checksum: 0ddd2f8d8ec307bd9db8fce791303ddb5682005ecee86044bc269dd139a609d72e2524275cd8ca923b32824ff54ae2b89528ce2f948608ecf6f04bd9e6742463 + checksum: add3774893945da7d14d22750f1232d0d6fa9aa3d6eca95aba43dc9e6b36d74c863dcf42b832a72825e26a09ffac333c1014069d51fe61a34bb93e454ae7f2ab languageName: node linkType: hard @@ -2018,11 +2009,11 @@ __metadata: linkType: hard "keyv@npm:^4.0.0": - version: 4.0.3 - resolution: "keyv@npm:4.0.3" + version: 4.0.4 + resolution: "keyv@npm:4.0.4" dependencies: json-buffer: 3.0.1 - checksum: 770134225c5320861748bf65f022e7ce100e465b85b28fe39036ef66f6190bb602aa8a57df365b9c745005d948fc1f0da99306062875a2f52700195e0b4d1033 + checksum: 73f0f45e149be12aab0449a59c9a490195f231ef90024222e544f4c24221fa2b4ec1cd432f92384f0f852e6ae48b7e97f1bf2147c29616b2feddf8ffbc401777 languageName: node linkType: hard @@ -2288,13 +2279,6 @@ __metadata: languageName: node linkType: hard -"module-alias@npm:^2.2.2": - version: 2.2.2 - resolution: "module-alias@npm:2.2.2" - checksum: 4b5543f834b484033e5bd184096ca8276b9195e32e88883ee6ea8d3a4789d97c470d26f5fa7271bd7a26588bf67e4d27dbdb594ee327aef1c9619d855dc78342 - languageName: node - linkType: hard - "moment-timezone@npm:^0.5.31": version: 0.5.33 resolution: "moment-timezone@npm:0.5.33" @@ -2918,8 +2902,8 @@ __metadata: linkType: hard "sequelize@npm:^6.6.5": - version: 6.8.0 - resolution: "sequelize@npm:6.8.0" + version: 6.9.0 + resolution: "sequelize@npm:6.9.0" dependencies: debug: ^4.1.1 dottie: ^2.0.0 @@ -2947,7 +2931,7 @@ __metadata: optional: true tedious: optional: true - checksum: 250980ee266ff0e75f50c0b45e137d6d94b65440def9e68535feabda394fa8d43caf39d2060eed83d0d742940825cc133719246b9b547391e11c796203451cfa + checksum: e2fb0a6cd4a8b8eed254a99e20a700852396fdfd8f1d49e786da40186805ad49c03e088d93fa1e0a40764f8fe2a486e58d74d8c97287a4c9aba3d415d2c90bab languageName: node linkType: hard |