From 3d0f8d6284fbff51881ba704f73765100ffc5f47 Mon Sep 17 00:00:00 2001
From: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
Date: Sun, 13 Feb 2022 20:39:09 -0500
Subject: started working on appeals

---
 src/lib/extensions/discord.js/BushGuild.ts | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'src/lib/extensions/discord.js/BushGuild.ts')

diff --git a/src/lib/extensions/discord.js/BushGuild.ts b/src/lib/extensions/discord.js/BushGuild.ts
index 93875b8..80799fd 100644
--- a/src/lib/extensions/discord.js/BushGuild.ts
+++ b/src/lib/extensions/discord.js/BushGuild.ts
@@ -173,8 +173,22 @@ export class BushGuild extends Guild {
 		if ((await this.bans.fetch()).has(user.id)) return banResponse.ALREADY_BANNED;
 
 		const ret = await (async () => {
+			// add modlog entry
+			const { log: modlog } = await Moderation.createModLogEntry({
+				type: options.duration ? ModLogType.TEMP_BAN : ModLogType.PERM_BAN,
+				user: user,
+				moderator: moderator.id,
+				reason: options.reason,
+				duration: options.duration,
+				guild: this,
+				evidence: options.evidence
+			});
+			if (!modlog) return banResponse.MODLOG_ERROR;
+			caseID = modlog.id;
+
 			// dm user
 			dmSuccessEvent = await Moderation.punishDM({
+				modlog: modlog.id,
 				guild: this,
 				user: user,
 				punishment: 'banned',
@@ -187,24 +201,11 @@ export class BushGuild extends Guild {
 			const banSuccess = await this.bans
 				.create(user?.id ?? options.user, {
 					reason: `${moderator.tag} | ${options.reason ?? 'No reason provided.'}`,
-					days: options.deleteDays
+					deleteMessageDays: options.deleteDays
 				})
 				.catch(() => false);
 			if (!banSuccess) return banResponse.ACTION_ERROR;
 
-			// add modlog entry
-			const { log: modlog } = await Moderation.createModLogEntry({
-				type: options.duration ? ModLogType.TEMP_BAN : ModLogType.PERM_BAN,
-				user: user,
-				moderator: moderator.id,
-				reason: options.reason,
-				duration: options.duration,
-				guild: this,
-				evidence: options.evidence
-			});
-			if (!modlog) return banResponse.MODLOG_ERROR;
-			caseID = modlog.id;
-
 			// add punishment entry so they can be unbanned later
 			const punishmentEntrySuccess = await Moderation.createPunishmentEntry({
 				type: 'ban',
-- 
cgit