From afe0ec1194e7f7f765ad7fc52f84e88c4e416111 Mon Sep 17 00:00:00 2001
From: almeidx <almeidx@pm.me>
Date: Thu, 29 Jul 2021 10:08:55 +0100
Subject: [PATCH] removed unnecessary string literal and simplified stuff

---
 backend/src/pluginUtils.ts                                  | 4 ++--
 backend/src/plugins/Cases/functions/createCase.ts           | 6 +++---
 backend/src/plugins/Cases/functions/createCaseNote.ts       | 2 +-
 backend/src/plugins/ModActions/commands/CasesModCmd.ts      | 2 +-
 backend/src/plugins/ModActions/commands/CasesUserCmd.ts     | 2 +-
 backend/src/plugins/ModActions/commands/DeleteCaseCmd.ts    | 2 +-
 backend/src/plugins/ModActions/commands/NoteCmd.ts          | 2 +-
 backend/src/plugins/Mutes/commands/MutesCmd.ts              | 2 +-
 backend/src/plugins/NameHistory/commands/NamesCmd.ts        | 4 ++--
 backend/src/plugins/Post/util/actualPostCmd.ts              | 2 +-
 .../plugins/ReactionRoles/events/ButtonInteractionEvt.ts    | 6 ++----
 .../Starboard/util/createStarboardEmbedFromMessage.ts       | 2 +-
 backend/src/plugins/UsernameSaver/updateUsername.ts         | 2 +-
 backend/src/plugins/Utility/commands/HelpCmd.ts             | 2 +-
 backend/src/plugins/Utility/functions/getServerInfoEmbed.ts | 2 +-
 backend/src/plugins/Utility/search.ts                       | 4 ++--
 backend/src/utils/configAccessibleObjects.ts                | 2 +-
 17 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/backend/src/pluginUtils.ts b/backend/src/pluginUtils.ts
