aboutsummaryrefslogtreecommitdiff
path: root/src/lib/extensions
diff options
context:
space:
mode:
authorIRONM00N <64110067+IRONM00N@users.noreply.github.com>2021-10-31 22:38:06 -0400
committerIRONM00N <64110067+IRONM00N@users.noreply.github.com>2021-10-31 22:38:06 -0400
commitc40a94697d64962edda41345e03fa76f51aa431c (patch)
tree1e258d51d6b19b9918f1d478b3f4c51dca3adc93 /src/lib/extensions
parent901d9dfc8c5d95b8c76519e700c624294d4df787 (diff)
downloadtanzanite-c40a94697d64962edda41345e03fa76f51aa431c.tar.gz
tanzanite-c40a94697d64962edda41345e03fa76f51aa431c.tar.bz2
tanzanite-c40a94697d64962edda41345e03fa76f51aa431c.zip
upgrade typescript, improve workflow, bunch of bug fixes and some other things
Diffstat (limited to 'src/lib/extensions')
-rw-r--r--src/lib/extensions/discord-akairo/BushArgumentTypeCaster.ts2
-rw-r--r--src/lib/extensions/discord-akairo/BushClient.ts33
-rw-r--r--src/lib/extensions/discord-akairo/BushClientUtil.ts34
-rw-r--r--src/lib/extensions/discord-akairo/BushCommand.ts9
-rw-r--r--src/lib/extensions/discord-akairo/BushCommandHandler.ts9
-rw-r--r--src/lib/extensions/discord-akairo/BushCommandUtil.ts10
-rw-r--r--src/lib/extensions/discord-akairo/BushInhibitor.ts5
-rw-r--r--src/lib/extensions/discord-akairo/BushInhibitorHandler.ts2
-rw-r--r--src/lib/extensions/discord-akairo/BushListener.ts5
-rw-r--r--src/lib/extensions/discord-akairo/BushListenerHandler.ts2
-rw-r--r--src/lib/extensions/discord-akairo/BushSlashMessage.ts8
-rw-r--r--src/lib/extensions/discord-akairo/BushTask.ts4
-rw-r--r--src/lib/extensions/discord-akairo/BushTaskHandler.ts4
-rw-r--r--src/lib/extensions/discord.js/BushActivity.ts5
-rw-r--r--src/lib/extensions/discord.js/BushApplicationCommand.ts7
-rw-r--r--src/lib/extensions/discord.js/BushApplicationCommandManager.d.ts16
-rw-r--r--src/lib/extensions/discord.js/BushApplicationCommandPermissionsManager.d.ts23
-rw-r--r--src/lib/extensions/discord.js/BushBaseGuildEmojiManager.d.ts8
-rw-r--r--src/lib/extensions/discord.js/BushBaseGuildTextChannel.ts22
-rw-r--r--src/lib/extensions/discord.js/BushButtonInteraction.ts13
-rw-r--r--src/lib/extensions/discord.js/BushCategoryChannel.ts9
-rw-r--r--src/lib/extensions/discord.js/BushChannel.d.ts12
-rw-r--r--src/lib/extensions/discord.js/BushChannelManager.d.ts8
-rw-r--r--src/lib/extensions/discord.js/BushClientEvents.d.ts70
-rw-r--r--src/lib/extensions/discord.js/BushClientUser.d.ts14
-rw-r--r--src/lib/extensions/discord.js/BushCommandInteraction.ts26
-rw-r--r--src/lib/extensions/discord.js/BushDMChannel.ts6
-rw-r--r--src/lib/extensions/discord.js/BushEmoji.ts4
-rw-r--r--src/lib/extensions/discord.js/BushGuild.ts22
-rw-r--r--src/lib/extensions/discord.js/BushGuildApplicationCommandManager.d.ts16
-rw-r--r--src/lib/extensions/discord.js/BushGuildBan.d.ts6
-rw-r--r--src/lib/extensions/discord.js/BushGuildChannel.ts5
-rw-r--r--src/lib/extensions/discord.js/BushGuildEmoji.ts7
-rw-r--r--src/lib/extensions/discord.js/BushGuildEmojiRoleManager.d.ts7
-rw-r--r--src/lib/extensions/discord.js/BushGuildManager.d.ts16
-rw-r--r--src/lib/extensions/discord.js/BushGuildMember.ts11
-rw-r--r--src/lib/extensions/discord.js/BushGuildMemberManager.d.ts34
-rw-r--r--src/lib/extensions/discord.js/BushMessage.ts21
-rw-r--r--src/lib/extensions/discord.js/BushMessageManager.d.ts44
-rw-r--r--src/lib/extensions/discord.js/BushMessageReaction.ts9
-rw-r--r--src/lib/extensions/discord.js/BushNewsChannel.ts9
-rw-r--r--src/lib/extensions/discord.js/BushPresence.ts7
-rw-r--r--src/lib/extensions/discord.js/BushReactionEmoji.ts6
-rw-r--r--src/lib/extensions/discord.js/BushRole.ts9
-rw-r--r--src/lib/extensions/discord.js/BushSelectMenuInteraction.ts13
-rw-r--r--src/lib/extensions/discord.js/BushStageChannel.ts11
-rw-r--r--src/lib/extensions/discord.js/BushStageInstance.ts7
-rw-r--r--src/lib/extensions/discord.js/BushStoreChannel.ts10
-rw-r--r--src/lib/extensions/discord.js/BushTextChannel.ts10
-rw-r--r--src/lib/extensions/discord.js/BushThreadChannel.ts20
-rw-r--r--src/lib/extensions/discord.js/BushThreadManager.d.ts44
-rw-r--r--src/lib/extensions/discord.js/BushThreadMember.ts6
-rw-r--r--src/lib/extensions/discord.js/BushThreadMemberManager.d.ts20
-rw-r--r--src/lib/extensions/discord.js/BushUser.ts7
-rw-r--r--src/lib/extensions/discord.js/BushUserManager.d.ts8
-rw-r--r--src/lib/extensions/discord.js/BushVoiceChannel.ts8
-rw-r--r--src/lib/extensions/discord.js/BushVoiceState.ts8
57 files changed, 357 insertions, 414 deletions
diff --git a/src/lib/extensions/discord-akairo/BushArgumentTypeCaster.ts b/src/lib/extensions/discord-akairo/BushArgumentTypeCaster.ts
index 42d989c..c07644c 100644
--- a/src/lib/extensions/discord-akairo/BushArgumentTypeCaster.ts
+++ b/src/lib/extensions/discord-akairo/BushArgumentTypeCaster.ts
@@ -1,3 +1,3 @@
-import { BushMessage } from '../discord.js/BushMessage';
+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 c5d05b7..8f7533c 100644
--- a/src/lib/extensions/discord-akairo/BushClient.ts
+++ b/src/lib/extensions/discord-akairo/BushClient.ts
@@ -1,21 +1,20 @@
import * as Sentry from '@sentry/node';
import { AkairoClient, ContextMenuCommandHandler, version as akairoVersion } from 'discord-akairo';
import {
- Awaitable,
- Collection,
- Intents,
- InteractionReplyOptions,
- Message,
- MessageEditOptions,
- MessageOptions,
- MessagePayload,
- Options,
- PartialDMChannel,
- ReplyMessageOptions,
- Snowflake,
- Structures,
- version as discordJsVersion,
- WebhookEditMessageOptions
+ DMChannel,
+ Intents, Options,
+ Structures, version as discordJsVersion,
+ type Awaitable,
+ type Collection,
+ type InteractionReplyOptions,
+ type Message,
+ type MessageEditOptions,
+ type MessageOptions,
+ type MessagePayload,
+ type PartialDMChannel,
+ type ReplyMessageOptions,
+ type Snowflake,
+ type WebhookEditMessageOptions
} from 'discord.js';
//@ts-ignore: no typings
import eventsIntercept from 'events-intercept';
@@ -89,7 +88,7 @@ export type BushThreadMemberResolvable = BushThreadMember | BushUserResolvable;
export type BushUserResolvable = BushUser | Snowflake | BushMessage | BushGuildMember | BushThreadMember;
export type BushGuildMemberResolvable = BushGuildMember | BushUserResolvable;
export type BushRoleResolvable = BushRole | Snowflake;
-export type BushMessageResolvable = BushMessage | Snowflake;
+export type BushMessageResolvable = Message| BushMessage | Snowflake;
export type BushEmojiResolvable = Snowflake | BushGuildEmoji | BushReactionEmoji;
export type BushEmojiIdentifierResolvable = string | BushEmojiResolvable;
export type BushThreadChannelResolvable = BushThreadChannel | Snowflake;
@@ -97,7 +96,7 @@ export type BushApplicationCommandResolvable = BushApplicationCommand | Snowflak
export type BushGuildTextChannelResolvable = BushTextChannel | BushNewsChannel | Snowflake;
export type BushChannelResolvable = BushChannel | Snowflake;
export type BushTextBasedChannels = PartialDMChannel | BushDMChannel | BushTextChannel | BushNewsChannel | BushThreadChannel;
-export type BushGuildTextBasedChannel = Exclude<BushTextBasedChannels, PartialDMChannel | BushDMChannel>;
+export type BushGuildTextBasedChannel = Exclude<BushTextBasedChannels, PartialDMChannel | BushDMChannel | DMChannel>;
export interface BushFetchedThreads {
threads: Collection<Snowflake, BushThreadChannel>;
hasMore?: boolean;
diff --git a/src/lib/extensions/discord-akairo/BushClientUtil.ts b/src/lib/extensions/discord-akairo/BushClientUtil.ts
index 32081ed..4507458 100644
--- a/src/lib/extensions/discord-akairo/BushClientUtil.ts
+++ b/src/lib/extensions/discord-akairo/BushClientUtil.ts
@@ -1,31 +1,32 @@
import {
- BushCache,
- BushClient,
+ Arg,
BushConstants,
- BushMessage,
- BushSlashMessage,
- BushUser,
Global,
- Pronoun,
- PronounCode
+ type BushCache,
+ type BushClient,
+ type BushMessage,
+ type BushSlashMessage,
+ type BushUser,
+ type Pronoun,
+ type PronounCode
} from '@lib';
import { exec } from 'child_process';
import { ClientUtil, Util as AkairoUtil } from 'discord-akairo';
import { APIMessage } from 'discord-api-types';
import {
- ColorResolvable,
- CommandInteraction,
GuildMember,
- InteractionReplyOptions,
Message,
MessageEmbed,
- PermissionResolvable,
- Snowflake,
- TextChannel,
ThreadMember,
User,
- UserResolvable,
- Util as DiscordUtil
+ Util as DiscordUtil,
+ type ColorResolvable,
+ type CommandInteraction,
+ type InteractionReplyOptions,
+ type PermissionResolvable,
+ type Snowflake,
+ type TextChannel,
+ type UserResolvable
} from 'discord.js';
import got from 'got';
import humanizeDuration from 'humanize-duration';
@@ -36,7 +37,6 @@ import CommandErrorListener from '../../../listeners/commands/commandError';
import { Format } from '../../common/Format';
import { BushInspectOptions } from '../../common/typings/BushInspectOptions';
import { CodeBlockLang } from '../../common/typings/CodeBlockLang';
-import { Arg } from '../../common/util/Arg';
import { BushNewsChannel } from '../discord.js/BushNewsChannel';
import { BushTextChannel } from '../discord.js/BushTextChannel';
import { BushSlashEditMessageType, BushSlashSendMessageType, BushUserResolvable } from './BushClient';
@@ -401,7 +401,7 @@ export class BushClientUtil extends ClientUtil {
/**
* Add or remove an item from an array. All duplicates will be removed.
*/
- public addOrRemoveFromArray<T extends any>(action: 'add' | 'remove', array: T[], value: T): T[] {
+ public addOrRemoveFromArray<T>(action: 'add' | 'remove', array: T[], value: T): T[] {
const set = new Set(array);
action === 'add' ? set.add(value) : set.delete(value);
return [...set];
diff --git a/src/lib/extensions/discord-akairo/BushCommand.ts b/src/lib/extensions/discord-akairo/BushCommand.ts
index e3066aa..40c5974 100644
--- a/src/lib/extensions/discord-akairo/BushCommand.ts
+++ b/src/lib/extensions/discord-akairo/BushCommand.ts
@@ -1,9 +1,6 @@
-import { ArgumentOptions, ArgumentPromptOptions, ArgumentTypeCaster, Command, CommandOptions } from 'discord-akairo';
-import { PermissionResolvable, Snowflake } from 'discord.js';
-import { BushMessage } from '../discord.js/BushMessage';
-import { BushClient } from './BushClient';
-import { BushCommandHandler } from './BushCommandHandler';
-import { BushSlashMessage } from './BushSlashMessage';
+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';
export type BaseBushArgumentType =
| 'string'
diff --git a/src/lib/extensions/discord-akairo/BushCommandHandler.ts b/src/lib/extensions/discord-akairo/BushCommandHandler.ts
index 8ab47d8..09cb303 100644
--- a/src/lib/extensions/discord-akairo/BushCommandHandler.ts
+++ b/src/lib/extensions/discord-akairo/BushCommandHandler.ts
@@ -1,9 +1,6 @@
-import { Category, CommandHandler, CommandHandlerEvents, CommandHandlerOptions } from 'discord-akairo';
-import { Collection, PermissionString } from 'discord.js';
-import { BushMessage } from '../discord.js/BushMessage';
-import { BushClient } from './BushClient';
-import { BushCommand } from './BushCommand';
-import { BushSlashMessage } from './BushSlashMessage';
+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';
export type BushCommandHandlerOptions = CommandHandlerOptions;
diff --git a/src/lib/extensions/discord-akairo/BushCommandUtil.ts b/src/lib/extensions/discord-akairo/BushCommandUtil.ts
index 7720d57..04533bd 100644
--- a/src/lib/extensions/discord-akairo/BushCommandUtil.ts
+++ b/src/lib/extensions/discord-akairo/BushCommandUtil.ts
@@ -1,10 +1,6 @@
-import { CommandUtil, ParsedComponentData } from 'discord-akairo';
-import { Snowflake } from 'discord-api-types';
-import { Collection } from 'discord.js';
-import { BushMessage } from '../discord.js/BushMessage';
-import { BushCommand } from './BushCommand';
-import { BushCommandHandler } from './BushCommandHandler';
-import { BushSlashMessage } from './BushSlashMessage';
+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';
export interface BushParsedComponentData extends ParsedComponentData {
command?: BushCommand;
diff --git a/src/lib/extensions/discord-akairo/BushInhibitor.ts b/src/lib/extensions/discord-akairo/BushInhibitor.ts
index d689a72..638f663 100644
--- a/src/lib/extensions/discord-akairo/BushInhibitor.ts
+++ b/src/lib/extensions/discord-akairo/BushInhibitor.ts
@@ -1,8 +1,5 @@
+import { type BushClient, type BushCommand, type BushMessage, type BushSlashMessage } from '@lib';
import { Inhibitor } from 'discord-akairo';
-import { BushMessage } from '../discord.js/BushMessage';
-import { BushClient } from './BushClient';
-import { BushCommand } from './BushCommand';
-import { BushSlashMessage } from './BushSlashMessage';
export class BushInhibitor extends Inhibitor {
public declare client: BushClient;
diff --git a/src/lib/extensions/discord-akairo/BushInhibitorHandler.ts b/src/lib/extensions/discord-akairo/BushInhibitorHandler.ts
index 2a947da..4984934 100644
--- a/src/lib/extensions/discord-akairo/BushInhibitorHandler.ts
+++ b/src/lib/extensions/discord-akairo/BushInhibitorHandler.ts
@@ -1,5 +1,5 @@
+import { type BushClient } from '@lib';
import { InhibitorHandler } from 'discord-akairo';
-import { BushClient } from './BushClient';
export class BushInhibitorHandler extends InhibitorHandler {
public declare client: BushClient;
diff --git a/src/lib/extensions/discord-akairo/BushListener.ts b/src/lib/extensions/discord-akairo/BushListener.ts
index 82e874f..e3c845c 100644
--- a/src/lib/extensions/discord-akairo/BushListener.ts
+++ b/src/lib/extensions/discord-akairo/BushListener.ts
@@ -1,6 +1,7 @@
+import { type BushClient } from '@lib';
import { Listener } from 'discord-akairo';
-import EventEmitter from 'events';
-import { BushClient } from './BushClient';
+import type EventEmitter from 'events';
+
export class BushListener extends Listener {
public declare client: BushClient;
public constructor(
diff --git a/src/lib/extensions/discord-akairo/BushListenerHandler.ts b/src/lib/extensions/discord-akairo/BushListenerHandler.ts
index 28615fc..f5354e4 100644
--- a/src/lib/extensions/discord-akairo/BushListenerHandler.ts
+++ b/src/lib/extensions/discord-akairo/BushListenerHandler.ts
@@ -1,5 +1,5 @@
+import { type BushClient } from '@lib';
import { ListenerHandler } from 'discord-akairo';
-import { BushClient } from './BushClient';
export class BushListenerHandler extends ListenerHandler {
declare client: BushClient;
diff --git a/src/lib/extensions/discord-akairo/BushSlashMessage.ts b/src/lib/extensions/discord-akairo/BushSlashMessage.ts
index b5e48ea..fd248b1 100644
--- a/src/lib/extensions/discord-akairo/BushSlashMessage.ts
+++ b/src/lib/extensions/discord-akairo/BushSlashMessage.ts
@@ -1,10 +1,6 @@
+import { type BushClient, type BushCommandUtil, type BushGuild, type BushGuildMember, type BushUser } from '@lib';
import { AkairoMessage } from 'discord-akairo';
-import { CommandInteraction } from 'discord.js';
-import { BushGuild } from '../discord.js/BushGuild';
-import { BushGuildMember } from '../discord.js/BushGuildMember';
-import { BushUser } from '../discord.js/BushUser';
-import { BushClient } from './BushClient';
-import { BushCommandUtil } from './BushCommandUtil';
+import { type CommandInteraction } from 'discord.js';
export class BushSlashMessage extends AkairoMessage {
public declare client: BushClient;
diff --git a/src/lib/extensions/discord-akairo/BushTask.ts b/src/lib/extensions/discord-akairo/BushTask.ts
index 1b14a2b..299e977 100644
--- a/src/lib/extensions/discord-akairo/BushTask.ts
+++ b/src/lib/extensions/discord-akairo/BushTask.ts
@@ -1,5 +1,5 @@
-import { Task, TaskOptions } from 'discord-akairo';
-import { BushClient } from './BushClient';
+import { type BushClient } from '@lib';
+import { Task, type TaskOptions } from 'discord-akairo';
export class BushTask extends Task {
public declare client: BushClient;
diff --git a/src/lib/extensions/discord-akairo/BushTaskHandler.ts b/src/lib/extensions/discord-akairo/BushTaskHandler.ts
index 588988d..8531ff1 100644
--- a/src/lib/extensions/discord-akairo/BushTaskHandler.ts
+++ b/src/lib/extensions/discord-akairo/BushTaskHandler.ts
@@ -1,5 +1,5 @@
-import { AkairoHandlerOptions, TaskHandler } from 'discord-akairo';
-import { BushClient } from './BushClient';
+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 96c924d..1da5fac 100644
--- a/src/lib/extensions/discord.js/BushActivity.ts
+++ b/src/lib/extensions/discord.js/BushActivity.ts
@@ -1,7 +1,6 @@
+import { type BushEmoji, type BushPresence } from '@lib';
import { Activity } from 'discord.js';
-import { RawActivityData } from 'discord.js/typings/rawDataTypes';
-import { BushEmoji } from './BushEmoji';
-import { BushPresence } from './BushPresence';
+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 0d7c000..9dfba65 100644
--- a/src/lib/extensions/discord.js/BushApplicationCommand.ts
+++ b/src/lib/extensions/discord.js/BushApplicationCommand.ts
@@ -1,8 +1,7 @@
/* eslint-disable @typescript-eslint/ban-types */
-import { ApplicationCommand, Snowflake } from 'discord.js';
-import { RawApplicationCommandData } from 'discord.js/typings/rawDataTypes';
-import { BushClient } from '../discord-akairo/BushClient';
-import { BushGuild } from './BushGuild';
+import { type BushClient, type BushGuild } from '@lib';
+import { ApplicationCommand, type Snowflake } from 'discord.js';
+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 b993215..89ad55d 100644
--- a/src/lib/extensions/discord.js/BushApplicationCommandManager.d.ts
+++ b/src/lib/extensions/discord.js/BushApplicationCommandManager.d.ts
@@ -1,9 +1,12 @@
-import { APIApplicationCommand } from 'discord-api-types';
-import { ApplicationCommandData, CachedManager, Collection, FetchApplicationCommandOptions, Snowflake } from 'discord.js';
-import { BushApplicationCommandResolvable, BushClient } from '../discord-akairo/BushClient';
-import { BushApplicationCommand } from './BushApplicationCommand';
-import { BushApplicationCommandPermissionsManager } from './BushApplicationCommandPermissionsManager';
-import { BushGuildResolvable } from './BushCommandInteraction';
+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';
export class BushApplicationCommandManager<
ApplicationCommandScope = BushApplicationCommand<{ guild: BushGuildResolvable }>,
@@ -29,6 +32,7 @@ export class BushApplicationCommandManager<
guildId: Snowflake
): Promise<BushApplicationCommand>;
public fetch(id: Snowflake, options: FetchApplicationCommandOptions & { guildId: Snowflake }): Promise<BushApplicationCommand>;
+ public fetch(options: FetchApplicationCommandOptions): Promise<Collection<string, ApplicationCommandScope>>;
public fetch(id: Snowflake, options?: FetchApplicationCommandOptions): Promise<ApplicationCommandScope>;
public fetch(id?: Snowflake, options?: FetchApplicationCommandOptions): Promise<Collection<Snowflake, ApplicationCommandScope>>;
public set(commands: ApplicationCommandData[]): Promise<Collection<Snowflake, ApplicationCommandScope>>;
diff --git a/src/lib/extensions/discord.js/BushApplicationCommandPermissionsManager.d.ts b/src/lib/extensions/discord.js/BushApplicationCommandPermissionsManager.d.ts
index ece4a60..0fd47ac 100644
--- a/src/lib/extensions/discord.js/BushApplicationCommandPermissionsManager.d.ts
+++ b/src/lib/extensions/discord.js/BushApplicationCommandPermissionsManager.d.ts
@@ -1,17 +1,16 @@
-import { APIApplicationCommandPermission } from 'discord-api-types';
+import { type BushClient, type BushRoleResolvable, type BushUserResolvable } from '@lib';
+import { type APIApplicationCommandPermission } from 'discord-api-types';
import {
- ApplicationCommand,
- ApplicationCommandManager,
- ApplicationCommandPermissionData,
- ApplicationCommandPermissions,
- BaseManager,
- Collection,
- GuildApplicationCommandManager,
- GuildApplicationCommandPermissionData,
- Snowflake
+ BaseManager, type ApplicationCommand,
+ type ApplicationCommandManager,
+ type ApplicationCommandPermissionData,
+ type ApplicationCommandPermissions,
+ type Collection,
+ type GuildApplicationCommandManager,
+ type GuildApplicationCommandPermissionData,
+ type Snowflake
} from 'discord.js';
-import { ApplicationCommandPermissionTypes } from 'discord.js/typings/enums';
-import { BushClient, BushRoleResolvable, BushUserResolvable } from '../discord-akairo/BushClient';
+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 3e00d96..b3704b6 100644
--- a/src/lib/extensions/discord.js/BushBaseGuildEmojiManager.d.ts
+++ b/src/lib/extensions/discord.js/BushBaseGuildEmojiManager.d.ts
@@ -1,8 +1,6 @@
-import { Snowflake } from 'discord-api-types';
-import { CachedManager } from 'discord.js';
-import { RawGuildEmojiData } from 'discord.js/typings/rawDataTypes';
-import { BushClient, BushEmojiIdentifierResolvable, BushEmojiResolvable } from '../discord-akairo/BushClient';
-import { BushGuildEmoji } from './BushGuildEmoji';
+import { type BushClient, type BushEmojiIdentifierResolvable, type BushEmojiResolvable, type BushGuildEmoji } from '@lib';
+import { CachedManager, type Snowflake } from 'discord.js';
+import { type RawGuildEmojiData } from 'disc