cleaned up lib imports

22 files changed, 26 insertions, 63 deletions

diff --git a/src/commands/config/muteRole.ts b/src/commands/config/muteRole.ts
index 3c662ea..6fa84df 100644
--- a/src/commands/config/muteRole.ts
+++ b/src/commands/config/muteRole.ts
@@ -1,8 +1,5 @@
 import { Role } from 'discord.js';
-import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
-import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage';
-import { BushMessage } from '../../lib/extensions/discord.js/BushMessage';
-import AllowedMentions from '../../lib/utils/AllowedMentions';
+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 eaf4fcc..52f6034 100644
--- a/src/commands/config/prefix.ts
+++ b/src/commands/config/prefix.ts
@@ -1,6 +1,4 @@
-import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
-import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage';
-import { BushMessage } from '../../lib/extensions/discord.js/BushMessage';
+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 2d66a25..0c07b9a 100644
--- a/src/commands/config/welcomeChannel.ts
+++ b/src/commands/config/welcomeChannel.ts
@@ -1,7 +1,5 @@
 import { Channel } from 'discord.js';
-import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
-import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage';
-import { BushMessage } from '../../lib/extensions/discord.js/BushMessage';
+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 82b0e5e..295d042 100644
--- a/src/commands/dev/eval.ts
+++ b/src/commands/dev/eval.ts
@@ -5,9 +5,7 @@ import { Constants } from 'discord-akairo';
 import { CommandInteraction, MessageEmbed, MessageEmbedOptions, Util } from 'discord.js';
 import { transpile } from 'typescript';
 import { inspect, promisify } from 'util';
