fix conflicts

9 files changed, 43 insertions, 77 deletions

diff --git a/src/lib/extensions/BotInhibitor.ts b/src/lib/extensions/BotInhibitor.ts
deleted file mode 100644
index 960aade..0000000
--- a/src/lib/extensions/BotInhibitor.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { Inhibitor } from 'discord-akairo';
-import { BotClient } from './BotClient';
-
-export class BotInhibitor extends Inhibitor {
-	public client: BotClient;
-}
diff --git a/src/lib/extensions/BotListener.ts b/src/lib/extensions/BotListener.ts
deleted file mode 100644
index 9ec17b2..0000000
--- a/src/lib/extensions/BotListener.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { Listener } from 'discord-akairo';
-import { BotClient } from './BotClient';
-
-export class BotListener extends Listener {
-	public client: BotClient;
-}
diff --git a/src/lib/extensions/BotTask.ts b/src/lib/extensions/BotTask.ts
deleted file mode 100644
index 4d5cdcd..0000000
--- a/src/lib/extensions/BotTask.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { Task } from 'discord-akairo';
-import { BotClient } from './BotClient';
-
-export class BotTask extends Task {
-	public client: BotClient;
-}
diff --git a/src/lib/extensions/BotClient.ts b/src/lib/extensions/BushClient.ts
index 13c8a76..8a0fc8c 100644
--- a/src/lib/extensions/BotClient.ts
+++ b/src/lib/extensions/BushClient.ts
@@ -1,10 +1,4 @@
-import {
-	AkairoClient,
-	CommandHandler,
-	InhibitorHandler,
-	ListenerHandler,
-	TaskHandler
-} from 'discord-akairo';
+import { AkairoClient, CommandHandler, InhibitorHandler, ListenerHandler, TaskHandler } from 'discord-akairo';
 import { Guild } from 'discord.js';
 import * as path from 'path';
 import { Sequelize } from 'sequelize';
@@ -18,7 +12,7 @@ import chalk from 'chalk';
 
 export type BotConfig = typeof config;
 
-export class BotClient extends AkairoClient {
+export class BushClient extends AkairoClient {
 	public config: BotConfig;
 	public listenerHandler: ListenerHandler;
 	public inhibitorHandler: InhibitorHandler;
@@ -89,17 +83,12 @@ export class BotClient extends AkairoClient {
 		});
 
 		this.util = new Util(this);
-		this.db = new Sequelize(
-			this.config.dev ? 'bushbot-dev' : 'bushbot',
-			this.config.db.username,
-			this.config.db.password,
-			{
-				dialect: 'postgres',
-				host: this.config.db.host,
-				port: this.config.db.port,
-				logging: false
-			}
-		);
+		this.db = new Sequelize(this.config.dev ? 'bushbot-dev' : 'bushbot', this.config.db.username, this.config.db.password, {
+			dialect: 'postgres',
+			host: this.config.db.host,
+			port: this.config.db.port,
+			logging: false
+		});
 		this.logger = new Logger(this);
 	}
 
