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, 3 insertions, 2 deletions

diff --git a/src/arguments/globalUser.ts b/src/arguments/globalUser.ts
index 08350d2..df4f5d9 100644
--- a/src/arguments/globalUser.ts
+++ b/src/arguments/globalUser.ts
@@ -1,6 +1,7 @@
-import { type BushArgumentTypeCaster, type BushUser } from '#lib';
+import type { BushArgumentTypeCaster } from '#lib';
+import type { User } from 'discord.js';
 
 // resolve non-cached users
-export const globalUser: BushArgumentTypeCaster<Promise<BushUser | null>> = async (_, phrase) => {
+export const globalUser: BushArgumentTypeCaster<Promise<User | null>> = async (_, phrase) => {
 	return client.users.resolve(phrase) ?? (await client.users.fetch(`${phrase}`).catch(() => null));
 };