-import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
-import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage';
-import { BushMessage } from '../../lib/extensions/discord.js/BushMessage';
+import { BushCommand, BushMessage, BushSlashMessage } from '../../lib';
 
 const clean = (text) => {
 	if (typeof text === 'string') {
@@ -183,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/models/index.js'),
+				{ 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 fdb669f..a66d755 100644
--- a/src/commands/dev/reload.ts
+++ b/src/commands/dev/reload.ts
@@ -1,6 +1,4 @@
-import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
-import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage';
-import { BushMessage } from '../../lib/extensions/discord.js/BushMessage';
+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 871a9de..fb2f41f 100644
--- a/src/commands/dev/setLevel.ts
+++ b/src/commands/dev/setLevel.ts
@@ -1,9 +1,5 @@
 import { User } from 'discord.js';
-import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
-import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage';
-import { BushMessage } from '../../lib/extensions/discord.js/BushMessage';
-import { Level } from '../../lib/models';
-import AllowedMentions from '../../lib/utils/AllowedMentions';
+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 8bbc391..981c0da 100644
--- a/src/commands/dev/superUser.ts
+++ b/src/commands/dev/superUser.ts
@@ -1,8 +1,6 @@
 import { Constants } from 'discord-akairo';
 import { User } from 'discord.js';
-import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
-import { BushMessage } from '../../lib/extensions/discord.js/BushMessage';
-import { Global } from '../../lib/models';
+import { BushCommand, BushMessage, 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 bf30840..2fc757e 100644
--- a/src/commands/dev/testDuration.ts
+++ b/src/commands/dev/testDuration.ts
@@ -1,7 +1,6 @@
 import { stripIndents } from 'common-tags';
 import { Message } from 'discord.js';
-import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
-import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage';
+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 6cdae17..4a94318 100644
--- a/src/commands/info/botInfo.ts
+++ b/src/commands/info/botInfo.ts
@@ -1,6 +1,5 @@
 import { Message, MessageEmbed } from 'discord.js';
-import { duration } from 'moment';
-import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
+import { BushCommand } from '../../lib';
 
 export default class BotInfoCommand extends BushCommand {
 	public constructor() {
@@ -32,11 +31,11 @@ export default class BotInfoCommand extends BushCommand {
 				},
 				{
 					name: 'Uptime',
-					value: this.client.util.capitalize(duration(this.client.uptime, 'milliseconds').humanize())
+					value: this.client.util.capitalize(this.client.util.humanizeDuration(this.client.uptime))
 				},
 				{
 					name: 'User count',
-					value: this.client.users.cache.size.toString(),
+					value: this.client.users.cache.size.toLocaleString(),
 					inline: true
 				},
 				{
diff --git a/src/commands/info/help.ts b/src/commands/info/help.ts
index 598f01a..a561d69 100644
--- a/src/commands/info/help.ts
+++ b/src/commands/info/help.ts
@@ -1,7 +1,5 @@
 import { MessageActionRow, MessageButton, MessageEmbed } from 'discord.js';
-import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
-import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage';
-import { BushMessage } from '../../lib/extensions/discord.js/BushMessage';
+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 75f4700..c1be3fb 100644
--- a/src/commands/info/ping.ts
+++ b/src/commands/info/ping.ts
@@ -1,6 +1,5 @@
 import { Message, MessageEmbed } from 'discord.js';
-import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
-import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage';
+import { BushCommand, 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 1f7ac15..241dce3 100644
--- a/src/commands/info/pronouns.ts
+++ b/src/commands/info/pronouns.ts
@@ -1,7 +1,6 @@
 import { Message, MessageEmbed, User } from 'discord.js';
 import got, { HTTPError } from 'got';
-import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
-import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage';
+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 f3cc1e2..0c68497 100644
--- a/src/commands/moderation/ban.ts
+++ b/src/commands/moderation/ban.ts
@@ -1,5 +1,5 @@
 import { Message, User } from 'discord.js';
-import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
+import { BushCommand } 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 f8bb5a1..8375198 100644
--- a/src/commands/moderation/kick.ts
+++ b/src/commands/moderation/kick.ts
@@ -1,5 +1,5 @@
 import { GuildMember, Message } from 'discord.js';
-import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
+import { BushCommand } 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 2f7601b..5be50a4 100644
--- a/src/commands/moderation/modlog.ts
+++ b/src/commands/moderation/modlog.ts
@@ -1,9 +1,7 @@
 import { Argument } from 'discord-akairo';
 import { MessageEmbed } from 'discord.js';
 import moment from 'moment';
-import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
-import { BushMessage } from '../../lib/extensions/discord.js/BushMessage';
-import { ModLog } from '../../lib/models';
+import { BushCommand, BushMessage, 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 5e5cdba..33c0e32 100644
--- a/src/commands/moderation/mute.ts
+++ b/src/commands/moderation/mute.ts
@@ -1,8 +1,5 @@
 import { Argument } from 'discord-akairo';
-import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
-import { BushGuildMember } from '../../lib/extensions/discord.js/BushGuildMember';
-import { BushMessage } from '../../lib/extensions/discord.js/BushMessage';
-import { BushUser } from '../../lib/extensions/discord.js/BushUser';
+import { BushCommand, BushGuildMember, BushMessage, 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 71bb88e..83e85e0 100644
--- a/src/commands/moderation/role.ts
+++ b/src/commands/moderation/role.ts
@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
 import { GuildMember, Message, Role } from 'discord.js';
-import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
-import AllowedMentions from '../../lib/utils/AllowedMentions';
+import { AllowedMentions, BushCommand } from '../../lib';
 
 export default class RoleCommand extends BushCommand {
 	private roleWhitelist: Record<string, string[]> = {
diff --git a/src/commands/moderation/warn.ts b/src/commands/moderation/warn.ts
index 9df5891..f2b9142 100644
--- a/src/commands/moderation/warn.ts
+++ b/src/commands/moderation/warn.ts
@@ -1,6 +1,5 @@
 import { GuildMember, Message } from 'discord.js';
-import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
-import { Guild, ModLog, ModLogType } from '../../lib/models';
+import { BushCommand, Guild, ModLog, ModLogType } 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 b6508d0..539ddf6 100644
--- a/src/commands/moulberry-bush/capePerms.ts
+++ b/src/commands/moulberry-bush/capePerms.ts
@@ -1,8 +1,7 @@
 import { Constants } from 'discord-akairo';
 import { MessageEmbed } from 'discord.js';
 import got from 'got';
-import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
-import { BushMessage } from '../../lib/extensions/discord.js/BushMessage';
+import { BushCommand, BushMessage } 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 dbbbfef..80555b1 100644
--- a/src/commands/moulberry-bush/giveawayPing.ts
+++ b/src/commands/moulberry-bush/giveawayPing.ts
@@ -1,6 +1,4 @@
-import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
-import { BushMessage } from '../../lib/extensions/discord.js/BushMessage';
-import AllowedMentions from '../../lib/utils/AllowedMentions';
+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 eabf7a0..90a4b7f 100644
--- a/src/commands/moulberry-bush/level.ts
+++ b/src/commands/moulberry-bush/level.ts
@@ -1,13 +1,11 @@
 import { Message, User } from 'discord.js';
-import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
-import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage';
-import { Level } from '../../lib/models';
+import { BushCommand, BushSlashMessage, 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/extensions/Util';
+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 2bcbb8d..516aadf 100644
--- a/src/commands/moulberry-bush/rule.ts
+++ b/src/commands/moulberry-bush/rule.ts
@@ -1,8 +1,6 @@
 import { Argument, Constants } from 'discord-akairo';
 import { MessageEmbed, User } from 'discord.js';
-import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
-import { BushMessage } from '../../lib/extensions/discord.js/BushMessage';
-import AllowedMentions from '../../lib/utils/AllowedMentions';
+import { AllowedMentions, BushCommand, BushMessage } from '../../lib';
 
 const rules = [
 	{