diff options
Diffstat (limited to 'src/lib/extensions')
58 files changed, 299 insertions, 283 deletions
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; |