index 733ba59a..14dcf85e 100644
--- a/backend/src/pluginUtils.ts
+++ b/backend/src/pluginUtils.ts
@@ -198,7 +198,7 @@ export async function sendSuccessMessage(
   return channel
     .send({ ...content }) // Force line break
     .catch(err => {
-      const channelInfo = channel.guild ? `${channel.id} (${channel.guild.id})` : `${channel.id}`;
+      const channelInfo = channel.guild ? `${channel.id} (${channel.guild.id})` : channel.id;
       logger.warn(`Failed to send success message to ${channelInfo}): ${err.code} ${err.message}`);
       return undefined;
     });
@@ -219,7 +219,7 @@ export async function sendErrorMessage(
   return channel
     .send({ ...content }) // Force line break
     .catch(err => {
-      const channelInfo = channel.guild ? `${channel.id} (${channel.guild.id})` : `${channel.id}`;
+      const channelInfo = channel.guild ? `${channel.id} (${channel.guild.id})` : channel.id;
       logger.warn(`Failed to send error message to ${channelInfo}): ${err.code} ${err.message}`);
       return undefined;
     });
diff --git a/backend/src/plugins/Cases/functions/createCase.ts b/backend/src/plugins/Cases/functions/createCase.ts
index 5a03c1c2..9df38f26 100644
--- a/backend/src/plugins/Cases/functions/createCase.ts
+++ b/backend/src/plugins/Cases/functions/createCase.ts
@@ -7,15 +7,15 @@ import { postCaseToCaseLogChannel } from "./postToCaseLogChannel";
 
 export async function createCase(pluginData: GuildPluginData<CasesPluginType>, args: CaseArgs) {
   const user = await resolveUser(pluginData.client, args.userId);
-  const userName = `${user.tag}`;
+  const userName = user.tag;
 
   const mod = await resolveUser(pluginData.client, args.modId);
-  const modName = `${mod.tag}`;
+  const modName = mod.tag;
 
   let ppName: string | null = null;
   if (args.ppId) {
     const pp = await resolveUser(pluginData.client, args.ppId);
-    ppName = `${pp.tag}`;
+    ppName = pp.tag;
   }
 
   if (args.auditLogId) {
diff --git a/backend/src/plugins/Cases/functions/createCaseNote.ts b/backend/src/plugins/Cases/functions/createCaseNote.ts
index 2f9d801c..c03a5b3c 100644
--- a/backend/src/plugins/Cases/functions/createCaseNote.ts
+++ b/backend/src/plugins/Cases/functions/createCaseNote.ts
@@ -16,7 +16,7 @@ export async function createCaseNote(pluginData: GuildPluginData<CasesPluginType
     throw new RecoverablePluginError(ERRORS.INVALID_USER);
   }
 
-  const modName = `${mod.tag}`;
+  const modName = mod.tag;
 
   let body = args.body;
 
diff --git a/backend/src/plugins/ModActions/commands/CasesModCmd.ts b/backend/src/plugins/ModActions/commands/CasesModCmd.ts
index 0622bfed..45acbb73 100644
--- a/backend/src/plugins/ModActions/commands/CasesModCmd.ts
+++ b/backend/src/plugins/ModActions/commands/CasesModCmd.ts
@@ -29,7 +29,7 @@ export const CasesModCmd = modActionsCmd({
   async run({ pluginData, message: msg, args }) {
     const modId = args.mod || msg.author.id;
     const mod = await resolveUser(pluginData.client, modId);
-    const modName = mod instanceof User ? `${mod.tag}` : modId;
+    const modName = mod instanceof User ? mod.tag : modId;
 
     const casesPlugin = pluginData.getPlugin(CasesPlugin);
     const totalCases = await casesPlugin.getTotalCasesByMod(modId);
diff --git a/backend/src/plugins/ModActions/commands/CasesUserCmd.ts b/backend/src/plugins/ModActions/commands/CasesUserCmd.ts
index b7def31c..39d4050b 100644
--- a/backend/src/plugins/ModActions/commands/CasesUserCmd.ts
+++ b/backend/src/plugins/ModActions/commands/CasesUserCmd.ts
@@ -61,7 +61,7 @@ export const CasesUserCmd = modActionsCmd({
     const normalCases = cases.filter(c => !c.is_hidden);
     const hiddenCases = cases.filter(c => c.is_hidden);
 
-    const userName = user instanceof UnknownUser && cases.length ? cases[cases.length - 1].user_name : `${user.tag}`;
+    const userName = user instanceof UnknownUser && cases.length ? cases[cases.length - 1].user_name : user.tag;
 
     if (cases.length === 0) {
       msg.channel.send(`No cases found for **${userName}**`);
diff --git a/backend/src/plugins/ModActions/commands/DeleteCaseCmd.ts b/backend/src/plugins/ModActions/commands/DeleteCaseCmd.ts
index b783fbbd..925d97c6 100644
--- a/backend/src/plugins/ModActions/commands/DeleteCaseCmd.ts
+++ b/backend/src/plugins/ModActions/commands/DeleteCaseCmd.ts
@@ -68,7 +68,7 @@ export const DeleteCaseCmd = modActionsCmd({
         }
       }
 
-      const deletedByName = `${message.author.tag}`;
+      const deletedByName = message.author.tag;
 
       const timeAndDate = pluginData.getPlugin(TimeAndDatePlugin);
       const deletedAt = timeAndDate.inGuildTz().format(timeAndDate.getDateFormat("pretty_datetime"));
diff --git a/backend/src/plugins/ModActions/commands/NoteCmd.ts b/backend/src/plugins/ModActions/commands/NoteCmd.ts
index 0fbd1dbd..3ed21806 100644
--- a/backend/src/plugins/ModActions/commands/NoteCmd.ts
+++ b/backend/src/plugins/ModActions/commands/NoteCmd.ts
@@ -30,7 +30,7 @@ export const NoteCmd = modActionsCmd({
       return;
     }
 
-    const userName = `${user.tag}`;
+    const userName = user.tag;
     const reason = formatReasonWithAttachments(args.note, msg.attachments.array());
 
     const casesPlugin = pluginData.getPlugin(CasesPlugin);
diff --git a/backend/src/plugins/Mutes/commands/MutesCmd.ts b/backend/src/plugins/Mutes/commands/MutesCmd.ts
index 4ee88e74..5de51a3d 100644
--- a/backend/src/plugins/Mutes/commands/MutesCmd.ts
+++ b/backend/src/plugins/Mutes/commands/MutesCmd.ts
@@ -119,7 +119,7 @@ export const MutesCmd = mutesCmd({
 
       lines = filteredMutes.map(mute => {
         const user = pluginData.client.users.resolve(mute.user_id as Snowflake);
-        const username = user ? `${user.tag}` : "Unknown#0000";
+        const username = user ? user.tag : "Unknown#0000";
         const theCase = muteCasesById.get(mute.case_id);
         const caseName = theCase ? `Case #${theCase.case_number}` : "No case";
 
diff --git a/backend/src/plugins/NameHistory/commands/NamesCmd.ts b/backend/src/plugins/NameHistory/commands/NamesCmd.ts
index 0ee42166..710e7ba6 100644
--- a/backend/src/plugins/NameHistory/commands/NamesCmd.ts
+++ b/backend/src/plugins/NameHistory/commands/NamesCmd.ts
@@ -30,8 +30,8 @@ export const NamesCmd = nameHistoryCmd({
     );
     const usernameRows = usernames.map(r => `\`[${r.timestamp}]\` **${disableCodeBlocks(r.username)}**`);
 
-    const user = await pluginData.client.users.fetch(args.userId as Snowflake);
-    const currentUsername = user ? `${user.tag}` : args.userId;
+    const user = await pluginData.client.users.fetch(args.userId as Snowflake).catch(() => null);
+    const currentUsername = user ? user.tag : args.userId;
 
     const nicknameDays = Math.round(NICKNAME_RETENTION_PERIOD / DAYS);
     const usernameDays = Math.round(NICKNAME_RETENTION_PERIOD / DAYS);
diff --git a/backend/src/plugins/Post/util/actualPostCmd.ts b/backend/src/plugins/Post/util/actualPostCmd.ts
index db8f51a4..54492c10 100644
--- a/backend/src/plugins/Post/util/actualPostCmd.ts
+++ b/backend/src/plugins/Post/util/actualPostCmd.ts
@@ -138,7 +138,7 @@ export async function actualPostCmd(
 
     await pluginData.state.scheduledPosts.create({
       author_id: msg.author.id,
-      author_name: `${msg.author.tag}`,
+      author_name: msg.author.tag,
       channel_id: targetChannel.id,
       content,
       attachments: msg.attachments.array(),
diff --git a/backend/src/plugins/ReactionRoles/events/ButtonInteractionEvt.ts b/backend/src/plugins/ReactionRoles/events/ButtonInteractionEvt.ts
index a08e4579..3d7fb3d5 100644
--- a/backend/src/plugins/ReactionRoles/events/ButtonInteractionEvt.ts
+++ b/backend/src/plugins/ReactionRoles/events/ButtonInteractionEvt.ts
@@ -17,10 +17,8 @@ export const ButtonInteractionEvt = reactionRolesEvt({
   event: "interactionCreate",
 
   async listener(meta) {
-    const int = meta.args.interaction.isMessageComponent()
-      ? (meta.args.interaction as MessageComponentInteraction)
-      : null;
-    if (!int) return;
+    const int = meta.args.interaction;
+    if (!int.isMessageComponent()) return;
 
     const cfg = meta.pluginData.config.get();
     const split = int.customId.split(BUTTON_CONTEXT_SEPARATOR);
diff --git a/backend/src/plugins/Starboard/util/createStarboardEmbedFromMessage.ts b/backend/src/plugins/Starboard/util/createStarboardEmbedFromMessage.ts
index e1fe0aed..dc6e8781 100644
--- a/backend/src/plugins/Starboard/util/createStarboardEmbedFromMessage.ts
+++ b/backend/src/plugins/Starboard/util/createStarboardEmbedFromMessage.ts
@@ -18,7 +18,7 @@ export function createStarboardEmbedFromMessage(
       text: `#${(msg.channel as GuildChannel).name}`,
     },
     author: {
-      name: `${msg.author.tag}`,
+      name: msg.author.tag,
     },
     fields: [],
     timestamp: msg.createdTimestamp,
diff --git a/backend/src/plugins/UsernameSaver/updateUsername.ts b/backend/src/plugins/UsernameSaver/updateUsername.ts
index baaa3bd1..207e6540 100644
--- a/backend/src/plugins/UsernameSaver/updateUsername.ts
+++ b/backend/src/plugins/UsernameSaver/updateUsername.ts
@@ -4,7 +4,7 @@ import { UsernameSaverPluginType } from "./types";
 
 export async function updateUsername(pluginData: GuildPluginData<UsernameSaverPluginType>, user: User) {
   if (!user) return;
-  const newUsername = `${user.tag}`;
+  const newUsername = user.tag;
   const latestEntry = await pluginData.state.usernameHistory.getLastEntry(user.id);
   if (!latestEntry || newUsername !== latestEntry.username) {
     await pluginData.state.usernameHistory.addEntry(user.id, newUsername);
diff --git a/backend/src/plugins/Utility/commands/HelpCmd.ts b/backend/src/plugins/Utility/commands/HelpCmd.ts
index d53f19b4..112e932e 100644
--- a/backend/src/plugins/Utility/commands/HelpCmd.ts
+++ b/backend/src/plugins/Utility/commands/HelpCmd.ts
@@ -80,7 +80,7 @@ export const HelpCmd = utilityCmd({
         ? `Results (${totalResults} total, showing first ${limitedResults.length}):\n\n`
         : "";
 
-    message += `${commandSnippets.join("\n\n")}`;
+    message += commandSnippets.join("\n\n");
     createChunkedMessage(msg.channel, message);
   },
 });
diff --git a/backend/src/plugins/Utility/functions/getServerInfoEmbed.ts b/backend/src/plugins/Utility/functions/getServerInfoEmbed.ts
index 93b4d45e..13e0652f 100644
--- a/backend/src/plugins/Utility/functions/getServerInfoEmbed.ts
+++ b/backend/src/plugins/Utility/functions/getServerInfoEmbed.ts
@@ -65,7 +65,7 @@ export async function getServerInfoEmbed(
 
   if (thisServer) {
     const owner = await resolveUser(pluginData.client, thisServer.ownerId);
-    const ownerName = `${owner.tag}`;
+    const ownerName = owner.tag;
 
     basicInformation.push(`Owner: **${ownerName}** (\`${thisServer.ownerId}\`)`);
     // basicInformation.push(`Voice region: **${thisServer.region}**`); Outdated, as automatic voice regions are fully live
diff --git a/backend/src/plugins/Utility/search.ts b/backend/src/plugins/Utility/search.ts
index 97bc1bd4..45f77cd4 100644
--- a/backend/src/plugins/Utility/search.ts
+++ b/backend/src/plugins/Utility/search.ts
@@ -391,7 +391,7 @@ async function performMemberSearch(
         return true;
       }
 
-      const fullUsername = `${member.user.tag}`;
+      const fullUsername = member.user.tag;
       if (await execRegExp(queryRegex, fullUsername).catch(allowTimeout)) return true;
 
       return false;
@@ -458,7 +458,7 @@ async function performBanSearch(
 
     const execRegExp = getOptimizedRegExpRunner(pluginData, isSafeRegex);
     matchingBans = await asyncFilter(matchingBans, async user => {
-      const fullUsername = `${user.tag}`;
+      const fullUsername = user.tag;
       if (await execRegExp(queryRegex, fullUsername).catch(allowTimeout)) return true;
       return false;
     });
diff --git a/backend/src/utils/configAccessibleObjects.ts b/backend/src/utils/configAccessibleObjects.ts
index 14f13fec..379aaea0 100644
--- a/backend/src/utils/configAccessibleObjects.ts
+++ b/backend/src/utils/configAccessibleObjects.ts
@@ -40,7 +40,7 @@ export interface IConfigAccessibleMember extends IConfigAccessibleUser {
 }
 
 export function userToConfigAccessibleUser(user: User | UnknownUser): IConfigAccessibleUser {
-  if (`${user.tag}` === "Unknown#0000") {
+  if (user.tag === "Unknown#0000") {
     const toReturnPartial: IConfigAccessibleUser = {
       id: user.id,
       username: "Unknown",