From f4b4747d086bd831f8d9c20384e953f32ab39e71 Mon Sep 17 00:00:00 2001
From: almeidx <almeidx@pm.me>
Date: Thu, 29 Jul 2021 10:47:47 +0100
Subject: [PATCH] simplified

---
 backend/src/plugins/Utility/functions/getUserInfoEmbed.ts | 4 ++--
 backend/src/plugins/Utility/search.ts                     | 8 +-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/backend/src/plugins/Utility/functions/getUserInfoEmbed.ts b/backend/src/plugins/Utility/functions/getUserInfoEmbed.ts
index 4f87dabc..78970a0e 100644
--- a/backend/src/plugins/Utility/functions/getUserInfoEmbed.ts
+++ b/backend/src/plugins/Utility/functions/getUserInfoEmbed.ts
@@ -103,7 +103,7 @@ export async function getUserInfoEmbed(
     });
     const roles = member.roles.cache
       .map(role => pluginData.guild.roles.cache.get(role.id))
-      .filter(r => r != null) as Role[];
+      .filter((r): r is Role => !!r);
     roles.sort(sorter("position", "DESC"));
 
     embed.fields.push({
@@ -119,7 +119,7 @@ export async function getUserInfoEmbed(
       embed.fields.push({
         name: preEmbedPadding + "Voice information",
         value: trimLines(`
-          ${voiceChannel ? `Current voice channel: **${voiceChannel ? voiceChannel.name : "None"}**` : ""}
+          ${voiceChannel ? `Current voice channel: **${voiceChannel.name ?? "None"}**` : ""}
           ${member.voice.mute ? "Server voice muted: **Yes**" : ""}
           ${member.voice.deaf ? "Server voice deafened: **Yes**" : ""}
         `),
diff --git a/backend/src/plugins/Utility/search.ts b/backend/src/plugins/Utility/search.ts
index 45f77cd4..788eadc7 100644
--- a/backend/src/plugins/Utility/search.ts
+++ b/backend/src/plugins/Utility/search.ts
@@ -177,17 +177,11 @@ export async function displaySearch(
           .setEmoji("⬅")
           .setCustomId(`previousButton:${idMod}`)
           .setDisabled(currentPage === 1),
-      );
-
-      buttons.push(
         new MessageButton()
           .setStyle("SECONDARY")
           .setEmoji("➡")
           .setCustomId(`nextButton:${idMod}`)
           .setDisabled(currentPage === searchResult.lastPage),
-      );
-
-      buttons.push(
         new MessageButton()
           .setStyle("SECONDARY")
           .setEmoji("🔄")
@@ -325,7 +319,7 @@ async function performMemberSearch(
   }
 
   if (args.voice) {
-    matchingMembers = matchingMembers.filter(m => m.voice.channelId != null);
+    matchingMembers = matchingMembers.filter(m => m.voice.channelId);
   }
 
   if (args.bot) {