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

4 files changed, 12 insertions, 18 deletions

diff --git a/src/listeners/track-manual-punishments/modlogSyncBan.ts b/src/listeners/track-manual-punishments/modlogSyncBan.ts
index 504992f..be937b9 100644
--- a/src/listeners/track-manual-punishments/modlogSyncBan.ts
+++ b/src/listeners/track-manual-punishments/modlogSyncBan.ts
@@ -1,7 +1,5 @@
-import { BushListener, BushUser, Moderation, ModLogType, Time, type BushClientEvents } from '#lib';
-import { EmbedBuilder } from '@discordjs/builders';
-import { AuditLogEvent } from 'discord-api-types/v10';
-import { PermissionFlagsBits } from 'discord.js';
+import { BushListener, Moderation, ModLogType, Time, type BushClientEvents } from '#lib';
+import { AuditLogEvent, EmbedBuilder, PermissionFlagsBits } from 'discord.js';
 
 export default class ModlogSyncBanListener extends BushListener {
 	public constructor() {
@@ -43,7 +41,7 @@ export default class ModlogSyncBanListener extends BushListener {
 		const { log } = await Moderation.createModLogEntry({
 			type: ModLogType.PERM_BAN,
 			user: ban.user,
-			moderator: <BushUser>first.executor,
+			moderator: first.executor,
 			reason: `[Manual] ${first.reason ? first.reason : 'No reason given'}`,
 			guild: ban.guild
 		});
diff --git a/src/listeners/track-manual-punishments/modlogSyncKick.ts b/src/listeners/track-manual-punishments/modlogSyncKick.ts
index 7a2c154..d136780 100644
--- a/src/listeners/track-manual-punishments/modlogSyncKick.ts
+++ b/src/listeners/track-manual-punishments/modlogSyncKick.ts
@@ -1,6 +1,5 @@
-import { BushListener, BushUser, Moderation, ModLogType, Time, type BushClientEvents } from '#lib';
-import { AuditLogEvent } from 'discord-api-types/v10';
-import { EmbedBuilder, PermissionFlagsBits } from 'discord.js';
+import { BushListener, Moderation, ModLogType, Time, type BushClientEvents } from '#lib';
+import { AuditLogEvent, EmbedBuilder, PermissionFlagsBits } from 'discord.js';
 
 export default class ModlogSyncKickListener extends BushListener {
 	public constructor() {
@@ -42,7 +41,7 @@ export default class ModlogSyncKickListener extends BushListener {
 		const { log } = await Moderation.createModLogEntry({
 			type: ModLogType.KICK,
 			user: member.user,
-			moderator: <BushUser>first.executor,
+			moderator: first.executor,
 			reason: `[Manual] ${first.reason ? first.reason : 'No reason given'}`,
 			guild: member.guild
 		});
diff --git a/src/listeners/track-manual-punishments/modlogSyncTimeout.ts b/src/listeners/track-manual-punishments/modlogSyncTimeout.ts
index f6235a9..adcd7fe 100644
--- a/src/listeners/track-manual-punishments/modlogSyncTimeout.ts
+++ b/src/listeners/track-manual-punishments/modlogSyncTimeout.ts
@@ -1,6 +1,5 @@
-import { BushListener, BushUser, Moderation, ModLogType, Time, type BushClientEvents } from '#lib';
-import { AuditLogEvent } from 'discord-api-types/v10';
-import { EmbedBuilder, PermissionFlagsBits } from 'discord.js';
+import { BushListener, Moderation, ModLogType, Time, type BushClientEvents } from '#lib';
+import { AuditLogEvent, EmbedBuilder, PermissionFlagsBits } from 'discord.js';
 
 export default class ModlogSyncTimeoutListener extends BushListener {
 	public constructor() {
@@ -46,7 +45,7 @@ export default class ModlogSyncTimeoutListener extends BushListener {
 		const { log } = await Moderation.createModLogEntry({
 			type: newTime ? ModLogType.TIMEOUT : ModLogType.REMOVE_TIMEOUT,
 			user: newMember.user,
-			moderator: <BushUser>first.executor,
+			moderator: first.executor,
 			reason: `[Manual] ${first.reason ? first.reason : 'No reason given'}`,
 			guild: newMember.guild,
 			duration: newTime ? newTime.getTime() - now.getTime() : undefined
diff --git a/src/listeners/track-manual-punishments/modlogSyncUnban.ts b/src/listeners/track-manual-punishments/modlogSyncUnban.ts
index cdf18d9..af0b21f 100644
--- a/src/listeners/track-manual-punishments/modlogSyncUnban.ts
+++ b/src/listeners/track-manual-punishments/modlogSyncUnban.ts
@@ -1,7 +1,5 @@
-import { BushListener, BushUser, Moderation, ModLogType, Time, type BushClientEvents } from '#lib';
-import { EmbedBuilder } from '@discordjs/builders';
-import { AuditLogEvent } from 'discord-api-types/v10';
-import { PermissionFlagsBits } from 'discord.js';
+import { BushListener, Moderation, ModLogType, Time, type BushClientEvents } from '#lib';
+import { AuditLogEvent, EmbedBuilder, PermissionFlagsBits } from 'discord.js';
 
 export default class ModlogSyncUnbanListener extends BushListener {
 	public constructor() {
@@ -42,7 +40,7 @@ export default class ModlogSyncUnbanListener extends BushListener {
 		const { log } = await Moderation.createModLogEntry({
 			type: ModLogType.UNBAN,
 			user: ban.user,
-			moderator: <BushUser>first.executor,
+			moderator: first.executor,
 			reason: `[Manual] ${first.reason ? first.reason : 'No reason given'}`,
 			guild: ban.guild
 		});