From 71b0d425927efbdb154d343f2da463e884e8a74e Mon Sep 17 00:00:00 2001
From: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
Date: Tue, 17 Aug 2021 13:58:51 -0400
Subject: fix viewraw command

---
 src/commands/utilities/viewraw.ts         | 3 ++-
 src/listeners/client/interactionCreate.ts | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/commands/utilities/viewraw.ts b/src/commands/utilities/viewraw.ts
index f6be382..bc79b7a 100644
--- a/src/commands/utilities/viewraw.ts
+++ b/src/commands/utilities/viewraw.ts
@@ -77,6 +77,7 @@ export default class ViewRawCommand extends BushCommand {
 					? inspect(JSON.stringify(message.toJSON()))
 					: inspect(message.toJSON()) || '[No Content]'
 				: message.content || '[No Content]';
+		const lang = options.json ? 'json' : options.js ? 'js' : undefined;
 		return (
 			new MessageEmbed()
 				.setFooter(message.author.tag, message.author.avatarURL({ dynamic: true }) ?? undefined)
@@ -84,7 +85,7 @@ export default class ViewRawCommand extends BushCommand {
 				// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
 				.setColor(message.member?.roles?.color?.color || util.colors.default)
 				.setTitle('Raw Message Information')
-				.setDescription(await util.codeblock(content, 2048, 'js'))
+				.setDescription(await util.codeblock(content, 2048, lang))
 		);
 	}
 }
diff --git a/src/listeners/client/interactionCreate.ts b/src/listeners/client/interactionCreate.ts
index f711db1..63775dd 100644
--- a/src/listeners/client/interactionCreate.ts
+++ b/src/listeners/client/interactionCreate.ts
@@ -38,13 +38,13 @@ export default class InteractionCreateListener extends BushListener {
 				ephemeral: true
 			});
 		} else if (interaction.isContextMenu()) {
-			if (interaction.id === 'View Raw') {
+			if (interaction.commandName === 'View Raw') {
 				await interaction.deferReply({ ephemeral: true });
 				const embed = await ViewRawCommand.getRawData(interaction.options.getMessage('message') as BushMessage, {
 					json: false,
 					js: false
 				});
-				return await interaction.reply({ embeds: [embed], ephemeral: true });
+				return await interaction.editReply({ embeds: [embed] });
 			}
 		}
 	}
-- 
cgit