Fix

FirezTheGreat · Oct 22, 2022 · f5e660f · f5e660f
1 parent 5bb17bc
commit f5e660f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/commands/moderation/force.js b/commands/moderation/force.js
@@ -341,11 +341,12 @@ module.exports = class Force extends Command {
 
                 const embedMessage = await interaction.guild.channels.cache.get(Channels.ScreenshotVerificationId).messages.fetch(match.message_id);
 
-                embedMessage.embeds[0].fields = [
-                    { name: GameSides[GameTheme][0], value: match.coalition.players.map((player, index) => index === 0 ? `${player.name} (C)` : player.name).join('\n'), inline: true },
-                    { name: GameSides[GameTheme][1], value: match.breach.players.map((player, index) => index === 0 ? `${player.name} (C)` : player.name).join('\n'), inline: true },
-                    { name: 'Host', value: match.host.name, inline: true }
-                ];
+                embedMessage.embeds[0] = new EmbedBuilder.from(embedMessage.embeds[0])
+                    .setFields(
+                        { name: GameSides[GameTheme][0], value: match.coalition.players.map((player, index) => index === 0 ? `${player.name} (C)` : player.name).join('\n'), inline: true },
+                        { name: GameSides[GameTheme][1], value: match.breach.players.map((player, index) => index === 0 ? `${player.name} (C)` : player.name).join('\n'), inline: true },
+                        { name: 'Host', value: match.host.name, inline: true }
+                    );
 
                 const replace_embed = new EmbedBuilder()
                     .setAuthor({ name: interaction.guild.name, iconURL: interaction.guild.iconURL() })
@@ -359,7 +360,7 @@ module.exports = class Force extends Command {
                     .setFooter({ text: `Moderator - ${interaction.user.username}`, iconURL: interaction.user.displayAvatarURL() })
                     .setTimestamp();
 
-                await embedMessage.edit({ embeds: [embedMessage] });
+                await embedMessage.edit({ embeds: [embedMessage.embeds[0]] });
                 return await interaction.editReply({ embeds: [replace_embed] });
             } else if (sub_command === 'team') {
 

diff --git a/commands/utility/submit.js b/commands/utility/submit.js
@@ -125,7 +125,7 @@ module.exports = class Submit extends Command {
                         .setFooter({ text: 'Senior Moderators have verified the screenshot!', iconURL: interaction.guild.iconURL() })
 
                     const new_message = await this.bot.utils.auditSend(Channels.VerifiedScreenshotId, { embeds: [submit_embed] });
-                    message.deletable ? await message.delete() : null;
+                    message.deletable ? message.delete().catch(() => null) : null;
 
                     await MatchStats.updateOne(
                         { id: code },
@@ -144,10 +144,10 @@ module.exports = class Submit extends Command {
                         }
                     );
 
-                    return submit_message.deletable ? await submit_message.delete() : null;
+                    return submit_message.deletable ? submit_message.delete().catch(() => null) : null;
                 });
             } else {
-                return submit_message.deletable ? await submit_message.delete() : null;
+                return submit_message.deletable ? submit_message.delete().catch(() => null) : null;
             };
         } catch (error) {
             console.error(error);