From 2b30c2677070bb81bc7a1f67c7daf539e94ec8fb Mon Sep 17 00:00:00 2001
From: Dark <7890309+DarkView@users.noreply.github.com>
Date: Fri, 23 Oct 2020 14:44:12 +0200
Subject: [PATCH] Strip moderator option to scalars

---
 backend/src/plugins/ModActions/functions/banUserId.ts  | 4 +++-
 backend/src/plugins/ModActions/functions/kickMember.ts | 4 +++-
 backend/src/plugins/ModActions/functions/warnMember.ts | 4 +++-
 backend/src/plugins/Mutes/functions/muteUser.ts        | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/backend/src/plugins/ModActions/functions/banUserId.ts b/backend/src/plugins/ModActions/functions/banUserId.ts
index 4c973af5..91536665 100644
--- a/backend/src/plugins/ModActions/functions/banUserId.ts
+++ b/backend/src/plugins/ModActions/functions/banUserId.ts
@@ -33,7 +33,9 @@ export async function banUserId(
     const banMessage = await renderTemplate(config.ban_message, {
       guildName: pluginData.guild.name,
       reason,
-      moderator: banOptions.caseArgs?.modId ? await resolveUser(pluginData.client, banOptions.caseArgs?.modId) : "",
+      moderator: banOptions.caseArgs?.modId
+        ? stripObjectToScalars(await resolveUser(pluginData.client, banOptions.caseArgs?.modId))
+        : "",
     });
 
     const contactMethods = banOptions?.contactMethods
diff --git a/backend/src/plugins/ModActions/functions/kickMember.ts b/backend/src/plugins/ModActions/functions/kickMember.ts
index 247fdcae..b0a7ec6e 100644
--- a/backend/src/plugins/ModActions/functions/kickMember.ts
+++ b/backend/src/plugins/ModActions/functions/kickMember.ts
@@ -26,7 +26,9 @@ export async function kickMember(
     const kickMessage = await renderTemplate(config.kick_message, {
       guildName: pluginData.guild.name,
       reason,
-      moderator: kickOptions.caseArgs?.modId ? await resolveUser(pluginData.client, kickOptions.caseArgs?.modId) : "",
+      moderator: kickOptions.caseArgs?.modId
+        ? stripObjectToScalars(await resolveUser(pluginData.client, kickOptions.caseArgs?.modId))
+        : "",
     });
 
     const contactMethods = kickOptions?.contactMethods
diff --git a/backend/src/plugins/ModActions/functions/warnMember.ts b/backend/src/plugins/ModActions/functions/warnMember.ts
index 6c9c5351..4e5b287e 100644
--- a/backend/src/plugins/ModActions/functions/warnMember.ts
+++ b/backend/src/plugins/ModActions/functions/warnMember.ts
@@ -20,7 +20,9 @@ export async function warnMember(
   const warnMessage = await renderTemplate(config.warn_message, {
     guildName: pluginData.guild.name,
     reason,
-    moderator: warnOptions.caseArgs?.modId ? await resolveUser(pluginData.client, warnOptions.caseArgs?.modId) : "",
+    moderator: warnOptions.caseArgs?.modId
+      ? stripObjectToScalars(await resolveUser(pluginData.client, warnOptions.caseArgs?.modId))
+      : "",
   });
   const contactMethods = warnOptions?.contactMethods
     ? warnOptions.contactMethods
diff --git a/backend/src/plugins/Mutes/functions/muteUser.ts b/backend/src/plugins/Mutes/functions/muteUser.ts
index d3207371..e311e942 100644
--- a/backend/src/plugins/Mutes/functions/muteUser.ts
+++ b/backend/src/plugins/Mutes/functions/muteUser.ts
@@ -87,7 +87,9 @@ export async function muteUser(
       guildName: pluginData.guild.name,
       reason: reason || "None",
       time: timeUntilUnmute,
-      moderator: muteOptions.caseArgs?.modId ? await resolveUser(pluginData.client, muteOptions.caseArgs?.modId) : "",
+      moderator: muteOptions.caseArgs?.modId
+        ? stripObjectToScalars(await resolveUser(pluginData.client, muteOptions.caseArgs?.modId))
+        : "",
     }));
 
   if (muteMessage && user instanceof User) {