From f9e134300301f670b2a5bad3d468333130bfbe4a Mon Sep 17 00:00:00 2001
From: almeidx <almeidx@pm.me>
Date: Wed, 28 Jul 2021 23:40:20 +0100
Subject: [PATCH] use User#displayAvatarURL and dont encode reason

---
 backend/src/plugins/ModActions/commands/CasesModCmd.ts       | 2 +-
 backend/src/plugins/ModActions/commands/CasesUserCmd.ts      | 2 +-
 backend/src/plugins/ModActions/commands/ForcebanCmd.ts       | 2 +-
 backend/src/plugins/ModActions/commands/UnbanCmd.ts          | 2 +-
 backend/src/plugins/ModActions/functions/banUserId.ts        | 2 +-
 backend/src/plugins/ModActions/functions/kickMember.ts       | 2 +-
 .../src/plugins/ModActions/functions/outdatedTempbansLoop.ts | 5 +----
 backend/src/plugins/Utility/commands/AvatarCmd.ts            | 2 +-
 backend/src/plugins/Utility/functions/getUserInfoEmbed.ts    | 2 +-
 9 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/backend/src/plugins/ModActions/commands/CasesModCmd.ts b/backend/src/plugins/ModActions/commands/CasesModCmd.ts
index 6b06c56c..9569e859 100644
--- a/backend/src/plugins/ModActions/commands/CasesModCmd.ts
+++ b/backend/src/plugins/ModActions/commands/CasesModCmd.ts
@@ -57,7 +57,7 @@ export const CasesModCmd = modActionsCmd({
         const embed: MessageEmbedOptions = {
           author: {
             name: title,
-            iconURL: mod instanceof User ? mod.avatarURL() || mod.defaultAvatarURL : undefined,
+            iconURL: mod instanceof User ? mod.displayAvatarURL() : undefined,
           },
           fields: [
             ...getChunkedEmbedFields(emptyEmbedValue, lines.join("\n")),
diff --git a/backend/src/plugins/ModActions/commands/CasesUserCmd.ts b/backend/src/plugins/ModActions/commands/CasesUserCmd.ts
index ac1d2eb5..f551369f 100644
--- a/backend/src/plugins/ModActions/commands/CasesUserCmd.ts
+++ b/backend/src/plugins/ModActions/commands/CasesUserCmd.ts
@@ -119,7 +119,7 @@ export const CasesUserCmd = modActionsCmd({
                 lineChunks.length === 1
                   ? `Cases for ${userName} (${lines.length} total)`
                   : `Cases ${chunkStart}–${chunkEnd} of ${lines.length} for ${userName}`,
-              icon_url: user instanceof User ? user.avatarURL() || user.defaultAvatarURL : undefined,
+              icon_url: user instanceof User ? user.displayAvatarURL() : undefined,
             },
             fields: [
               ...getChunkedEmbedFields(emptyEmbedValue, linesInChunk.join("\n")),
diff --git a/backend/src/plugins/ModActions/commands/ForcebanCmd.ts b/backend/src/plugins/ModActions/commands/ForcebanCmd.ts
index b7ff84da..67df9ece 100644
--- a/backend/src/plugins/ModActions/commands/ForcebanCmd.ts
+++ b/backend/src/plugins/ModActions/commands/ForcebanCmd.ts
@@ -70,7 +70,7 @@ export const ForcebanCmd = modActionsCmd({
       // FIXME: Use banUserId()?
       await pluginData.guild.bans.create(user.id as Snowflake, {
         days: 1,
-        reason: reason != null ? encodeURIComponent(reason) : undefined,
+        reason: reason ?? undefined,
       });
     } catch {
       sendErrorMessage(pluginData, msg.channel, "Failed to forceban member");
diff --git a/backend/src/plugins/ModActions/commands/UnbanCmd.ts b/backend/src/plugins/ModActions/commands/UnbanCmd.ts
index e425ddee..38bb49f0 100644
--- a/backend/src/plugins/ModActions/commands/UnbanCmd.ts
+++ b/backend/src/plugins/ModActions/commands/UnbanCmd.ts
@@ -51,7 +51,7 @@ export const UnbanCmd = modActionsCmd({
 
     try {
       ignoreEvent(pluginData, IgnoredEventType.Unban, user.id);
-      await pluginData.guild.bans.remove(user.id as Snowflake, reason != null ? encodeURIComponent(reason) : undefined);
+      await pluginData.guild.bans.remove(user.id as Snowflake, reason ?? undefined);
     } catch {
       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 25613f7d..3462842d 100644
--- a/backend/src/plugins/ModActions/functions/banUserId.ts
+++ b/backend/src/plugins/ModActions/functions/banUserId.ts
@@ -80,7 +80,7 @@ export async function banUserId(
     const deleteMessageDays = Math.min(30, Math.max(0, banOptions.deleteMessageDays ?? 1));
     await pluginData.guild.bans.create(userId as Snowflake, {
       days: deleteMessageDays,
-      reason: reason != null ? encodeURIComponent(reason) : undefined,
+      reason: reason ?? undefined,
     });
   } catch (e) {
     let errorMessage;
diff --git a/backend/src/plugins/ModActions/functions/kickMember.ts b/backend/src/plugins/ModActions/functions/kickMember.ts
index 5aa3d853..3ffcab6b 100644
--- a/backend/src/plugins/ModActions/functions/kickMember.ts
+++ b/backend/src/plugins/ModActions/functions/kickMember.ts
@@ -49,7 +49,7 @@ export async function kickMember(
   pluginData.state.serverLogs.ignoreLog(LogType.MEMBER_KICK, member.id);
   ignoreEvent(pluginData, IgnoredEventType.Kick, member.id);
   try {
-    await member.kick(reason != null ? encodeURIComponent(reason) : undefined);
+    await member.kick(reason ?? undefined);
   } catch (e) {
     return {
       status: "failed",
diff --git a/backend/src/plugins/ModActions/functions/outdatedTempbansLoop.ts b/backend/src/plugins/ModActions/functions/outdatedTempbansLoop.ts
index fdf957ea..935e16a4 100644
--- a/backend/src/plugins/ModActions/functions/outdatedTempbansLoop.ts
+++ b/backend/src/plugins/ModActions/functions/outdatedTempbansLoop.ts
@@ -32,10 +32,7 @@ export async function outdatedTempbansLoop(pluginData: GuildPluginData<ModAction
     );
     try {
       ignoreEvent(pluginData, IgnoredEventType.Unban, tempban.user_id);
-      await pluginData.guild.bans.remove(
-        tempban.user_id as Snowflake,
-        reason != null ? encodeURIComponent(reason) : undefined,
-      );
+      await pluginData.guild.bans.remove(tempban.user_id as Snowflake, reason ?? undefined);
     } catch (e) {
       pluginData.state.serverLogs.log(LogType.BOT_ALERT, {
         body: `Encountered an error trying to automatically unban ${tempban.user_id} after tempban timeout`,
diff --git a/backend/src/plugins/Utility/commands/AvatarCmd.ts b/backend/src/plugins/Utility/commands/AvatarCmd.ts
index c8c80620..7fe01bb9 100644
--- a/backend/src/plugins/Utility/commands/AvatarCmd.ts
+++ b/backend/src/plugins/Utility/commands/AvatarCmd.ts
@@ -16,7 +16,7 @@ export const AvatarCmd = utilityCmd({
   async run({ message: msg, args, pluginData }) {
     const user = args.user || msg.author;
     if (!(user instanceof UnknownUser)) {
-      const avatar = user.avatarURL() || user.defaultAvatarURL;
+      const avatar = user.displayAvatarURL();
       let extension = avatar.slice(avatar.lastIndexOf("."), avatar.lastIndexOf("?"));
       // Some pngs can have the .jpg extention for some reason, so we always use .png for static images
       extension = extension === ".gif" ? extension : ".png";
diff --git a/backend/src/plugins/Utility/functions/getUserInfoEmbed.ts b/backend/src/plugins/Utility/functions/getUserInfoEmbed.ts
index e45d801b..581193fb 100644
--- a/backend/src/plugins/Utility/functions/getUserInfoEmbed.ts
+++ b/backend/src/plugins/Utility/functions/getUserInfoEmbed.ts
@@ -39,7 +39,7 @@ export async function getUserInfoEmbed(
     name: `User:  ${user.username}#${user.discriminator}`,
   };
 
-  const avatarURL = user.avatarURL() || user.defaultAvatarURL;
+  const avatarURL = user.displayAvatarURL();
   embed.author.icon_url = avatarURL;
 
   const createdAt = moment.utc(user.createdAt, "x");