From 8b3f2bc61af8c3a583e52c25ae4a72e9171271b2 Mon Sep 17 00:00:00 2001
From: Noah <noah@n0ahmc.com>
Date: Thu, 17 Feb 2022 19:57:11 -0600
Subject: [PATCH] Fix missing user or subuser

---
 Commands/close.js  | 15 +++++++++++----
 Commands/ticket.js |  7 +++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Commands/close.js b/Commands/close.js
index 7f0a9b2..d5f85ec 100644
--- a/Commands/close.js
+++ b/Commands/close.js
@@ -108,7 +108,12 @@ module.exports = new Command({
           "Ticket",
           `${interaction.channel.name} (${interaction.channel.id})`
         )
-        .addField("User", `${tUser}#${tUser.discriminator} (${tUser.id})`)
+        .addField(
+          "User",
+          `${tUser?.username || "N/A"}#${tUser?.discriminator || "N/A"} (${
+            tUser?.id || ticket.user
+          })`
+        )
         .addField("Closed By", interaction.user.tag)
         .addField("Reason", reason);
       const logEmbed = new Discord.MessageEmbed()
@@ -121,7 +126,9 @@ module.exports = new Command({
         )
         .addField(
           "User",
-          `${tUser.username}#${tUser.discriminator} (${tUser.id})`
+          `${tUser?.username || "N/A"}#${tUser?.discriminator || "N/A"} (${
+            tUser?.id || ticket.user
+          })`
         )
         .addField("Closed By", interaction.user.tag)
         .addField("Reason", reason);
@@ -156,7 +163,7 @@ module.exports = new Command({
           console.error(err);
         });
       await tUser
-        .send({ embeds: [transcriptEmbed], files: [file] })
+        ?.send({ embeds: [transcriptEmbed], files: [file] })
         .catch(async (err) => {
           console.error(err);
         });
@@ -164,7 +171,7 @@ module.exports = new Command({
         ticket.subUsers.forEach(async (subUser) => {
           await interaction.client.users.cache
             .get(subUser)
-            .send({ embeds: [transcriptEmbed], files: [file] });
+            ?.send({ embeds: [transcriptEmbed], files: [file] });
         });
       }
       await interaction.channel.delete().catch(async (error) => {
diff --git a/Commands/ticket.js b/Commands/ticket.js
index a14655f..ae5f358 100644
--- a/Commands/ticket.js
+++ b/Commands/ticket.js
@@ -101,7 +101,6 @@ module.exports = new Command({
           "Some roles seem to be missing!\nPlease check for errors when starting the bot.",
         ephemeral: true,
       });
-    const Author = interaction.user;
     let TicketCategory = await getCategory(
       supportbot.Departments[department].category || supportbot.TicketCategory,
       interaction.guild
@@ -117,7 +116,7 @@ module.exports = new Command({
             allow: [Permissions.FLAGS.VIEW_CHANNEL],
           },
           {
-            id: Author.id,
+            id: interaction.user.id,
             allow: [Permissions.FLAGS.VIEW_CHANNEL],
           },
           {
@@ -140,7 +139,7 @@ module.exports = new Command({
     await TicketData.tickets.push({
       id: ticketChannel.id,
       name: ticketChannel.name,
-      user: Author.id,
+      user: interaction.user.id,
       number: ticketNumberID,
       reason: TicketSubject,
       open: true,
@@ -271,7 +270,7 @@ module.exports = new Command({
         await ticketChannel.permissionOverwrites.edit(role.id, {
           VIEW_CHANNEL: true,
         });
-        await ticketChannel.permissionOverwrites.edit(Author.id, {
+        await ticketChannel.permissionOverwrites.edit(interaction.user.id, {
           SEND_MESSAGES: true,
         });