don't judge part 1

79 files changed, 384 insertions, 150 deletions

diff --git a/src/arguments/duration.ts b/src/arguments/duration.ts
index 7b7a922..6007b4e 100644
--- a/src/arguments/duration.ts
+++ b/src/arguments/duration.ts
@@ -1,5 +1,5 @@
-import { BushArgumentTypeCaster } from '../lib/extensions/BushArgumentTypeCaster';
-import { BushMessage } from '../lib/extensions/BushMessage';
+import { BushArgumentTypeCaster } from '../lib/extensions/discord-akairo/BushArgumentTypeCaster';
+import { BushMessage } from '../lib/extensions/discord.js/BushMessage';
 import { BushConstants } from '../lib/utils/BushConstants';
 
 export const durationTypeCaster: BushArgumentTypeCaster = async (_message: BushMessage, phrase): Promise<number> => {
diff --git a/src/bot.ts b/src/bot.ts
index ee7ce92..5e2d10c 100644
--- a/src/bot.ts
+++ b/src/bot.ts
@@ -1,5 +1,5 @@
-import { BushClient } from './lib/extensions/BushClient';
 import * as config from './config/options';
+import { BushClient } from './lib/extensions/discord-akairo/BushClient';
 
 const client: BushClient = new BushClient(config);
 client.start();
diff --git a/src/commands/config/muteRole.ts b/src/commands/config/muteRole.ts
index 2dc34c3..2b2f938 100644
--- a/src/commands/config/muteRole.ts
+++ b/src/commands/config/muteRole.ts
@@ -1,7 +1,7 @@
 import { Role } from 'discord.js';
-import { BushCommand } from '../../lib/extensions/BushCommand';
-import { BushMessage } from '../../lib/extensions/BushMessage';
-import { BushSlashMessage } from '../../lib/extensions/BushSlashMessage';
+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';
 
 export default class MuteRoleCommand extends BushCommand {
diff --git a/src/commands/config/prefix.ts b/src/commands/config/prefix.ts
index b788d17..1551205 100644
--- a/src/commands/config/prefix.ts
+++ b/src/commands/config/prefix.ts
@@ -1,6 +1,6 @@
-import { BushCommand } from '../../lib/extensions/BushCommand';
-import { BushMessage } from '../../lib/extensions/BushMessage';
-import { BushSlashMessage } from '../../lib/extensions/BushSlashMessage';
+import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
+import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage';
+import { BushMessage } from '../../lib/extensions/discord.js/BushMessage';
 
 export default class PrefixCommand extends BushCommand {
 	constructor() {
diff --git a/src/commands/config/welcomeChannel.ts b/src/commands/config/welcomeChannel.ts
index d531c7d..2d66a25 100644
--- a/src/commands/config/welcomeChannel.ts
+++ b/src/commands/config/welcomeChannel.ts
@@ -1,7 +1,7 @@
 import { Channel } from 'discord.js';
-import { BushCommand } from '../../lib/extensions/BushCommand';
-import { BushMessage } from '../../lib/extensions/BushMessage';
-import { BushSlashMessage } from '../../lib/extensions/BushSlashMessage';
+import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
+import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage';
+import { BushMessage } from '../../lib/extensions/discord.js/BushMessage';
 
 export default class WelcomeChannelCommand extends BushCommand {
 	public constructor() {
diff --git a/src/commands/dev/eval.ts b/src/commands/dev/eval.ts
index a1c2d87..fc6e7e8 100644
--- a/src/commands/dev/eval.ts
+++ b/src/commands/dev/eval.ts
@@ -4,9 +4,9 @@ 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/BushCommand';
-import { BushMessage } from '../../lib/extensions/BushMessage';
-import { BushSlashMessage } from '../../lib/extensions/BushSlashMessage';
+import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
+import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage';
+import { BushMessage } from '../../lib/extensions/discord.js/BushMessage';
 
 const clean = (text) => {
 	if (typeof text === 'string') {
@@ -135,8 +135,8 @@ export default class EvalCommand extends BushCommand {
 			show_proto: boolean;
 		}
 	): Promise<unknown> {
-		// if (!message.author.isOwner())
-		// 	return await message.util.reply(`${this.client.util.emojis.error} Only my developers can run this command.`);
+		if (!message.author.isOwner())
+			return await message.util.reply(`${this.client.util.emojis.error} Only my developers can run this command.`);
 		if (message.util.isSlash) {
 			await (message as BushSlashMessage).interaction.defer({ ephemeral: args.silent });
 		}
diff --git a/src/commands/dev/reload.ts b/src/commands/dev/reload.ts
index 656bb34..82dde4c 100644
--- a/src/commands/dev/reload.ts
+++ b/src/commands/dev/reload.ts
@@ -1,6 +1,6 @@
-import { BushCommand } from '../../lib/extensions/BushCommand';
-import { BushMessage } from '../../lib/extensions/BushMessage';
-import { BushSlashMessage } from '../../lib/extensions/BushSlashMessage';
+import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
+import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage';
+import { BushMessage } from '../../lib/extensions/discord.js/BushMessage';
 
 export default class ReloadCommand extends BushCommand {
 	constructor() {
diff --git a/src/commands/dev/setLevel.ts b/src/commands/dev/setLevel.ts
index 6c8131a..9903013 100644
--- a/src/commands/dev/setLevel.ts
+++ b/src/commands/dev/setLevel.ts
@@ -1,7 +1,7 @@
 import { User } from 'discord.js';
-import { BushCommand } from '../../lib/extensions/BushCommand';
-import { BushMessage } from '../../lib/extensions/BushMessage';
-import { BushSlashMessage } from '../../lib/extensions/BushSlashMessage';
+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';
 
diff --git a/src/commands/dev/superUser.ts b/src/commands/dev/superUser.ts
index 773209c..8bbc391 100644
--- a/src/commands/dev/superUser.ts
+++ b/src/commands/dev/superUser.ts
@@ -1,7 +1,7 @@
 import { Constants } from 'discord-akairo';
 import { User } from 'discord.js';
-import { BushCommand } from '../../lib/extensions/BushCommand';
-import { BushMessage } from '../../lib/extensions/BushMessage';
+import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
+import { BushMessage } from '../../lib/extensions/discord.js/BushMessage';
 import { Global } from '../../lib/models';
 
 export default class SuperUserCommand extends BushCommand {
diff --git a/src/commands/info/botInfo.ts b/src/commands/info/botInfo.ts
index 3db4151..b77a271 100644
--- a/src/commands/info/botInfo.ts
+++ b/src/commands/info/botInfo.ts
@@ -1,6 +1,6 @@
 import { Message, MessageEmbed } from 'discord.js';
 import { duration } from 'moment';
-import { BushCommand } from '../../lib/extensions/BushCommand';
+import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
 
 export default class BotInfoCommand extends BushCommand {
 	constructor() {
diff --git a/src/commands/info/help.ts b/src/commands/info/help.ts
index b58d73c..6e14d96 100644
--- a/src/commands/info/help.ts
+++ b/src/commands/info/help.ts
@@ -1,7 +1,7 @@
 import { MessageActionRow, MessageButton, MessageEmbed } from 'discord.js';
-import { BushCommand } from '../../lib/extensions/BushCommand';
-import { BushMessage } from '../../lib/extensions/BushMessage';
-import { BushSlashMessage } from '../../lib/extensions/BushSlashMessage';
+import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
+import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage';
+import { BushMessage } from '../../lib/extensions/discord.js/BushMessage';
 
 export default class HelpCommand extends BushCommand {
 	constructor() {
diff --git a/src/commands/info/ping.ts b/src/commands/info/ping.ts
index 6584ab5..45cfd22 100644
--- a/src/commands/info/ping.ts
+++ b/src/commands/info/ping.ts
@@ -1,6 +1,6 @@
 import { Message, MessageEmbed } from 'discord.js';
-import { BushCommand } from '../../lib/extensions/BushCommand';
-import { BushSlashMessage } from '../../lib/extensions/BushSlashMessage';
+import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
+import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage';
 
 export default class PingCommand extends BushCommand {
 	constructor() {
diff --git a/src/commands/info/pronouns.ts b/src/commands/info/pronouns.ts
index 60d0c1a..538ec64 100644
--- a/src/commands/info/pronouns.ts
+++ b/src/commands/info/pronouns.ts
@@ -1,7 +1,7 @@
 import { Message, MessageEmbed, User } from 'discord.js';
 import got, { HTTPError } from 'got';
-import { BushCommand } from '../../lib/extensions/BushCommand';
-import { BushSlashMessage } from '../../lib/extensions/BushSlashMessage';
+import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
+import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage';
 
 export const pronounMapping = {
 	unspecified: 'Unspecified',
diff --git a/src/commands/moderation/ban.ts b/src/commands/moderation/ban.ts
index 7ce222a..9df1c2a 100644
--- a/src/commands/moderation/ban.ts
+++ b/src/commands/moderation/ban.ts
@@ -1,7 +1,7 @@
 import { Argument } from 'discord-akairo';
 import { CommandInteraction, Message, User } from 'discord.js';
 import moment from 'moment';
-import { BushCommand } from '../../lib/extensions/BushCommand';
+import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
 import { Ban, Guild, ModLog, ModLogType } from '../../lib/models';
 
 /* const durationAliases: Record<string, string[]> = {
diff --git a/src/commands/moderation/kick.ts b/src/commands/moderation/kick.ts
index 748753f..a666c8e 100644
--- a/src/commands/moderation/kick.ts
+++ b/src/commands/moderation/kick.ts
@@ -1,6 +1,6 @@
 import { CommandInteraction, GuildMember, Message } from 'discord.js';
-import { BushCommand } from '../../lib/extensions/BushCommand';
-import { BushSlashMessage } from '../../lib/extensions/BushSlashMessage';
+import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
+import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage';
 import { Guild, ModLog, ModLogType } from '../../lib/models';
 
 export default class KickCommand extends BushCommand {
diff --git a/src/commands/moderation/modlog.ts b/src/commands/moderation/modlog.ts
index e32df42..27018f1 100644
--- a/src/commands/moderation/modlog.ts
+++ b/src/commands/moderation/modlog.ts
@@ -2,7 +2,7 @@ import { stripIndent } from 'common-tags';
 import { Argument } from 'discord-akairo';
 import { Message, MessageEmbed } from 'discord.js';
 import moment from 'moment';
-import { BushCommand } from '../../lib/extensions/BushCommand';
+import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
 import { ModLog } from '../../lib/models';
 
 export default class ModlogCommand extends BushCommand {
diff --git a/src/commands/moderation/mute.ts b/src/commands/moderation/mute.ts
index 9b6ad70..88fcc69 100644
--- a/src/commands/moderation/mute.ts
+++ b/src/commands/moderation/mute.ts
@@ -1,7 +1,7 @@
 import { Argument } from 'discord-akairo';
 import { CommandInteraction, Message, User } from 'discord.js';
 import moment from 'moment';
-import { BushCommand } from '../../lib/extensions/BushCommand';
+import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
 import { Guild, ModLog, ModLogType, Mute } from '../../lib/models';
 
 export default class MuteCommand extends BushCommand {
diff --git a/src/commands/moderation/role.ts b/src/commands/moderation/role.ts
index f0918f0..d1f8e00 100644
--- a/src/commands/moderation/role.ts
+++ b/src/commands/moderation/role.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
 import { GuildMember, Message, Role } from 'discord.js';
-import { BushCommand } from '../../lib/extensions/BushCommand';
+import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
 import AllowedMentions from '../../lib/utils/AllowedMentions';
 
 export default class RoleCommand extends BushCommand {
diff --git a/src/commands/moderation/warn.ts b/src/commands/moderation/warn.ts
index d48049b..c146db0 100644
--- a/src/commands/moderation/warn.ts
+++ b/src/commands/moderation/warn.ts
@@ -1,5 +1,5 @@
 import { GuildMember, Message } from 'discord.js';
-import { BushCommand } from '../../lib/extensions/BushCommand';
+import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand';
 import { Guild, ModLog, ModLogType } from '../../lib/models';
 
 export default class WarnCommand extends BushCommand {
diff --git a/src/commands/moulberry-bush/capePerms.ts b/src/commands/moulberry-bush/capePerms.ts
inde