Merge pull request #159 from CatalysmsServerManager/Adjust-replies-fo…

…r-commands-on-error Do not reply with the error message on command failure
CatalysmsServerManager · Jul 11, 2020 · cce6a38 · cce6a38
2 parents f0bf975 + 04aa86c
commit cce6a38
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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!`);
       }
     }
   }