@@ -122,15 +111,9 @@ export class BotClient extends AkairoClient {
 		for (const loader of Object.keys(loaders)) {
 			try {
 				loaders[loader].loadAll();
-				this.logger.log(
-					chalk.green('Successfully loaded ' + chalk.cyan(loader) + '.')
-				);
+				this.logger.log(chalk.green('Successfully loaded ' + chalk.cyan(loader) + '.'));
 			} catch (e) {
-				console.error(
-					chalk.red(
-						'Unable to load loader ' + chalk.cyan(loader) + ' with error ' + e
-					)
-				);
+				console.error(chalk.red('Unable to load loader ' + chalk.cyan(loader) + ' with error ' + e));
 			}
 		}
 		this.taskHandler.startAll();
diff --git a/src/lib/extensions/BotCommand.ts b/src/lib/extensions/BushCommand.ts
index c5d31e9..4f9dc6e 100644
--- a/src/lib/extensions/BotCommand.ts
+++ b/src/lib/extensions/BushCommand.ts
@@ -1,8 +1,8 @@
 import { Command, CommandOptions } from 'discord-akairo';
 import { APIApplicationCommandOption } from 'discord-api-types';
-import { BotClient } from './BotClient';
+import { BushClient } from './BushClient';
 
-export interface BotCommandOptions extends CommandOptions {
+export interface BushCommandOptions extends CommandOptions {
 	slashCommandOptions?: APIApplicationCommandOption[];
 	description: {
 		content: string;
@@ -11,9 +11,9 @@ export interface BotCommandOptions extends CommandOptions {
 	};
 }
 
-export class BotCommand extends Command {
-	public client: BotClient;
-	constructor(id: string, options?: BotCommandOptions) {
+export class BushCommand extends Command {
+	public client: BushClient;
+	constructor(id: string, options?: BushCommandOptions) {
 		super(id, options);
 		this.options = options;
 	}
diff --git a/src/lib/extensions/BushInhibitor.ts b/src/lib/extensions/BushInhibitor.ts
new file mode 100644
index 0000000..d9a9b68
--- /dev/null
+++ b/src/lib/extensions/BushInhibitor.ts
@@ -0,0 +1,6 @@
+import { Inhibitor } from 'discord-akairo';
+import { BushClient } from './BushClient';
+
+export class BushInhibitor extends Inhibitor {
+	public client: BushClient;
+}
diff --git a/src/lib/extensions/BushListener.ts b/src/lib/extensions/BushListener.ts
new file mode 100644
index 0000000..6a13210
--- /dev/null
+++ b/src/lib/extensions/BushListener.ts
@@ -0,0 +1,6 @@
+import { Listener } from 'discord-akairo';
+import { BushClient } from './BushClient';
+
+export class BushListener extends Listener {
+	public client: BushClient;
+}
diff --git a/src/lib/extensions/BushTask.ts b/src/lib/extensions/BushTask.ts
new file mode 100644
index 0000000..21655e9
--- /dev/null
+++ b/src/lib/extensions/BushTask.ts
@@ -0,0 +1,6 @@
+import { Task } from 'discord-akairo';
+import { BushClient } from './BushClient';
+
+export class BushTask extends Task {
+	public client: BushClient;
+}
diff --git a/src/lib/extensions/Util.ts b/src/lib/extensions/Util.ts
index 5e9d5e7..3e6882a 100644
--- a/src/lib/extensions/Util.ts
+++ b/src/lib/extensions/Util.ts
@@ -1,16 +1,11 @@
 import { ClientUtil } from 'discord-akairo';
-import { BotClient } from './BotClient';
+import { BushClient } from './BushClient';
 import { promisify } from 'util';
 import { exec } from 'child_process';
 import got from 'got';
 import { MessageEmbed, GuildMember, User } from 'discord.js';
 import { CommandInteractionOption } from 'discord.js';
-import {
-	ApplicationCommandOptionType,
-	APIInteractionDataResolvedGuildMember,
-	APIInteractionDataResolvedChannel,
-	APIRole
-} from 'discord-api-types';
+import { ApplicationCommandOptionType, APIInteractionDataResolvedGuildMember, APIInteractionDataResolvedChannel, APIRole } from 'discord-api-types';
 import { GuildChannel } from 'discord.js';
 import { Role } from 'discord.js';
 import chalk from 'chalk';
@@ -57,9 +52,9 @@ export interface SlashCommandOption<T> {
 export class Util extends ClientUtil {
 	/**
 	 * The client of this ClientUtil
-	 * @type {BotClient}
+	 * @type {BushClient}
 	 */
-	public client: BotClient;
+	public client: BushClient;
 	/**
 	 * The hastebin urls used to post to hastebin, attempts to post in order
 	 * @type {string[]}
@@ -83,7 +78,7 @@ export class Util extends ClientUtil {
 	 * Creates this client util
 	 * @param client The client to initialize with
 	 */
-	constructor(client: BotClient) {
+	constructor(client: BushClient) {
 		super(client);
 	}
 
@@ -125,9 +120,7 @@ export class Util extends ClientUtil {
 	public async haste(content: string): Promise<string> {
 		for (const url of this.hasteURLs) {
 			try {
-				const res: hastebinRes = await got
-					.post(`${url}/documents`, { body: content })
-					.json();
+				const res: hastebinRes = await got.post(`${url}/documents`, { body: content }).json();
 				return `${url}/${res.key}`;
 			} catch (e) {
 				// pass
@@ -220,28 +213,18 @@ export class Util extends ClientUtil {
 	/**
 	 * A simple utility to create and embed with the needed style for the bot
 	 */
-	public createEmbed(
-		color?: string,
-		author?: User | GuildMember
-	): MessageEmbed {
+	public createEmbed(color?: string, author?: User | GuildMember): MessageEmbed {
 		if (author instanceof GuildMember) {
 			author = author.user; // Convert to User if GuildMember
 		}
 		let embed = new MessageEmbed().setTimestamp();
-		if (author)
-			embed = embed.setAuthor(
-				author.username,
-				author.displayAvatarURL({ dynamic: true }),
-				`https://discord.com/users/${author.id}`
-			);
+		if (author) embed = embed.setAuthor(author.username, author.displayAvatarURL({ dynamic: true }), `https://discord.com/users/${author.id}`);
 		if (color) embed = embed.setColor(color);
 		return embed;
 	}
 
 	public async mcUUID(username: string): Promise<string> {
-		const apiRes = (await got
-			.get(`https://api.ashcon.app/mojang/v2/user/${username}`)
-			.json()) as uuidRes;
+		const apiRes = (await got.get(`https://api.ashcon.app/mojang/v2/user/${username}`).json()) as uuidRes;
 		return apiRes.uuid.replace(/-/g, '');
 	}
 
@@ -281,7 +264,7 @@ export class Util extends ClientUtil {
 						name: botCommand.id,
 						description: botCommand.description.content,
 						options: botCommand.options.slashCommandOptions
-					};
+					};botCommand
 
 					if (found?.id && !force) {
 						if (slashdata.description !== found.description) {