refactor: minor tweaks

Author: DuckySoLucky

src/Logger.js

@@ -116,7 +116,7 @@ function warnMessage(message) {
 }
 
 function errorMessage(error) {
-  const errorString = `${error.toString()}${error.stack?.replace(error.toString(), "")}`;
+  const errorString = `${error.toString()}${error.stack?.replace(error.toString(), "") ?? ""}`;
   if (config.other.logToFiles) {
     errorLogger.log("error", errorString);
   }

src/contracts/helperFunctions.js

@@ -239,7 +239,7 @@ function splitMessage(message, amount) {
 
 /**
  * Formats an error message
- * @param {Error} error
+ * @param {Error | unknown} error
  * @returns {string}
  */
 function formatError(error) {

src/discord/DiscordManager.js

@@ -100,7 +100,7 @@ class DiscordManager extends CommunicationBridge {
 
     const channel = await this.stateHandler.getChannel(chat || "Guild");
     if (channel === undefined) {
-      console.error(`Channel ${chat} not found!`);
+      console.error(`Channel ${chat.replace(/§[0-9a-fk-or]/g, "").trim()} not found!`);
       return;
     }
 
@@ -179,7 +179,7 @@ class DiscordManager extends CommunicationBridge {
 
     channel = await this.stateHandler.getChannel(channel);
     if (channel === undefined) {
-      console.log(`Channel ${channel} not found!`);
+      console.log(`Channel ${channel.replace(/§[0-9a-fk-or]/g, "").trim()} not found!`);
     }
 
     channel.send({
@@ -197,7 +197,7 @@ class DiscordManager extends CommunicationBridge {
 
     channel = await this.stateHandler.getChannel(channel);
     if (channel === undefined) {
-      console.log(`Channel ${channel} not found!`);
+      console.log(`Channel ${channel.replace(/§[0-9a-fk-or]/g, "").trim()} not found!`);
       return;
     }
 
@@ -220,7 +220,7 @@ class DiscordManager extends CommunicationBridge {
 
     channel = await this.stateHandler.getChannel(channel);
     if (channel === undefined) {
-      console.log(`Channel ${channel} not found!`);
+      console.log(`Channel ${channel.replace(/§[0-9a-fk-or]/g, "").trim()} not found!`);
       return;
     }
 

src/minecraft/CommandHandler.js

@@ -46,22 +46,23 @@ class CommandHandler {
         return;
       }
 
-      bot.chat(`/${officer ? "oc" : "gc"} [SOOPY V2] ${message}`);
+      const chat = officer ? "oc" : "gc";
 
-      console.minecraft(`${player} - [${command}] ${message}`);
+      bot.chat(`/${chat} [SOOPY V2] ${message}`);
 
+      console.minecraft(`${player} - [${command}] ${message}`);
       (async () => {
         try {
           const URI = encodeURI(`https://soopy.dev/api/guildBot/runCommand?user=${player}&cmd=${message.slice(1)}`);
           const response = await axios.get(URI);
 
           if (response?.data?.msg === undefined) {
-            return bot.chat(`/${officer ? "oc" : "gc"} [SOOPY V2] An error occured while running the command`);
+            return bot.chat(`/${chat} [SOOPY V2] An error occured while running the command`);
           }
 
-          bot.chat(`/${officer ? "oc" : "gc"} [SOOPY V2] ${response.data.msg}`);
+          bot.chat(`/${chat} [SOOPY V2] ${response.data.msg}`);
         } catch (e) {
-          bot.chat(`/${officer ? "oc" : "gc"} [SOOPY V2] ${e.cause ?? e.message ?? "Unknown error"}`);
+          bot.chat(`/${chat} [SOOPY V2] ${e.cause ?? e.message ?? "Unknown error"}`);
         }
       })();
     }