From a39aa8c11a3fd5dd5f007865960ef5429744f057 Mon Sep 17 00:00:00 2001
From: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
Date: Sun, 7 Nov 2021 09:25:13 -0500
Subject: made some constants enums and fixed perm check overriding inhibitors

---
 src/lib/extensions/discord-akairo/BushClient.ts  |  4 +-
 src/lib/extensions/discord-akairo/BushCommand.ts | 56 ++----------------------
 2 files changed, 5 insertions(+), 55 deletions(-)

(limited to 'src/lib/extensions/discord-akairo')

diff --git a/src/lib/extensions/discord-akairo/BushClient.ts b/src/lib/extensions/discord-akairo/BushClient.ts
index 6b25aaa..0fb84f3 100644
--- a/src/lib/extensions/discord-akairo/BushClient.ts
+++ b/src/lib/extensions/discord-akairo/BushClient.ts
@@ -224,7 +224,7 @@ export class BushClient<Ready extends boolean = boolean> extends AkairoClient<Re
 			makeCache: Options.cacheWithLimits({})
 		});
 
-		this.token = config.token;
+		this.token = config.token as If<Ready, string, string | null>;
 		this.config = config;
 		// Create listener handler
 		this.listenerHandler = new BushListenerHandler(this, {
@@ -274,7 +274,7 @@ export class BushClient<Ready extends boolean = boolean> extends AkairoClient<Re
 			},
 			automateCategories: false,
 			autoRegisterSlashCommands: true,
-			skipBuiltInPostInhibitors: false,
+			skipBuiltInPostInhibitors: true,
 			useSlashPermissions: true,
 			aliasReplacement: /-/g
 		});
diff --git a/src/lib/extensions/discord-akairo/BushCommand.ts b/src/lib/extensions/discord-akairo/BushCommand.ts
index b079649..03f6606 100644
--- a/src/lib/extensions/discord-akairo/BushCommand.ts
+++ b/src/lib/extensions/discord-akairo/BushCommand.ts
@@ -1,60 +1,10 @@
 import { type BushClient, type BushCommandHandler, type BushMessage, type BushSlashMessage } from '#lib';
 import { Command, type ArgumentOptions, type ArgumentPromptOptions, type ArgumentTypeCaster, type CommandOptions } from 'discord-akairo';
+import { BaseArgumentType } from 'discord-akairo/dist/src/struct/commands/arguments/Argument';
 import { type PermissionResolvable, type Snowflake } from 'discord.js';
 
-export type BaseBushArgumentType =
-	| 'string'
-	| 'lowercase'
-	| 'uppercase'
-	| 'charCodes'
-	| 'number'
-	| 'integer'
-	| 'bigint'
-	| 'emojint'
-	| 'url'
-	| 'date'
-	| 'color'
-	| 'user'
-	| 'users'
-	| 'member'
-	| 'members'
-	| 'relevant'
-	| 'relevants'
-	| 'channel'
-	| 'channels'
-	| 'textChannel'
-	| 'textChannels'
-	| 'voiceChannel'
-	| 'voiceChannels'
-	| 'categoryChannel'
-	| 'categoryChannels'
-	| 'newsChannel'
-	| 'newsChannels'
-	| 'storeChannel'
-	| 'storeChannels'
-	| 'stageChannel'
-	| 'stageChannels'
-	| 'threadChannel'
-	| 'threadChannels'
-	| 'role'
-	| 'roles'
-	| 'emoji'
-	| 'emojis'
-	| 'guild'
-	| 'guilds'
-	| 'message'
-	| 'guildMessage'
-	| 'relevantMessage'
-	| 'invite'
-	| 'userMention'
-	| 'memberMention'
-	| 'channelMention'
-	| 'roleMention'
-	| 'emojiMention'
-	| 'commandAlias'
-	| 'command'
-	| 'inhibitor'
-	| 'listener'
+export type BaseBushArgumentType = 
+	| BaseArgumentType 
 	| 'duration'
 	| 'contentWithDuration'
 	| 'permission'
-- 
cgit