fix: circular imports

22 files changed, 24 insertions, 24 deletions

diff --git a/src/commands/config/muteRole.ts b/src/commands/config/muteRole.ts
index 6fa84df..6fda0b8 100644
--- a/src/commands/config/muteRole.ts
+++ b/src/commands/config/muteRole.ts
@@ -1,5 +1,5 @@
+import { AllowedMentions, BushCommand, BushMessage, BushSlashMessage } from '@lib';
 import { Role } from 'discord.js';
-import { AllowedMentions, BushCommand, BushMessage, BushSlashMessage } from '../../lib';
 
 export default class MuteRoleCommand extends BushCommand {
 	public constructor() {
diff --git a/src/commands/config/prefix.ts b/src/commands/config/prefix.ts
index 52f6034..9be6ec4 100644
--- a/src/commands/config/prefix.ts
+++ b/src/commands/config/prefix.ts
@@ -1,4 +1,4 @@
-import { BushCommand, BushMessage, BushSlashMessage } from '../../lib';
+import { BushCommand, BushMessage, BushSlashMessage } from '@lib';
 
 export default class PrefixCommand extends BushCommand {
 	public constructor() {
diff --git a/src/commands/config/welcomeChannel.ts b/src/commands/config/welcomeChannel.ts
index 0c07b9a..f15e07d 100644
--- a/src/commands/config/welcomeChannel.ts
+++ b/src/commands/config/welcomeChannel.ts
@@ -1,5 +1,5 @@
+import { BushCommand, BushMessage, BushSlashMessage } from '@lib';
 import { Channel } from 'discord.js';
-import { BushCommand, BushMessage, BushSlashMessage } from '../../lib';
 
 export default class WelcomeChannelCommand extends BushCommand {
 	public constructor() {
diff --git a/src/commands/dev/eval.ts b/src/commands/dev/eval.ts
index 295d042..f3a30ab 100644
--- a/src/commands/dev/eval.ts
+++ b/src/commands/dev/eval.ts
@@ -1,11 +1,11 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 /* eslint-disable @typescript-eslint/no-unused-vars */
+import { BushCommand, BushMessage, BushSlashMessage } from '@lib';
 import { exec } from 'child_process';
 import { Constants } from 'discord-akairo';
 import { CommandInteraction, MessageEmbed, MessageEmbedOptions, Util } from 'discord.js';
 import { transpile } from 'typescript';
 import { inspect, promisify } from 'util';
-import { BushCommand, BushMessage, BushSlashMessage } from '../../lib';
 
 const clean = (text) => {
 	if (typeof text === 'string') {
@@ -181,7 +181,7 @@ export default class EvalCommand extends BushCommand {
 				members = message.guild.members,
 				roles = message.guild.roles,
 				client = this.client,
-				{ Ban, Global, Guild, Level, ModLog, StickyRole } = await import('../../lib'),
+				{ Ban, Global, Guild, Level, ModLog, StickyRole } = await import('@lib'),
 				{
 					ButtonInteraction,
 					Collector,
diff --git a/src/commands/dev/reload.ts b/src/commands/dev/reload.ts
index a66d755..c6a2140 100644
--- a/src/commands/dev/reload.ts
+++ b/src/commands/dev/reload.ts
@@ -1,4 +1,4 @@
-import { BushCommand, BushMessage, BushSlashMessage } from '../../lib';
+import { BushCommand, BushMessage, BushSlashMessage } from '@lib';
 
 export default class ReloadCommand extends BushCommand {
 	public constructor() {
diff --git a/src/commands/dev/setLevel.ts b/src/commands/dev/setLevel.ts
index fb2f41f..9c7daeb 100644
--- a/src/commands/dev/setLevel.ts
+++ b/src/commands/dev/setLevel.ts
@@ -1,5 +1,5 @@
+import { AllowedMentions, BushCommand, BushMessage, BushSlashMessage, Level } from '@lib';
 import { User } from 'discord.js';
-import { AllowedMentions, BushCommand, BushMessage, BushSlashMessage, Level } from '../../lib';
 
 export default class SetLevelCommand extends BushCommand {
 	public constructor() {
diff --git a/src/commands/dev/superUser.ts b/src/commands/dev/superUser.ts
index 4d5ce2d..83623df 100644
--- a/src/commands/dev/superUser.ts
+++ b/src/commands/dev/superUser.ts
@@ -1,6 +1,6 @@
+import { BushCommand, BushMessage, BushSlashMessage, Global } from '@lib';
 import { Constants } from 'discord-akairo';
 import { User } from 'discord.js';
-import { BushCommand, BushMessage, BushSlashMessage, Global } from '../../lib';
 
 export default class SuperUserCommand extends BushCommand {
 	public constructor() {
diff --git a/src/commands/dev/testDuration.ts b/src/commands/dev/testDuration.ts
index 2fc757e..719292e 100644
--- a/src/commands/dev/testDuration.ts
+++ b/src/commands/dev/testDuration.ts
@@ -1,6 +1,6 @@
+import { BushCommand, BushSlashMessage } from '@lib';
 import { stripIndents } from 'common-tags';
 import { Message } from 'discord.js';
-import { BushCommand, BushSlashMessage } from '../../lib';
 
 export default class TestDurationCommand extends BushCommand {
 	public constructor() {
diff --git a/src/commands/info/botInfo.ts b/src/commands/info/botInfo.ts
index 80ca29d..d9961af 100644
--- a/src/commands/info/botInfo.ts
+++ b/src/commands/info/botInfo.ts
@@ -1,5 +1,5 @@
+import { BushCommand, BushMessage, BushSlashMessage } from '@lib';
 import { MessageEmbed } from 'discord.js';
-import { BushCommand, BushMessage, BushSlashMessage } from '../../lib';
 
 export default class BotInfoCommand extends BushCommand {
 	public constructor() {
diff --git a/src/commands/info/help.ts b/src/commands/info/help.ts
index a561d69..439f0ef 100644
--- a/src/commands/info/help.ts
+++ b/src/commands/info/help.ts
@@ -1,5 +1,5 @@
+import { BushCommand, BushMessage, BushSlashMessage } from '@lib';
 import { MessageActionRow, MessageButton, MessageEmbed } from 'discord.js';
-import { BushCommand, BushMessage, BushSlashMessage } from '../../lib';
 
 export default class HelpCommand extends BushCommand {
 	public constructor() {
diff --git a/src/commands/info/ping.ts b/src/commands/info/ping.ts
index 804ede2..4638aa9 100644
--- a/src/commands/info/ping.ts
+++ b/src/commands/info/ping.ts
@@ -1,5 +1,5 @@
+import { BushCommand, BushMessage, BushSlashMessage } from '@lib';
 import { Message, MessageEmbed } from 'discord.js';
-import { BushCommand, BushMessage, BushSlashMessage } from '../../lib';
 
 export default class PingCommand extends BushCommand {
 	public constructor() {
diff --git a/src/commands/info/pronouns.ts b/src/commands/info/pronouns.ts
index 241dce3..60701d1 100644
--- a/src/commands/info/pronouns.ts
+++ b/src/commands/info/pronouns.ts
@@ -1,6 +1,6 @@
+import { BushCommand, BushSlashMessage } from '@lib';
 import { Message, MessageEmbed, User } from 'discord.js';
 import got, { HTTPError } from 'got';
-import { BushCommand, BushSlashMessage } from '../../lib';
 
 export const pronounMapping = {
 	unspecified: 'Unspecified',
diff --git a/src/commands/moderation/ban.ts b/src/commands/moderation/ban.ts
index 244014b..be7a51f 100644
--- a/src/commands/moderation/ban.ts
+++ b/src/commands/moderation/ban.ts
@@ -1,5 +1,5 @@
+import { BushCommand, BushMessage, BushSlashMessage } from '@lib';
 import { User } from 'discord.js';
-import { BushCommand, BushMessage, BushSlashMessage } from '../../lib';
 
 export default class BanCommand extends BushCommand {
 	public constructor() {
diff --git a/src/commands/moderation/kick.ts b/src/commands/moderation/kick.ts
index 87bf1f7..f960488 100644
--- a/src/commands/moderation/kick.ts
+++ b/src/commands/moderation/kick.ts
@@ -1,4 +1,4 @@
-import { BushCommand, BushGuildMember, BushMessage, BushSlashMessage, BushUser } from '../../lib';
+import { BushCommand, BushGuildMember, BushMessage, BushSlashMessage, 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 36f72fc..c71f962 100644
--- a/src/commands/moderation/modlog.ts
+++ b/src/commands/moderation/modlog.ts
@@ -1,7 +1,7 @@
+import { BushCommand, BushMessage, BushSlashMessage, ModLog } from '@lib';
 import { Argument } from 'discord-akairo';
 import { MessageEmbed } from 'discord.js';
 import moment from 'moment';
-import { BushCommand, BushMessage, BushSlashMessage, ModLog } from '../../lib';
 
 export default class ModlogCommand extends BushCommand {
 	public constructor() {
diff --git a/src/commands/moderation/mute.ts b/src/commands/moderation/mute.ts
index bc3abf2..26ccb21 100644
--- a/src/commands/moderation/mute.ts
+++ b/src/commands/moderation/mute.ts
@@ -1,5 +1,5 @@
+import { BushCommand, BushGuildMember, BushMessage, BushSlashMessage, BushUser } from '@lib';
 import { Argument } from 'discord-akairo';
-import { BushCommand, BushGuildMember, BushMessage, BushSlashMessage, BushUser } from '../../lib';
 
 export default class MuteCommand extends BushCommand {
 	public constructor() {
diff --git a/src/commands/moderation/role.ts b/src/commands/moderation/role.ts
index 6bac9e8..33f474e 100644
--- a/src/commands/moderation/role.ts
+++ b/src/commands/moderation/role.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
-import { AllowedMentions, BushCommand, BushGuildMember, BushMessage, BushRole, BushSlashMessage } from '../../lib';
+import { AllowedMentions, BushCommand, BushGuildMember, BushMessage, BushRole, BushSlashMessage } from '@lib';
 
 export default class RoleCommand extends BushCommand {
 	public constructor() {
diff --git a/src/commands/moderation/warn.ts b/src/commands/moderation/warn.ts
index d1c17d4..5d679ab 100644
--- a/src/commands/moderation/warn.ts
+++ b/src/commands/moderation/warn.ts
@@ -1,4 +1,4 @@
-import { BushCommand, BushGuildMember, BushMessage, BushSlashMessage, BushUser } from '../../lib';
+import { BushCommand, BushGuildMember, BushMessage, BushSlashMessage, 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 a564fc3..b19d3bc 100644
--- a/src/commands/moulberry-bush/capePerms.ts
+++ b/src/commands/moulberry-bush/capePerms.ts
@@ -1,7 +1,7 @@
+import { BushCommand, BushMessage, BushSlashMessage } from '@lib';
 import { Constants } from 'discord-akairo';
 import { MessageEmbed } from 'discord.js';
 import got from 'got';
-import { BushCommand, BushMessage, BushSlashMessage } from '../../lib';
 
 export default class CapePermissionsCommand extends BushCommand {
 	private nameMap = {
diff --git a/src/commands/moulberry-bush/giveawayPing.ts b/src/commands/moulberry-bush/giveawayPing.ts
index 80555b1..93373b0 100644
--- a/src/commands/moulberry-bush/giveawayPing.ts
+++ b/src/commands/moulberry-bush/giveawayPing.ts
@@ -1,4 +1,4 @@
-import { AllowedMentions, BushCommand, BushMessage } from '../../lib';
+import { AllowedMentions, BushCommand, BushMessage } from '@lib';
 
 export default class GiveawayPingCommand extends BushCommand {
 	public constructor() {
diff --git a/src/commands/moulberry-bush/level.ts b/src/commands/moulberry-bush/level.ts
index 5dcafe5..7f3509f 100644
--- a/src/commands/moulberry-bush/level.ts
+++ b/src/commands/moulberry-bush/level.ts
@@ -1,10 +1,10 @@
-import { BushCommand, BushMessage, BushSlashMessage, BushUser, Level } from '../../lib';
+import { BushCommand, BushMessage, BushSlashMessage, BushUser, Level } from '@lib';
 /*
 import canvas from 'canvas';
 import { MessageAttachment } from 'discord.js';
 import { join } from 'path';
 import got from 'got/dist/source';
-import { CanvasProgressBar } from '../../lib';
+import { CanvasProgressBar } from '@lib';
 */
 
 export default class LevelCommand extends BushCommand {
diff --git a/src/commands/moulberry-bush/rule.ts b/src/commands/moulberry-bush/rule.ts
index f2e0911..a2b8c78 100644
--- a/src/commands/moulberry-bush/rule.ts
+++ b/src/commands/moulberry-bush/rule.ts
@@ -1,6 +1,6 @@
+import { AllowedMentions, BushCommand, BushMessage, BushSlashMessage } from '@lib';
 import { Argument, Constants } from 'discord-akairo';
 import { MessageEmbed, User } from 'discord.js';
-import { AllowedMentions, BushCommand, BushMessage, BushSlashMessage } from '../../lib';
 
 const rules = [
 	{