remove the war crimes that I previously committed

- Remove custom typings and replace with declaration merging
- Fix the typings for args
- Replace all discord-api-types imports with discord.js imports
- Fix discord.js breaking changes

1 files changed, 2 insertions, 2 deletions

diff --git a/src/inhibitors/blacklist/userGlobalBlacklist.ts b/src/inhibitors/blacklist/userGlobalBlacklist.ts
index a3b0cdc..ae488c8 100644
--- a/src/inhibitors/blacklist/userGlobalBlacklist.ts
+++ b/src/inhibitors/blacklist/userGlobalBlacklist.ts
@@ -1,4 +1,4 @@
-import { BushInhibitor, type BushMessage, type BushSlashMessage } from '#lib';
+import { BushInhibitor, type CommandMessage, type SlashMessage } from '#lib';
 
 export default class UserGlobalBlacklistInhibitor extends BushInhibitor {
 	public constructor() {
@@ -10,7 +10,7 @@ export default class UserGlobalBlacklistInhibitor extends BushInhibitor {
 		});
 	}
 
-	public override exec(message: BushMessage | BushSlashMessage): boolean {
+	public override exec(message: CommandMessage | SlashMessage): boolean {
 		if (!message.author) return false;
 		// do not change to message.author.isOwner()
 		if (client.isOwner(message.author) || client.user!.id === message.author.id) return false;