From 01d328815b949b20eab2969d6b98c7b8ee634c5d Mon Sep 17 00:00:00 2001
From: Chaiwat Suwannarat <dermhioasw123@gmail.com>
Date: Fri, 3 May 2024 20:00:23 +0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20Bugs=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/commands/messages/message.js | 12 ++++++------
 source/utils/consoleUtils.js        |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/commands/messages/message.js b/source/commands/messages/message.js
index b42f9fb0..3b996ec7 100644
--- a/source/commands/messages/message.js
+++ b/source/commands/messages/message.js
@@ -132,12 +132,12 @@ module.exports = {
         if (!inputChannel) {
           await interaction.channel.send({
             content: inputContent,
-            files: [inputAttachment],
+            files: inputAttachment ? [inputAttachment] : [],
           })
         } else {
           await inputChannel.send({
             content: inputContent,
-            files: [inputAttachment],
+            files: inputAttachment ? [inputAttachment] : [],
           })
         }
 
@@ -150,7 +150,7 @@ module.exports = {
         break
       case 'reply':
         try {
-          const message = await interaction.channel.message.fetch(inputID)
+          const message = await interaction.channel.messages.fetch(inputID)
 
           if (!message)
             return await interaction.reply({
@@ -162,7 +162,7 @@ module.exports = {
 
           await message.reply({
             content: inputContent,
-            files: [inputAttachment],
+            files: inputAttachment ? [inputAttachment] : [],
           })
         } catch (error) {
           catchError(
@@ -180,7 +180,7 @@ module.exports = {
         break
       case 'edit':
         try {
-          const message = await interaction.channel.message.fetch(inputID)
+          const message = await interaction.channel.messages.fetch(inputID)
 
           if (!message)
             return await interaction.reply({
@@ -199,7 +199,7 @@ module.exports = {
 
           await message.edit({
             content: inputContent,
-            files: [inputAttachment],
+            files: inputAttachment ? [inputAttachment] : [],
           })
         } catch (error) {
           catchError(
diff --git a/source/utils/consoleUtils.js b/source/utils/consoleUtils.js
index bffe8ad8..7786eb05 100644
--- a/source/utils/consoleUtils.js
+++ b/source/utils/consoleUtils.js
@@ -151,7 +151,7 @@ const catchError = async (client, message, name, error, silent = false) => {
           if (message.channel) await message.channel.reply(contents)
           else await message.reply(contents)
         }
-      } finally {
+      } catch {
         if (!silent) {
           if (message.channel) await message.channel.send(contents)
           else await message.send(contents)