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, 72 insertions, 219 deletions

diff --git a/src/lib/extensions/discord.js/BushClientEvents.ts b/src/lib/extensions/discord.js/BushClientEvents.ts
index e1a9954..22bae65 100644
--- a/src/lib/extensions/discord.js/BushClientEvents.ts
+++ b/src/lib/extensions/discord.js/BushClientEvents.ts
@@ -1,176 +1,29 @@
 import type {
 	BanResponse,
-	BushApplicationCommand,
-	BushButtonInteraction,
-	BushClient,
-	BushDMChannel,
-	BushGuild,
-	BushGuildBan,
-	BushGuildEmoji,
-	BushGuildMember,
-	BushGuildTextBasedChannel,
-	BushMessage,
-	BushMessageReaction,
-	BushModalSubmitInteraction,
-	BushNewsChannel,
-	BushNonThreadGuildBasedChannel,
-	BushPresence,
-	BushRole,
-	BushSelectMenuInteraction,
-	BushStageInstance,
-	BushTextBasedChannel,
-	BushTextChannel,
-	BushThreadChannel,
-	BushThreadMember,
-	BushUser,
-	BushVoiceState,
-	Guild,
-	GuildSettings,
-	PartialBushGuildMember,
-	PartialBushMessage,
-	PartialBushMessageReaction,
-	PartialBushUser
+	CommandMessage,
+	Guild as GuildDB,
+	GuildSettings
 } from '#lib';
 import type { AkairoClientEvents } from 'discord-akairo';
 import type {
+	ButtonInteraction,
 	Collection,
-	GuildScheduledEvent,
-	Interaction,
-	Invite,
+	Guild,
+	GuildMember,
+	GuildTextBasedChannel,
+	Message,
+	ModalSubmitInteraction,
+	Role,
+	SelectMenuInteraction,
 	Snowflake,
-	Sticker,
-	Typing
+	User
 } from 'discord.js';
 
 export interface BushClientEvents extends AkairoClientEvents {
-	applicationCommandCreate: [command: BushApplicationCommand];
-	applicationCommandDelete: [command: BushApplicationCommand];
-	applicationCommandUpdate: [
-		oldCommand: BushApplicationCommand | null,
-		newCommand: BushApplicationCommand
-	];
-	channelCreate: [channel: BushNonThreadGuildBasedChannel];
-	channelDelete: [channel: BushDMChannel | BushNonThreadGuildBasedChannel];
-	channelPinsUpdate: [channel: BushTextBasedChannel, date: Date];
-	channelUpdate: [
-		oldChannel: BushDMChannel | BushNonThreadGuildBasedChannel,
-		newChannel: BushDMChannel | BushNonThreadGuildBasedChannel
-	];
-	debug: [message: string];
-	warn: [message: string];
-	emojiCreate: [emoji: BushGuildEmoji];
-	emojiDelete: [emoji: BushGuildEmoji];
-	emojiUpdate: [oldEmoji: BushGuildEmoji, newEmoji: BushGuildEmoji];
-	error: [error: Error];
-	guildBanAdd: [ban: BushGuildBan];
-	guildBanRemove: [ban: BushGuildBan];
-	guildCreate: [guild: BushGuild];
-	guildDelete: [guild: BushGuild];
-	guildUnavailable: [guild: BushGuild];
-	guildIntegrationsUpdate: [guild: BushGuild];
-	guildMemberAdd: [member: BushGuildMember];
-	guildMemberAvailable: [member: BushGuildMember | PartialBushGuildMember];
-	guildMemberRemove: [member: BushGuildMember | PartialBushGuildMember];
-	guildMembersChunk: [
-		members: Collection<Snowflake, BushGuildMember>,
-		guild: BushGuild,
-		data: {
-			count: number;
-			index: number;
-			nonce: string | undefined;
-		}
-	];
-	guildMemberUpdate: [
-		oldMember: BushGuildMember | PartialBushGuildMember,
-		newMember: BushGuildMember
-	];
-	guildUpdate: [oldGuild: BushGuild, newGuild: BushGuild];
-	inviteCreate: [invite: Invite];
-	inviteDelete: [invite: Invite];
-	messageCreate: [message: BushMessage];
-	messageDelete: [message: BushMessage | PartialBushMessage];
-	messageReactionRemoveAll: [
-		message: BushMessage | PartialBushMessage,
-		reactions: Collection<string, BushMessageReaction>
-	];
-	messageReactionRemoveEmoji: [
-		reaction: BushMessageReaction | PartialBushMessageReaction
-	];
-	messageDeleteBulk: [
-		messages: Collection<Snowflake, BushMessage | PartialBushMessage>,
-		channel: BushTextBasedChannel
-	];
-	messageReactionAdd: [
-		reaction: BushMessageReaction | PartialBushMessageReaction,
-		user: BushUser | PartialBushUser
-	];
-	messageReactionRemove: [
-		reaction: BushMessageReaction | PartialBushMessageReaction,
-		user: BushUser | PartialBushUser
-	];
-	messageUpdate: [
-		oldMessage: BushMessage | PartialBushMessage,
-		newMessage: BushMessage | PartialBushMessage
-	];
-	presenceUpdate: [oldPresence: BushPresence | null, newPresence: BushPresence];
-	ready: [client: BushClient<true>];
-	invalidated: [];
-	roleCreate: [role: BushRole];
-	roleDelete: [role: BushRole];
-	roleUpdate: [oldRole: BushRole, newRole: BushRole];
-	threadCreate: [thread: BushThreadChannel, newlyCreated: boolean];
-	threadDelete: [thread: BushThreadChannel];
-	threadListSync: [
-		threads: Collection<Snowflake, BushThreadChannel>,
-		guild: BushGuild
-	];
-	threadMemberUpdate: [
-		oldMember: BushThreadMember,
-		newMember: BushThreadMember
-	];
-	threadMembersUpdate: [
-		oldMembers: Collection<Snowflake, BushThreadMember>,
-		newMembers: Collection<Snowflake, BushThreadMember>,
-		thread: BushThreadChannel
-	];
-	threadUpdate: [oldThread: BushThreadChannel, newThread: BushThreadChannel];
-	typingStart: [typing: Typing];
-	userUpdate: [oldUser: BushUser | PartialBushUser, newUser: BushUser];
-	voiceStateUpdate: [oldState: BushVoiceState, newState: BushVoiceState];
-	webhookUpdate: [channel: BushTextChannel];
-	interactionCreate: [interaction: Interaction];
-	shardError: [error: Error, shardId: number];
-	shardReady: [shardId: number, unavailableGuilds: Set<Snowflake> | undefined];
-	shardReconnecting: [shardId: number];
-	shardResume: [shardId: number, replayedEvents: number];
-	stageInstanceCreate: [stageInstance: BushStageInstance];
-	stageInstanceUpdate: [
-		oldStageInstance: BushStageInstance | null,
-		newStageInstance: BushStageInstance
-	];
-	stageInstanceDelete: [stageInstance: BushStageInstance];
-	stickerCreate: [sticker: Sticker];
-	stickerDelete: [sticker: Sticker];
-	stickerUpdate: [oldSticker: Sticker, newSticker: Sticker];
-	guildScheduledEventCreate: [guildScheduledEvent: GuildScheduledEvent];
-	guildScheduledEventUpdate: [
-		oldGuildScheduledEvent: GuildScheduledEvent,
-		newGuildScheduledEvent: GuildScheduledEvent
-	];
-	guildScheduledEventDelete: [guildScheduledEvent: GuildScheduledEvent];
-	guildScheduledEventUserAdd: [
-		guildScheduledEvent: GuildScheduledEvent,
-		user: BushUser
-	];
-	guildScheduledEventUserRemove: [
-		guildScheduledEvent: GuildScheduledEvent,
-		user: BushUser
-	];
-	/* Custom */
 	bushBan: [
-		victim: BushGuildMember | BushUser,
-		moderator: BushUser,
-		guild: BushGuild,
+		victim: GuildMember | User,
+		moderator: User,
+		guild: Guild,
 		reason: string | undefined,
 		caseID: string,
 		duration: number,
@@ -178,29 +31,29 @@ export interface BushClientEvents extends AkairoClientEvents {
 		evidence?: string
 	];
 	bushBlock: [
-		victim: BushGuildMember,
-		moderator: BushUser,
-		guild: BushGuild,
+		victim: GuildMember,
+		moderator: User,
+		guild: Guild,
 		reason: string | undefined,
 		caseID: string,
 		duration: number,
 		dmSuccess: boolean,
-		channel: BushGuildTextBasedChannel,
+		channel: GuildTextBasedChannel,
 		evidence?: string
 	];
 	bushKick: [
-		victim: BushGuildMember,
-		moderator: BushUser,
-		guild: BushGuild,
+		victim: GuildMember,
+		moderator: User,
+		guild: Guild,
 		reason: string | undefined,
 		caseID: string,
 		dmSuccess: boolean,
 		evidence?: string
 	];
 	bushMute: [
-		victim: BushGuildMember,
-		moderator: BushUser,
-		guild: BushGuild,
+		victim: GuildMember,
+		moderator: User,
+		guild: Guild,
 		reason: string | undefined,
 		caseID: string,
 		duration: number,
@@ -208,43 +61,43 @@ export interface BushClientEvents extends AkairoClientEvents {
 		evidence?: string
 	];
 	bushPunishRole: [
-		victim: BushGuildMember,
-		moderator: BushUser,
-		guild: BushGuild,
+		victim: GuildMember,
+		moderator: User,
+		guild: Guild,
 		reason: string | undefined,
 		caseID: string,
 		duration: number,
-		role: BushRole,
+		role: Role,
 		evidence?: string
 	];
 	bushPunishRoleRemove: [
-		victim: BushGuildMember,
-		moderator: BushUser,
-		guild: BushGuild,
+		victim: GuildMember,
+		moderator: User,
+		guild: Guild,
 		reason: string | undefined,
 		caseID: string,
-		role: BushRole,
+		role: Role,
 		evidence?: string
 	];
 	bushPurge: [
-		moderator: BushUser,
-		guild: BushGuild,
-		channel: BushTextChannel | BushNewsChannel | BushThreadChannel,
-		messages: Collection<Snowflake, BushMessage>
+		moderator: User,
+		guild: Guild,
+		channel: GuildTextBasedChannel,
+		messages: Collection<Snowflake, Message>
 	];
 	bushRemoveTimeout: [
-		victim: BushGuildMember,
-		moderator: BushUser,
-		guild: BushGuild,
+		victim: GuildMember,
+		moderator: User,
+		guild: Guild,
 		reason: string | undefined,
 		caseID: string,
 		dmSuccess: boolean,
 		evidence?: string
 	];
 	bushTimeout: [
-		victim: BushGuildMember,
-		moderator: BushUser,
-		guild: BushGuild,
+		victim: GuildMember,
+		moderator: User,
+		guild: Guild,
 		reason: string | undefined,
 		caseID: string,
 		duration: number,
@@ -252,35 +105,35 @@ export interface BushClientEvents extends AkairoClientEvents {
 		evidence?: string
 	];
 	bushUnban: [
-		victim: BushUser,
-		moderator: BushUser,
-		guild: BushGuild,
+		victim: User,
+		moderator: User,
+		guild: Guild,
 		reason: string | undefined,
 		caseID: string,
 		dmSuccess: boolean,
 		evidence?: string
 	];
 	bushUnblock: [
-		victim: BushGuildMember | BushUser,
-		moderator: BushUser,
-		guild: BushGuild,
+		victim: GuildMember | User,
+		moderator: User,
+		guild: Guild,
 		reason: string | undefined,
 		caseID: string,
 		dmSuccess: boolean,
-		channel: BushGuildTextBasedChannel,
+		channel: GuildTextBasedChannel,
 		evidence?: string
 	];
 	bushUnmute: [
-		victim: BushGuildMember,
-		moderator: BushUser,
-		guild: BushGuild,
+		victim: GuildMember,
+		moderator: User,
+		guild: Guild,
 		reason: string | undefined,
 		caseID: string,
 		dmSuccess: boolean,
 		evidence?: string
 	];
 	bushUpdateModlog: [
-		moderator: BushGuildMember,
+		moderator: GuildMember,
 		modlogID: string,
 		key: 'evidence' | 'hidden',
 		oldModlog: string | boolean,
@@ -288,55 +141,55 @@ export interface BushClientEvents extends AkairoClientEvents {
 	];
 	bushUpdateSettings: [
 		setting: Setting,
-		guild: BushGuild,
-		oldValue: Guild[Setting],
-		newValue: Guild[Setting],
-		moderator?: BushGuildMember
+		guild: Guild,
+		oldValue: GuildDB[Setting],
+		newValue: GuildDB[Setting],
+		moderator?: GuildMember
 	];
 	bushWarn: [
-		victim: BushGuildMember,
-		moderator: BushUser,
-		guild: BushGuild,
+		victim: GuildMember,
+		moderator: User,
+		guild: Guild,
 		reason: string | undefined,
 		caseID: string,
 		dmSuccess: boolean,
 		evidence?: string
 	];
 	bushLevelUpdate: [
-		member: BushGuildMember,
+		member: GuildMember,
 		oldLevel: number,
 		newLevel: number,
 		currentXp: number,
-		message: BushMessage & { guild: BushGuild }
+		message: CommandMessage
 	];
 	bushLockdown: [
-		moderator: BushGuildMember,
+		moderator: GuildMember,
 		reason: string | undefined,
 		channelsSuccessMap: Collection<Snowflake, boolean>,
 		all?: boolean
 	];
 	bushUnlockdown: [
-		moderator: BushGuildMember,
+		moderator: GuildMember,
 		reason: string | undefined,
 		channelsSuccessMap: Collection<Snowflake, boolean>,
 		all?: boolean
 	];
 	massBan: [
-		moderator: BushGuildMember,
-		guild: BushGuild,
+		moderator: GuildMember,
+		guild: Guild,
 		reason: string | undefined,
 		results: Collection<Snowflake, BanResponse>
 	];
 	massEvidence: [
-		moderator: BushGuildMember,
-		guild: BushGuild,
+		moderator: GuildMember,
+		guild: Guild,
 		evidence: string,
 		lines: string[]
 	];
 	/* components */
-	button: [button: BushButtonInteraction];
-	selectMenu: [selectMenu: BushSelectMenuInteraction];
-	modal: [modal: BushModalSubmitInteraction];
+	button: [button: ButtonInteraction];
+	selectMenu: [selectMenu: SelectMenuInteraction];
+	modal: [modal: ModalSubmitInteraction];
 }
 
 type Setting =