From 04aa86cb871a6f988bde585000781e5f11956093 Mon Sep 17 00:00:00 2001
From: niekcandaele <22315101+niekcandaele@users.noreply.github.com>
Date: Sat, 11 Jul 2020 14:21:48 +0200
Subject: [PATCH] Do not reply with the error message on command failure

---
 api/hooks/sdtdCommands/commands/callAdmin.js | 2 +-
 api/hooks/sdtdCommands/commands/claim.js     | 4 ++--
 api/hooks/sdtdCommands/customCommand.js      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/api/hooks/sdtdCommands/commands/callAdmin.js b/api/hooks/sdtdCommands/commands/callAdmin.js
index ef9b04a79..1229b995e 100644
--- a/api/hooks/sdtdCommands/commands/callAdmin.js
+++ b/api/hooks/sdtdCommands/commands/callAdmin.js
@@ -39,7 +39,7 @@ class callAdmin extends SdtdCommand {
 
     } catch (error) {
       sails.log.error(`HOOK - SdtdCommands:callAdmin - ${error}`);
-      return chatMessage.reply('error', { error: error });
+      return chatMessage.reply('error');
     }
   }
 }
diff --git a/api/hooks/sdtdCommands/commands/claim.js b/api/hooks/sdtdCommands/commands/claim.js
index f55abc207..8269548e3 100644
--- a/api/hooks/sdtdCommands/commands/claim.js
+++ b/api/hooks/sdtdCommands/commands/claim.js
@@ -66,7 +66,7 @@ class Claim extends SdtdCommand {
         }, cmdToExec);
 
         if (response.result.includes('ERR:')) {
-          return chatMessage.reply('error', { error: response.result });
+          return chatMessage.reply('error');
         }
 
         chatMessage.reply('claimItemGiven', {
@@ -78,7 +78,7 @@ class Claim extends SdtdCommand {
           claimed: true
         });
       } catch (error) {
-        chatMessage.reply('error', { error: error });
+        chatMessage.reply('error');
       }
 
     });
diff --git a/api/hooks/sdtdCommands/customCommand.js b/api/hooks/sdtdCommands/customCommand.js
index df166a87e..01f44cd38 100644
--- a/api/hooks/sdtdCommands/customCommand.js
+++ b/api/hooks/sdtdCommands/customCommand.js
@@ -111,8 +111,8 @@ class CustomCommand extends SdtdCommand {
 
 
       } catch (error) {
-        sails.log.error(`Custom command error - ${server.name} - ${chatMessage.messageText} - ${error}`);
-        chatMessage.reply(`Error! Contact your server admin with this message: ${error.toString().replace(/\"/g, '')}`);
+        sails.log.error(`Custom command error - server ${server.id} - ${chatMessage.messageText} - ${error}`);
+        chatMessage.reply(`Error, please contact your server admin!`);
       }
     }
   }