26 files changed, 14 insertions, 9 deletions
diff --git a/src/commands/dev/eval.ts b/src/commands/dev/evalCommand.ts
index 83e63f6..83e63f6 100644
--- a/src/commands/dev/eval.ts
+++ b/src/commands/dev/evalCommand.ts
diff --git a/src/commands/dev/reload.ts b/src/commands/dev/reloadCommand.ts
index 64e5745..64e5745 100644
--- a/src/commands/dev/reload.ts
+++ b/src/commands/dev/reloadCommand.ts
diff --git a/src/commands/dev/setlevel.ts b/src/commands/dev/setLevelCommand.ts
index d1701c5..d1701c5 100644
--- a/src/commands/dev/setlevel.ts
+++ b/src/commands/dev/setLevelCommand.ts
diff --git a/src/commands/info/botinfo.ts b/src/commands/info/botInfoCommand.ts
index e6a4fbb..e6a4fbb 100644
--- a/src/commands/info/botinfo.ts
+++ b/src/commands/info/botInfoCommand.ts
diff --git a/src/commands/info/help.ts b/src/commands/info/helpCommand.ts
index 30c2a21..30c2a21 100644
--- a/src/commands/info/help.ts
+++ b/src/commands/info/helpCommand.ts
diff --git a/src/commands/info/ping.ts b/src/commands/info/pingCommand.ts
index 62b8e60..62b8e60 100644
--- a/src/commands/info/ping.ts
+++ b/src/commands/info/pingCommand.ts
diff --git a/src/commands/info/pronouns.ts b/src/commands/info/pronounsCommand.ts
index f30a981..f30a981 100644
--- a/src/commands/info/pronouns.ts
+++ b/src/commands/info/pronounsCommand.ts
diff --git a/src/commands/moderation/ban.ts b/src/commands/moderation/banCommand.ts
index 1c3b074..354fc0d 100644
--- a/src/commands/moderation/ban.ts
+++ b/src/commands/moderation/banCommand.ts
@@ -18,10 +18,11 @@ const durationAliases: Record<string, string[]> = {
 const durationRegex =
 	/(?:(\d+)(d(?:ays?)?|h(?:ours?|rs?)?|m(?:inutes?|ins?)?|mo(?:nths?)?|w(?:eeks?|ks?)?)(?: |$))/g;
 
-export default class PrefixCommand extends BushCommand {
+export default class BanCommand extends BushCommand {
 	constructor() {
 		super('ban', {
 			aliases: ['ban'],
+			category: "moderation",
 			args: [
 				{
 					id: 'user',
diff --git a/src/commands/moderation/kick.ts b/src/commands/moderation/kickCommand.ts
index c21352f..132ca31 100644
--- a/src/commands/moderation/kick.ts
+++ b/src/commands/moderation/kickCommand.ts
@@ -8,6 +8,7 @@ export default class KickCommand extends BushCommand {
 	constructor() {
 		super('kick', {
 			aliases: ['kick'],
+			category: "moderation",
 			args: [
 				{
 					id: 'user',
diff --git a/src/commands/moderation/modlog.ts b/src/commands/moderation/modlogCommand.ts
index b7923ca..3e394ba 100644
--- a/src/commands/moderation/modlog.ts
+++ b/src/commands/moderation/modlogCommand.ts
@@ -10,6 +10,7 @@ export default class ModlogCommand extends BushCommand {
 	constructor() {
 		super('modlog', {
 			aliases: ['modlog', 'modlogs'],
+			category: "moderation",
 			args: [
 				{
 					id: 'search',
diff --git a/src/commands/moderation/role.ts b/src/commands/moderation/roleCommand.ts
index 29339a3..04437ba 100644
--- a/src/commands/moderation/role.ts
+++ b/src/commands/moderation/roleCommand.ts
@@ -42,7 +42,7 @@ export default class RoleCommand extends BushCommand {
 	constructor() {
 		super('role', {
 			aliases: ['role', 'addrole', 'removerole'],
-			category: "Moulberry's Bush",
+			category: "moderation",
 			description: {
 				content: "Manages users' roles.",
 				usage: 'role <add|remove> <user> <role>',
diff --git a/src/commands/moderation/warn.ts b/src/commands/moderation/warnCommand.ts
index e8b1401..ea2d7ee 100644
--- a/src/commands/moderation/warn.ts
+++ b/src/commands/moderation/warnCommand.ts
@@ -6,6 +6,7 @@ export default class WarnCommand extends BushCommand {
 	public constructor() {
 		super('warn', {
 			aliases: ['warn'],
+			category: "moderation",
 			userPermissions: ['MANAGE_MESSAGES'],
 			args: [
 				{
diff --git a/src/commands/moulberry-bush/capeperms.ts b/src/commands/moulberry-bush/capePermissionsCommand.ts
index 9832083..fdb5caf 100644
--- a/src/commands/moulberry-bush/capeperms.ts
+++ b/src/commands/moulberry-bush/capePermissionsCommand.ts
@@ -15,7 +15,7 @@ interface User {
 	perms: string[];
 }
 
-export default class CapePermsCommand extends BushCommand {
+export default class CapePermissionsCommand extends BushCommand {
 	private nameMap = {
 		patreon1: 'Patreon Tier 1',
 		patreon2: 'Patreon Tier 2',
@@ -45,7 +45,7 @@ export default class CapePermsCommand extends BushCommand {
 	};
 	public constructor() {
 		super('capeperms', {
-			aliases: ['capeperms', 'capeperm'],
+			aliases: ['capeperms', 'capeperm', 'capepermissions', 'capepermission'],
 			category: "Moulberry's Bush",
 			description: {
 				content: 'A command to see what capes someone has access to.',
diff --git a/src/commands/moulberry-bush/giveawayping.ts b/src/commands/moulberry-bush/giveawayPingCommand.ts
index e6fdd9a..e6fdd9a 100644
--- a/src/commands/moulberry-bush/giveawayping.ts
+++ b/src/commands/moulberry-bush/giveawayPingCommand.ts
diff --git a/src/commands/moulberry-bush/level.ts b/src/commands/moulberry-bush/levelCommand.ts
index decac8a..decac8a 100644
--- a/src/commands/moulberry-bush/level.ts
+++ b/src/commands/moulberry-bush/levelCommand.ts
diff --git a/src/commands/moulberry-bush/rule.ts b/src/commands/moulberry-bush/ruleCommand.ts
index 69dcb6e..69dcb6e 100644
--- a/src/commands/moulberry-bush/rule.ts
+++ b/src/commands/moulberry-bush/ruleCommand.ts
diff --git a/src/commands/server-config/prefix.ts b/src/commands/server-config/prefixCommand.ts
index ac85922..ac85922 100644
--- a/src/commands/server-config/prefix.ts
+++ b/src/commands/server-config/prefixCommand.ts
diff --git a/src/listeners/client/ready.ts b/src/listeners/client/readyListener.ts
index b13dd36..8d4ac6a 100644
--- a/src/listeners/client/ready.ts
+++ b/src/listeners/client/readyListener.ts
@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import { BushListener } from '../../lib/extensions/BushListener';
 
-export default class CommandBlockedListener extends BushListener {
+export default class ReadyListener extends BushListener {
 	public constructor() {
 		super('ready', {
 			emitter: 'client',
diff --git a/src/listeners/client/syncslashcommands.ts b/src/listeners/client/syncSlashCommandsListener.ts
index d734507..7835136 100644
--- a/src/listeners/client/syncslashcommands.ts
+++ b/src/listeners/client/syncSlashCommandsListener.ts
@@ -1,8 +1,8 @@
 import { BushListener } from '../../lib/extensions/BushListener';
 
-export default class CreateSlashCommands extends BushListener {
+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/commandBlockedListener.ts
index dee1319..dee1319 100644
--- a/src/listeners/commands/commandblocked.ts
+++ b/src/listeners/commands/commandBlockedListener.ts
diff --git a/src/listeners/commands/error.ts b/src/listeners/commands/commandErrorListener.ts
index 518545a..518545a 100644
--- a/src/listeners/commands/error.ts
+++ b/src/listeners/commands/commandErrorListener.ts
diff --git a/src/listeners/commands/commandstarted.ts b/src/listeners/commands/commandStartedListener.ts
index d81ed59..d81ed59 100644
--- a/src/listeners/commands/commandstarted.ts
+++ b/src/listeners/commands/commandStartedListener.ts
diff --git a/src/listeners/commands/slashError.ts b/src/listeners/commands/slashCommandErrorListener.ts
index 3f2260d..a2b7bb7 100644
--- a/src/listeners/commands/slashError.ts
+++ b/src/listeners/commands/slashCommandErrorListener.ts
@@ -5,7 +5,7 @@ import { MessageEmbed } from 'discord.js';
 import { TextChannel } from 'discord.js';
 import { CommandInteraction } from 'discord.js';
 
-export default class CommandErrorListener extends BushListener {
+export default class SlashCommandErrorListener extends BushListener {
 	constructor() {
 		super('slashError', {
 			emitter: 'commandHandler',
diff --git a/src/listeners/guild/syncunban.ts b/src/listeners/guild/syncUnbanListener.ts
index b8a1419..81a08f8 100644
--- a/src/listeners/guild/syncunban.ts
+++ b/src/listeners/guild/syncUnbanListener.ts
@@ -2,7 +2,7 @@ import { User, Guild } from 'discord.js';
 import { BushListener } from '../../lib/extensions/BushListener';
 import { Ban } from '../../lib/models';
 
-export default class CommandBlockedListener extends BushListener {
+export default class SyncUnbanListener extends BushListener {
 	public constructor() {
 		super('guildBanRemove', {
 			emitter: 'client',
diff --git a/src/listeners/message/levels.ts b/src/listeners/message/levelListener.ts
index 3503584..3b23f36 100644
--- a/src/listeners/message/levels.ts
+++ b/src/listeners/message/levelListener.ts
@@ -19,6 +19,7 @@ export default class LevelListener extends BushListener {
 		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
diff --git a/src/tasks/Unban.ts b/src/tasks/UnbanTask.ts
index 6b9d82e..6b9d82e 100644
--- a/src/tasks/Unban.ts
+++ b/src/tasks/UnbanTask.ts