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

3 files changed, 13 insertions, 21 deletions

diff --git a/src/listeners/guild/guildMemberAdd.ts b/src/listeners/guild/guildMemberAdd.ts
index 94d35a5..de1f859 100644
--- a/src/listeners/guild/guildMemberAdd.ts
+++ b/src/listeners/guild/guildMemberAdd.ts
@@ -1,5 +1,5 @@
-import { BushListener, type BushClientEvents, type BushGuildMember, type BushTextChannel } from '#lib';
-import { EmbedBuilder } from 'discord.js';
+import { BushListener, type BushClientEvents } from '#lib';
+import { EmbedBuilder, type GuildMember, type TextChannel } from 'discord.js';
 
 export default class GuildMemberAddListener extends BushListener {
 	public constructor() {
@@ -14,11 +14,11 @@ export default class GuildMemberAddListener extends BushListener {
 		void this.sendWelcomeMessage(member);
 	}
 
-	private async sendWelcomeMessage(member: BushGuildMember) {
+	private async sendWelcomeMessage(member: GuildMember) {
 		if (client.config.isDevelopment) return;
 		const welcomeChannel = await member.guild.getSetting('welcomeChannel');
 		if (!welcomeChannel) return;
-		const welcome = client.channels.cache.get(welcomeChannel) as BushTextChannel | undefined;
+		const welcome = client.channels.cache.get(welcomeChannel) as TextChannel | undefined;
 		if (!welcome) return;
 		if (member.guild.id !== welcome?.guild.id) throw new Error('Welcome channel must be in the guild.');
 
diff --git a/src/listeners/guild/guildMemberRemove.ts b/src/listeners/guild/guildMemberRemove.ts
index 8e7ce0d..59f8800 100644
--- a/src/listeners/guild/guildMemberRemove.ts
+++ b/src/listeners/guild/guildMemberRemove.ts
@@ -1,13 +1,5 @@
-import {
-	BushListener,
-	StickyRole,
-	Time,
-	type BushClientEvents,
-	type BushGuildMember,
-	type BushTextChannel,
-	type PartialBushGuildMember
-} from '#lib';
-import { EmbedBuilder } from 'discord.js';
+import { BushListener, StickyRole, Time, type BushClientEvents } from '#lib';
+import { EmbedBuilder, type GuildMember, type PartialGuildMember, type TextChannel } from 'discord.js';
 
 export default class GuildMemberRemoveListener extends BushListener {
 	public constructor() {
@@ -23,14 +15,14 @@ export default class GuildMemberRemoveListener extends BushListener {
 		void this.stickyRoles(member);
 	}
 
-	private async sendWelcomeMessage(member: BushGuildMember | PartialBushGuildMember) {
+	private async sendWelcomeMessage(member: GuildMember | PartialGuildMember) {
 		if (client.config.isDevelopment) return;
 		const user = member.partial ? await client.users.fetch(member.id) : member.user;
 		await util.sleep(50 * Time.Millisecond); // ban usually triggers after member leave
 		const isBan = member.guild.bans.cache.has(member.id);
 		const welcomeChannel = await member.guild.getSetting('welcomeChannel');
 		if (!welcomeChannel) return;
-		const welcome = client.channels.cache.get(welcomeChannel) as BushTextChannel | undefined;
+		const welcome = client.channels.cache.get(welcomeChannel) as TextChannel | undefined;
 		if (member.guild.id !== welcome?.guild.id) throw new Error('Welcome channel must be in the guild.');
 		const embed: EmbedBuilder = new EmbedBuilder()
 			.setDescription(
@@ -55,7 +47,7 @@ export default class GuildMemberRemoveListener extends BushListener {
 			);
 	}
 
-	private async stickyRoles(member: BushGuildMember | PartialBushGuildMember) {
+	private async stickyRoles(member: GuildMember | PartialGuildMember) {
 		if (!(await member.guild.hasFeature('stickyRoles'))) return;
 		if (member.partial) {
 			await member.guild.members.fetch(); // try to prevent in the future
diff --git a/src/listeners/guild/joinRoles.ts b/src/listeners/guild/joinRoles.ts
index 81a07e5..dab623f 100644
--- a/src/listeners/guild/joinRoles.ts
+++ b/src/listeners/guild/joinRoles.ts
@@ -1,5 +1,5 @@
-import { BushListener, StickyRole, type BushClientEvents, type BushGuildMember } from '#lib';
-import { type Snowflake } from 'discord.js';
+import { BushListener, StickyRole, type BushClientEvents } from '#lib';
+import { type GuildMember, type Snowflake } from 'discord.js';
 
 export default class JoinRolesListener extends BushListener {
 	public constructor() {
@@ -37,7 +37,7 @@ export default class JoinRolesListener extends BushListener {
 	 * @param member The member to add sticky roles to.
 	 * @returns Whether or not sticky roles were added.
 	 */
-	private async stickyRoles(member: BushGuildMember): Promise<boolean> {
+	private async stickyRoles(member: GuildMember): Promise<boolean> {
 		const hadRoles = await StickyRole.findOne({ where: { guild: member.guild.id, user: member.id } });
 
 		if (hadRoles?.roles?.length) {
@@ -98,7 +98,7 @@ export default class JoinRolesListener extends BushListener {
 	 * Add the guild's join roles to the member.
 	 * @param member The member to add the join roles to.
 	 */
-	private async joinRoles(member: BushGuildMember): Promise<void> {
+	private async joinRoles(member: GuildMember): Promise<void> {
 		const joinRoles = await member.guild.getSetting('joinRoles');
 		if (!joinRoles || !joinRoles.length) return;
 		await member.roles