From ceb567ad9aa7f16a9de64de64ea8acfca6ddbd7b Mon Sep 17 00:00:00 2001
From: Dragory <2606411+Dragory@users.noreply.github.com>
Date: Wed, 5 Aug 2020 02:54:02 +0300
Subject: [PATCH] Don't send null/undefined as audit log reasons

---
 backend/src/plugins/ModActions/commands/ForcebanCmd.ts | 2 +-
 backend/src/plugins/ModActions/commands/MassBanCmd.ts  | 2 +-
 backend/src/plugins/ModActions/commands/UnbanCmd.ts    | 2 +-
 backend/src/plugins/ModActions/functions/banUserId.ts  | 6 +++++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/backend/src/plugins/ModActions/commands/ForcebanCmd.ts b/backend/src/plugins/ModActions/commands/ForcebanCmd.ts
index 43dd0072..72dd908b 100644
--- a/backend/src/plugins/ModActions/commands/ForcebanCmd.ts
+++ b/backend/src/plugins/ModActions/commands/ForcebanCmd.ts
@@ -64,7 +64,7 @@ export const ForcebanCmd = modActionsCommand({
     pluginData.state.serverLogs.ignoreLog(LogType.MEMBER_BAN, user.id);
 
     try {
-      await pluginData.guild.banMember(user.id, 1, encodeURIComponent(reason));
+      await pluginData.guild.banMember(user.id, 1, reason != null ? encodeURIComponent(reason) : undefined);
     } catch (e) {
       sendErrorMessage(pluginData, msg.channel, "Failed to forceban member");
       return;
diff --git a/backend/src/plugins/ModActions/commands/MassBanCmd.ts b/backend/src/plugins/ModActions/commands/MassBanCmd.ts
index 92404d1e..9f5063c1 100644
--- a/backend/src/plugins/ModActions/commands/MassBanCmd.ts
+++ b/backend/src/plugins/ModActions/commands/MassBanCmd.ts
@@ -66,7 +66,7 @@ export const MassbanCmd = modActionsCommand({
     const casesPlugin = pluginData.getPlugin(CasesPlugin);
     for (const userId of args.userIds) {
       try {
-        await pluginData.guild.banMember(userId, 1, encodeURIComponent(banReason));
+        await pluginData.guild.banMember(userId, 1, banReason != null ? encodeURIComponent(banReason) : undefined);
 
         await casesPlugin.createCase({
           userId,
diff --git a/backend/src/plugins/ModActions/commands/UnbanCmd.ts b/backend/src/plugins/ModActions/commands/UnbanCmd.ts
index 4b65f7dc..46db49c7 100644
--- a/backend/src/plugins/ModActions/commands/UnbanCmd.ts
+++ b/backend/src/plugins/ModActions/commands/UnbanCmd.ts
@@ -46,7 +46,7 @@ export const UnbanCmd = modActionsCommand({
 
     try {
       ignoreEvent(pluginData, IgnoredEventType.Unban, user.id);
-      await pluginData.guild.unbanMember(user.id, encodeURIComponent(reason));
+      await pluginData.guild.unbanMember(user.id, reason != null ? encodeURIComponent(reason) : undefined);
     } catch (e) {
       sendErrorMessage(pluginData, msg.channel, "Failed to unban member; are you sure they're banned?");
       return;
diff --git a/backend/src/plugins/ModActions/functions/banUserId.ts b/backend/src/plugins/ModActions/functions/banUserId.ts
index ae4bdf1d..0f3bfdd2 100644
--- a/backend/src/plugins/ModActions/functions/banUserId.ts
+++ b/backend/src/plugins/ModActions/functions/banUserId.ts
@@ -40,7 +40,11 @@ export async function banUserId(
   ignoreEvent(pluginData, IgnoredEventType.Ban, userId);
   try {
     const deleteMessageDays = Math.min(30, Math.max(0, banOptions.deleteMessageDays ?? 1));
-    await pluginData.guild.banMember(userId, deleteMessageDays, encodeURIComponent(reason));
+    await pluginData.guild.banMember(
+      userId,
+      deleteMessageDays,
+      reason != null ? encodeURIComponent(reason) : undefined,
+    );
   } catch (e) {
     return {
       status: "failed",