some rebranding

17 files changed, 42 insertions, 38 deletions

diff --git a/src/commands/owner/eval.ts b/src/commands/dev/eval.ts
index a63b977..83e63f6 100644
--- a/src/commands/owner/eval.ts
+++ b/src/commands/dev/eval.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { BotCommand } from '../../lib/extensions/BotCommand';
+import { BushCommand } from '../../lib/extensions/BushCommand';
 import { MessageEmbed, Message } from 'discord.js';
 import { inspect, promisify } from 'util';
 import { exec } from 'child_process';
@@ -12,7 +12,7 @@ const clean = (text) => {
 	else return text;
 };
 
-export default class EvalCommand extends BotCommand {
+export default class EvalCommand extends BushCommand {
 	public constructor() {
 		super('eval', {
 			aliases: ['eval', 'ev'],
diff --git a/src/commands/owner/reload.ts b/src/commands/dev/reload.ts
index 0330b27..64e5745 100644
--- a/src/commands/owner/reload.ts
+++ b/src/commands/dev/reload.ts
@@ -1,12 +1,13 @@
-import { BotCommand } from '../../lib/extensions/BotCommand';
+import { BushCommand } from '../../lib/extensions/BushCommand';
 import { stripIndent } from 'common-tags';
 import { Message } from 'discord.js';
 import { CommandInteraction } from 'discord.js';
 
-export default class ReloadCommand extends BotCommand {
+export default class ReloadCommand extends BushCommand {
 	constructor() {
 		super('reload', {
 			aliases: ['reload'],
+			category: 'dev',
 			description: {
 				content: 'Reloads the bot',
 				usage: 'reload',
diff --git a/src/commands/owner/setlevel.ts b/src/commands/dev/setlevel.ts
index 6987385..d1701c5 100644
--- a/src/commands/owner/setlevel.ts
+++ b/src/commands/dev/setlevel.ts
@@ -2,19 +2,20 @@ import { ApplicationCommandOptionType } from 'discord-api-types';
 import { CommandInteraction } from 'discord.js';
 import { User } from 'discord.js';
 import { Message } from 'discord.js';
-import { BotCommand } from '../../lib/extensions/BotCommand';
+import { BushCommand } from '../../lib/extensions/BushCommand';
 import { SlashCommandOption } from '../../lib/extensions/Util';
 import { Level } from '../../lib/models';
 import AllowedMentions from '../../lib/utils/AllowedMentions';
 
-export default class SetLevelCommand extends BotCommand {
+export default class SetLevelCommand extends BushCommand {
 	constructor() {
 		super('setlevel', {
 			aliases: ['setlevel'],
+			category: 'dev',
 			description: {
 				content: 'Sets the level of a user',
 				usage: 'setlevel <user> <level>',
-				examples: ['setlevel @Moulberry 69']
+				examples: ['setlevel @Moulberry 69'] //nice
 			},
 			args: [
 				{
diff --git a/src/commands/info/botinfo.ts b/src/commands/info/botinfo.ts
index 8f5f055..e6a4fbb 100644
--- a/src/commands/info/botinfo.ts
+++ b/src/commands/info/botinfo.ts
@@ -1,8 +1,8 @@
 import { MessageEmbed, Message, CommandInteraction } from 'discord.js';
-import { BotCommand } from '../../lib/extensions/BotCommand';
+import { BushCommand } from '../../lib/extensions/BushCommand';
 import { duration } from 'moment';
 
-export default class BotInfoCommand extends BotCommand {
+export default class BotInfoCommand extends BushCommand {
 	constructor() {
 		super('botinfo', {
 			aliases: ['botinfo'],
diff --git a/src/commands/info/help.ts b/src/commands/info/help.ts
index 116669c..30c2a21 100644
--- a/src/commands/info/help.ts
+++ b/src/commands/info/help.ts
@@ -1,11 +1,11 @@
 import { Message, MessageEmbed } from 'discord.js';
-import { BotCommand } from '../../lib/extensions/BotCommand';
+import { BushCommand } from '../../lib/extensions/BushCommand';
 import { stripIndent } from 'common-tags';
 import { ApplicationCommandOptionType } from 'discord-api-types';
 import { CommandInteraction } from 'discord.js';
 import { SlashCommandOption } from '../../lib/extensions/Util';
 
-export default class HelpCommand extends BotCommand {
+export default class HelpCommand extends BushCommand {
 	constructor() {
 		super('help', {
 			aliases: ['help'],
@@ -32,7 +32,7 @@ export default class HelpCommand extends BotCommand {
 		});
 	}
 
-	private generateEmbed(command?: BotCommand): MessageEmbed {
+	private generateEmbed(command?: BushCommand): MessageEmbed {
 		const prefix = this.handler.prefix;
 		if (!command) {
 			const embed = new MessageEmbed()
@@ -85,7 +85,7 @@ export default class HelpCommand extends BotCommand {
 
 	public async exec(
 		message: Message,
-		{ command }: { command: BotCommand }
+		{ command }: { command: BushCommand }
 	): Promise<void> {
 		await message.util.send(this.generateEmbed(command));
 	}
@@ -97,7 +97,7 @@ export default class HelpCommand extends BotCommand {
 		if (command) {
 			await message.reply(
 				this.generateEmbed(
-					this.handler.findCommand(command.value) as BotCommand
+					this.handler.findCommand(command.value) as BushCommand
 				)
 			);
 		} else {
diff --git a/src/commands/info/ping.ts b/src/commands/info/ping.ts
index e51867f..62b8e60 100644
--- a/src/commands/info/ping.ts
+++ b/src/commands/info/ping.ts
@@ -1,9 +1,9 @@
 import { CommandInteraction } from 'discord.js';
 import { Message } from 'discord.js';
 import { MessageEmbed } from 'discord.js';
-import { BotCommand } from '../../lib/extensions/BotCommand';
+import { BushCommand } from '../../lib/extensions/BushCommand';
 
-export default class PingCommand extends BotCommand {
+export default class PingCommand extends BushCommand {
 	constructor() {
 		super('ping', {
 			aliases: ['ping'],
diff --git a/src/commands/info/pronouns.ts b/src/commands/info/pronouns.ts
index 97cca34..f30a981 100644
--- a/src/commands/info/pronouns.ts
+++ b/src/commands/info/pronouns.ts
@@ -1,4 +1,4 @@
-import { BotCommand } from '../../lib/extensions/BotCommand';
+import { BushCommand } from '../../lib/extensions/BushCommand';
 import { User, Message, MessageEmbed } from 'discord.js';
 import got, { HTTPError } from 'got';
 import { CommandInteraction } from 'discord.js';
@@ -30,7 +30,7 @@ export const pronounMapping = {
 };
 export type pronounsType = keyof typeof pronounMapping;
 
-export default class PronounsCommand extends BotCommand {
+export default class PronounsCommand extends BushCommand {
 	constructor() {
 		super('pronouns', {
 			aliases: ['pronouns', 'pronoun'],
diff --git a/src/commands/moderation/ban.ts b/src/commands/moderation/ban.ts
index 556dd6b..1c3b074 100644
--- a/src/commands/moderation/ban.ts
+++ b/src/commands/moderation/ban.ts
@@ -1,6 +1,6 @@
 import { User } from 'discord.js';
 import { Guild } from '../../lib/models';
-import { BotCommand } from '../../lib/extensions/BotCommand';
+import { BushCommand } from '../../lib/extensions/BushCommand';
 import { Ban, Modlog, ModlogType } from '../../lib/models';
 import moment from 'moment';
 import { Message } from 'discord.js';
@@ -18,7 +18,7 @@ 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 BotCommand {
+export default class PrefixCommand extends BushCommand {
 	constructor() {
 		super('ban', {
 			aliases: ['ban'],
diff --git a/src/commands/moderation/kick.ts b/src/commands/moderation/kick.ts
index f31047e..c21352f 100644
--- a/src/commands/moderation/kick.ts
+++ b/src/commands/moderation/kick.ts
@@ -1,10 +1,10 @@
-import { BotCommand } from '../../lib/extensions/BotCommand';
+import { BushCommand } from '../../lib/extensions/BushCommand';
 import { Guild, Modlog, ModlogType } from '../../lib/models';
 import { GuildMember, Message } from 'discord.js';
 import { ApplicationCommandOptionType } from 'discord-api-types';
 import { CommandInteraction } from 'discord.js';
 
-export default class KickCommand extends BotCommand {
+export default class KickCommand extends BushCommand {
 	constructor() {
 		super('kick', {
 			aliases: ['kick'],
diff --git a/src/commands/moderation/modlog.ts b/src/commands/moderation/modlog.ts
index 320c6b4..b7923ca 100644
--- a/src/commands/moderation/modlog.ts
+++ b/src/commands/moderation/modlog.ts
@@ -1,4 +1,4 @@
-import { BotCommand } from '../../lib/extensions/BotCommand';
+import { BushCommand } from '../../lib/extensions/BushCommand';
 import { Message } from 'discord.js';
 import { Modlog } from '../../lib/models';
 import { MessageEmbed } from 'discord.js';
@@ -6,7 +6,7 @@ import moment from 'moment';
 import { stripIndent } from 'common-tags';
 import { Argument } from 'discord-akairo';
 
-export default class ModlogCommand extends BotCommand {
+export default class ModlogCommand extends BushCommand {
 	constructor() {
 		super('modlog', {
 			aliases: ['modlog', 'modlogs'],
diff --git a/src/commands/moderation/role.ts b/src/commands/moderation/role.ts
index 2a67e5b..29339a3 100644
--- a/src/commands/moderation/role.ts
+++ b/src/commands/moderation/role.ts
@@ -1,10 +1,10 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
-import { BotCommand } from '../../lib/extensions/BotCommand';
+import { BushCommand } from '../../lib/extensions/BushCommand';
 import AllowedMentions from '../../lib/utils/AllowedMentions';
 import { Message, Role, GuildMember } from 'discord.js';
 import { ApplicationCommandOptionType } from 'discord-api-types';
 
-export default class RoleCommand extends BotCommand {
+export default class RoleCommand extends BushCommand {
 	private roleWhitelist: Record<string, string[]> = {
 		'Partner': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'],
 		'Suggester': [
diff --git a/src/commands/moderation/warn.ts b/src/commands/moderation/warn.ts
index 41e0032..e8b1401 100644
--- a/src/commands/moderation/warn.ts
+++ b/src/commands/moderation/warn.ts
@@ -1,8 +1,8 @@
 import { GuildMember, Message } from 'discord.js';
-import { BotCommand } from '../../lib/extensions/BotCommand';
+import { BushCommand } from '../../lib/extensions/BushCommand';
 import { Guild, Modlog, ModlogType } from '../../lib/models';
 
-export default class WarnCommand extends BotCommand {
+export default class WarnCommand extends BushCommand {
 	public constructor() {
 		super('warn', {
 			aliases: ['warn'],
diff --git a/src/commands/moulberry-bush/capeperms.ts b/src/commands/moulberry-bush/capeperms.ts
index 5b3dc10..9832083 100644
--- a/src/commands/moulberry-bush/capeperms.ts
+++ b/src/commands/moulberry-bush/capeperms.ts
@@ -3,7 +3,7 @@ import { MessageEmbed } from 'discord.js';
 import { CommandInteraction } from 'discord.js';
 import { Message } from 'discord.js';
 import got from 'got';
-import { BotCommand } from '../../lib/extensions/BotCommand';
+import { BushCommand } from '../../lib/extensions/BushCommand';
 import { SlashCommandOption } from '../../lib/extensions/Util';
 
 interface Capeperms {
@@ -15,7 +15,7 @@ interface User {
 	perms: string[];
 }
 
-export default class CapePermsCommand extends BotCommand {
+export default class CapePermsCommand extends BushCommand {
 	private nameMap = {
 		patreon1: 'Patreon Tier 1',
 		patreon2: 'Patreon Tier 2',
diff --git a/src/commands/moulberry-bush/giveawayping.ts b/src/commands/moulberry-bush/giveawayping.ts
index d99f475..e6fdd9a 100644
--- a/src/commands/moulberry-bush/giveawayping.ts
+++ b/src/commands/moulberry-bush/giveawayping.ts
@@ -1,10 +1,10 @@
-import { BotCommand } from '../../lib/extensions/BotCommand';
+import { BushCommand } from '../../lib/extensions/BushCommand';
 import AllowedMentions from '../../lib/utils/AllowedMentions';
 import { Message, WebhookClient } from 'discord.js';
 import { TextChannel } from 'discord.js';
 import { NewsChannel } from 'discord.js';
 
-export default class GiveawayPingCommand extends BotCommand {
+export default class GiveawayPingCommand extends BushCommand {
 	constructor() {
 		super('giveawayping', {
 			aliases: ['giveawayping', 'giveawaypong'],
diff --git a/src/commands/moulberry-bush/level.ts b/src/commands/moulberry-bush/level.ts
index ab08361..decac8a 100644
--- a/src/commands/moulberry-bush/level.ts
+++ b/src/commands/moulberry-bush/level.ts
@@ -3,13 +3,14 @@ import { Message } from 'discord.js';
 import { CommandInteractionOption } from 'discord.js';
 import { CommandInteraction } from 'discord.js';
 import { User } from 'discord.js';
-import { BotCommand } from '../../lib/extensions/BotCommand';
+import { BushCommand } from '../../lib/extensions/BushCommand';
 import { Level } from '../../lib/models';
 
-export default class LevelCommand extends BotCommand {
+export default class LevelCommand extends BushCommand {
 	constructor() {
 		super('level', {
 			aliases: ['level', 'rank'],
+			category: "Moulberry's Bush",
 			description: {
 				content: 'Shows the level of a user',
 				usage: 'level [user]',
diff --git a/src/commands/moulberry-bush/rule.ts b/src/commands/moulberry-bush/rule.ts
index bd8b08a..69dcb6e 100644
--- a/src/commands/moulberry-bush/rule.ts
+++ b/src/commands/moulberry-bush/rule.ts
@@ -1,11 +1,11 @@
 import { Argument } from 'discord-akairo';
 import { Message, MessageEmbed, User } from 'discord.js';
-import { BotCommand } from '../../lib/extensions/BotCommand';
+import { BushCommand } from '../../lib/extensions/BushCommand';
 import { ApplicationCommandOptionType } from 'discord-api-types';
 import { CommandInteraction } from 'discord.js';
 import { SlashCommandOption } from '../../lib/extensions/Util';
 
-export default class RuleCommand extends BotCommand {
+export default class RuleCommand extends BushCommand {
 	private rules = [
 		{
 			title: "Follow Discord's TOS",
diff --git a/src/commands/admin/prefix.ts b/src/commands/server-config/prefix.ts
index 112f6b8..ac85922 100644
--- a/src/commands/admin/prefix.ts
+++ b/src/commands/server-config/prefix.ts
@@ -1,13 +1,14 @@
 import { ApplicationCommandOptionType } from 'discord-api-types';
 import { CommandInteraction, Message, Guild as DiscordGuild } from 'discord.js';
-import { BotCommand } from '../../lib/extensions/BotCommand';
+import { BushCommand } from '../../lib/extensions/BushCommand';
 import { SlashCommandOption } from '../../lib/extensions/Util';
 import { Guild } from '../../lib/models';
 
-export default class PrefixCommand extends BotCommand {
+export default class PrefixCommand extends BushCommand {
 	constructor() {
 		super('prefix', {
 			aliases: ['prefix'],
+			category: "server config",
 			args: [
 				{
 					id: 'prefix'