fix conflicts

9 files changed, 47 insertions, 74 deletions

diff --git a/src/listeners/client/ready.ts b/src/listeners/client/ready.ts
index fc43f3c..d4b2808 100644
--- a/src/listeners/client/ready.ts
+++ b/src/listeners/client/ready.ts
@@ -1,7 +1,7 @@
 import chalk from 'chalk';
-import { BotListener } from '../../lib/extensions/BotListener';
+import { BushListener } from '../../lib/extensions/BushListener';
 
-export default class CommandBlockedListener extends BotListener {
+export default class ReadyListener extends BushListener {
 	public constructor() {
 		super('ready', {
 			emitter: 'client',
@@ -10,9 +10,6 @@ export default class CommandBlockedListener extends BotListener {
 	}
 
 	public async exec(): Promise<void> {
-		await this.client.logger.log(
-			chalk`{green Sucessfully logged in as {cyan ${this.client.user.tag}}.}`,
-			true
-		);
+		await this.client.logger.log(chalk`{green Sucessfully logged in as {cyan ${this.client.user.tag}}.}`, true);
 	}
 }
diff --git a/src/listeners/client/syncslashcommands.ts b/src/listeners/client/syncSlashCommands.ts
index febdd1b..7835136 100644
--- a/src/listeners/client/syncslashcommands.ts
+++ b/src/listeners/client/syncSlashCommands.ts
@@ -1,8 +1,8 @@
-import { BotListener } from '../../lib/extensions/BotListener';
+import { BushListener } from '../../lib/extensions/BushListener';
 
-export default class CreateSlashCommands extends BotListener {
+export default class SyncSlashCommandsListener extends BushListener {
 	constructor() {
-		super('createslashcommands', {
+		super('syncslashcommands', {
 			emitter: 'client',
 			event: 'ready'
 		});
diff --git a/src/listeners/commands/commandblocked.ts b/src/listeners/commands/commandBlocked.ts
index 82e53a9..916f7cd 100644
--- a/src/listeners/commands/commandblocked.ts
+++ b/src/listeners/commands/commandBlocked.ts
@@ -1,8 +1,8 @@
-import { BotListener } from '../../lib/extensions/BotListener';
+import { BushListener } from '../../lib/extensions/BushListener';
 import { Command } from 'discord-akairo';
 import { Message } from 'discord.js';
 
-export default class CommandBlockedListener extends BotListener {
+export default class CommandBlockedListener extends BushListener {
 	public constructor() {
 		super('commandBlocked', {
 			emitter: 'commandHandler',
@@ -10,16 +10,10 @@ export default class CommandBlockedListener extends BotListener {
 		});
 	}
 
-	public async exec(
-		message: Message,
-		command: Command,
-		reason: string
-	): Promise<void> {
+	public async exec(message: Message, command: Command, reason: string): Promise<void> {
 		switch (reason) {
 			case 'owner': {
-				await message.util.send(
-					`You must be an owner to run command \`${message.util.parsed.command}\``
-				);
+				await message.util.send(`You must be an owner to run command \`${message.util.parsed.command}\``);
 				break;
 			}
 			case 'blacklist': {
diff --git a/src/listeners/commands/error.ts b/src/listeners/commands/commandError.ts
index 37179e7..0e52140 100644
--- a/src/listeners/commands/error.ts
+++ b/src/listeners/commands/commandError.ts
@@ -1,22 +1,18 @@
-import { BotCommand } from '../../lib/extensions/BotCommand';
-import { BotListener } from '../../lib/extensions/BotListener';
+import { BushCommand } from '../../lib/extensions/BushCommand';
+import { BushListener } from '../../lib/extensions/BushListener';
 import { stripIndents } from 'common-tags';
 import { Message } from 'discord.js';
 import { MessageEmbed } from 'discord.js';
 import { TextChannel } from 'discord.js';
 
-export default class CommandErrorListener extends BotListener {
+export default class CommandErrorListener extends BushListener {
 	constructor() {
 		super('error', {
 			emitter: 'commandHandler',
 			event: 'error'
 		});
 	}
-	async exec(
-		error: Error,
-		message: Message,
-		command?: BotCommand
-	): Promise<void> {
+	async exec(error: Error, message: Message, command?: BushCommand): Promise<void> {
 		const errorNumber = Math.floor(Math.random() * 6969696969) + 69; // hehe funy numbers
 		const errorDevEmbed = this.client.util
 			.createEmbed(this.client.util.colors.error)
@@ -39,9 +35,7 @@ export default class CommandErrorListener extends BotListener {
 				`
 				);
 		}
-		const channel = (await this.client.channels.fetch(
-			this.client.config.channels.log
-		)) as TextChannel;
+		const channel = (await this.client.channels.fetch(this.client.config.channels.log)) as TextChannel;
 		await channel.send(errorDevEmbed);
 		if (errorUserEmbed) await message.reply(errorUserEmbed);
 	}
diff --git a/src/listeners/commands/commandStarted.ts b/src/listeners/commands/commandStarted.ts
new file mode 100644
index 0000000..1c5b0c7
--- /dev/null
+++ b/src/listeners/commands/commandStarted.ts
@@ -0,0 +1,20 @@
+import chalk from 'chalk';
+import { Message, DMChannel } from 'discord.js';
+import { BushCommand } from '../../lib/extensions/BushCommand';
+import { BushListener } from '../../lib/extensions/BushListener';
+
+export default class CommandStartedListener extends BushListener {
+	constructor() {
+		super('logCommands', {
+			emitter: 'commandHandler',
+			event: 'commandStarted'
+		});
+	}
+	exec(message: Message, command: BushCommand): void {
+		this.client.logger.verbose(
+			chalk`{cyan {green ${message.author.tag}} is running {green ${command.aliases[0]}} in {green ${
+				message.channel instanceof DMChannel ? 'DMs' : `#${message.channel.name} (Server: ${message.guild.name})`
+			}}.}`
+		);
+	}
+}
diff --git a/src/listeners/commands/commandstarted.ts b/src/listeners/commands/commandstarted.ts
deleted file mode 100644
index 15eea9d..0000000
--- a/src/listeners/commands/commandstarted.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import chalk from 'chalk';
-import { Message, DMChannel } from 'discord.js';
-import { BotCommand } from '../../lib/extensions/BotCommand';
-import { BotListener } from '../../lib/extensions/BotListener';
-
-export default class CommandStartedListener extends BotListener {
-	constructor() {
-		super('logCommands', {
-			emitter: 'commandHandler',
-			event: 'commandStarted'
-		});
-	}
-	exec(message: Message, command: BotCommand): void {
-		this.client.logger.verbose(
-			chalk`{cyan {green ${message.author.tag}} is running {green ${
-				command.aliases[0]
-			}} in {green ${
-				message.channel instanceof DMChannel
-					? 'DMs'
-					: `#${message.channel.name} (Server: ${message.guild.name})`
-			}}.}`
-		);
-	}
-}
diff --git a/src/listeners/commands/slashError.ts b/src/listeners/commands/slashCommandError.ts
index 3b174a3..e4c3bb0 100644
--- a/src/listeners/commands/slashError.ts
+++ b/src/listeners/commands/slashCommandError.ts
@@ -1,22 +1,18 @@
-import { BotCommand } from '../../lib/extensions/BotCommand';
-import { BotListener } from '../../lib/extensions/BotListener';
+import { BushCommand } from '../../lib/extensions/BushCommand';
+import { BushListener } from '../../lib/extensions/BushListener';
 import { stripIndents } from 'common-tags';
 import { MessageEmbed } from 'discord.js';
 import { TextChannel } from 'discord.js';
 import { CommandInteraction } from 'discord.js';
 
-export default class CommandErrorListener extends BotListener {
+export default class SlashCommandErrorListener extends BushListener {
 	constructor() {
 		super('slashError', {
 			emitter: 'commandHandler',
 			event: 'slashError'
 		});
 	}
-	async exec(
-		error: Error,
-		message: CommandInteraction,
-		command: BotCommand
-	): Promise<void> {
+	async exec(error: Error, message: CommandInteraction, command: BushCommand): Promise<void> {
 		const errorNumber = Math.floor(Math.random() * 6969696969) + 69; // hehe funy numbers
 		const errorDevEmbed = this.client.util
 			.createEmbed(this.client.util.colors.error)
@@ -39,9 +35,7 @@ export default class CommandErrorListener extends BotListener {
 				`
 				);
 		}
-		const channel = (await this.client.channels.fetch(
-			this.client.config.channels.log
-		)) as TextChannel;
+		const channel = (await this.client.channels.fetch(this.client.config.channels.log)) as TextChannel;
 		await channel.send(errorDevEmbed);
 		if (errorUserEmbed) await message.reply(errorUserEmbed);
 	}
diff --git a/src/listeners/guild/syncunban.ts b/src/listeners/guild/syncUnban.ts
index 14f8820..81a08f8 100644
--- a/src/listeners/guild/syncunban.ts
+++ b/src/listeners/guild/syncUnban.ts
@@ -1,8 +1,8 @@
 import { User, Guild } from 'discord.js';
-import { BotListener } from '../../lib/extensions/BotListener';
+import { BushListener } from '../../lib/extensions/BushListener';
 import { Ban } from '../../lib/models';
 
-export default class CommandBlockedListener extends BotListener {
+export default class SyncUnbanListener extends BushListener {
 	public constructor() {
 		super('guildBanRemove', {
 			emitter: 'client',
diff --git a/src/listeners/message/levels.ts b/src/listeners/message/level.ts
index 9a5fbe8..1e93055 100644
--- a/src/listeners/message/levels.ts
+++ b/src/listeners/message/level.ts
@@ -1,9 +1,9 @@
 import chalk from 'chalk';
 import { Message } from 'discord.js';
-import { BotListener } from '../../lib/extensions/BotListener';
+import { BushListener } from '../../lib/extensions/BushListener';
 import { Level } from '../../lib/models';
 
-export default class LevelListener extends BotListener {
+export default class LevelListener extends BushListener {
 	private levelCooldowns: Set<string> = new Set();
 	private blacklistedChannels = ['702456294874808330'];
 	constructor() {
@@ -16,9 +16,9 @@ export default class LevelListener extends BotListener {
 		if (message.author.bot) return;
 		if (message.util?.parsed?.command) return;
 		if (this.levelCooldowns.has(message.author.id)) return;
-		if (!this.client.config.dev && message.guild.id != '516977525906341928')
-			return;
+		if (!this.client.config.dev && message.guild.id != '516977525906341928') return;
 		if (this.blacklistedChannels.includes(message.channel.id)) return;
+		if (!['DEFAULT', 'REPLY'].includes(message.type)) return; //checks for join messages, slash commands, booster messages etc
 		const [user] = await Level.findOrBuild({
 			where: {
 				id: message.author.id
@@ -30,9 +30,7 @@ export default class LevelListener extends BotListener {
 		const xpToGive = Level.genRandomizedXp();
 		user.xp += xpToGive;
 		await user.save();
-		await this.client.logger.verbose(
-			chalk`{cyan Gave XP to {green ${message.author.tag}}: {green ${xpToGive}xp}.}`
-		);
+		await this.client.logger.verbose(chalk`{cyan Gave XP to {green ${message.author.tag}}: {green ${xpToGive}xp}.}`);
 		this.levelCooldowns.add(message.author.id);
 		setTimeout(() => this.levelCooldowns.delete(message.author.id), 60_000);
 	}