From 2eea47b63ab735f80233bbacaf122e4f8c395f4f Mon Sep 17 00:00:00 2001
From: Skillz4Killz <23035000+Skillz4Killz@users.noreply.github.com>
Date: Mon, 7 Dec 2020 14:11:36 -0500
Subject: [PATCH] fix: guildBan* events argument order (#233)

---
 docs/src/stepbystep/createevent.md | 4 ++--
 src/controllers/bans.ts            | 4 ++--
 src/types/options.ts               | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/src/stepbystep/createevent.md b/docs/src/stepbystep/createevent.md
index ac6e00ef0..d48d2b1a7 100644
--- a/docs/src/stepbystep/createevent.md
+++ b/docs/src/stepbystep/createevent.md
@@ -90,8 +90,8 @@ Now that we have fully covered events, it would be a good time to get some pract
   channelDelete?: (channel: Channel) => unknown;
   debug?: (args: DebugArg) => unknown;
   dispatchRequirements?: (data: DiscordPayload, shardID: number) => unknown;
-  guildBanAdd?: (guild: Guild, user: Member | UserPayload) => unknown;
-  guildBanRemove?: (guild: Guild, user: Member | UserPayload) => unknown;
+  guildBanAdd?: (guild: Guild, user: UserPayload, member?: Member) => unknown;
+  guildBanRemove?: (guild: Guild, user: UserPayload, member?: Member) => unknown;
   guildCreate?: (guild: Guild) => unknown;
   guildLoaded?: (guild: Guild) => unknown;
   guildUpdate?: (guild: Guild, changes: GuildUpdateChange[]) => unknown;
diff --git a/src/controllers/bans.ts b/src/controllers/bans.ts
index fd1becf98..67d026031 100644
--- a/src/controllers/bans.ts
+++ b/src/controllers/bans.ts
@@ -11,7 +11,7 @@ export async function handleInternalGuildBanAdd(data: DiscordPayload) {
   if (!guild) return;
 
   const member = await cacheHandlers.get("members", payload.user.id);
-  eventHandlers.guildBanAdd?.(guild, member || payload.user);
+  eventHandlers.guildBanAdd?.(guild, payload.user, member);
 }
 
 export async function handleInternalGuildBanRemove(data: DiscordPayload) {
@@ -22,5 +22,5 @@ export async function handleInternalGuildBanRemove(data: DiscordPayload) {
   if (!guild) return;
 
   const member = await cacheHandlers.get("members", payload.user.id);
-  eventHandlers.guildBanRemove?.(guild, member || payload.user);
+  eventHandlers.guildBanRemove?.(guild, payload.user, member);
 }
diff --git a/src/types/options.ts b/src/types/options.ts
index 71fc6ae2c..268e97d3d 100644
--- a/src/types/options.ts
+++ b/src/types/options.ts
@@ -75,8 +75,8 @@ export interface EventHandlers {
   channelDelete?: (channel: Channel) => unknown;
   debug?: (args: DebugArg) => unknown;
   dispatchRequirements?: (data: DiscordPayload, shardID: number) => unknown;
-  guildBanAdd?: (guild: Guild, user: Member | UserPayload) => unknown;
-  guildBanRemove?: (guild: Guild, user: Member | UserPayload) => unknown;
+  guildBanAdd?: (guild: Guild, user: UserPayload, member?: Member) => unknown;
+  guildBanRemove?: (guild: Guild, user: UserPayload, member?: Member) => unknown;
   guildCreate?: (guild: Guild) => unknown;
   guildLoaded?: (guild: Guild) => unknown;
   guildUpdate?: (guild: Guild, changes: GuildUpdateChange[]) => unknown;