From aebc21c20a6130b4b40816d71661af8650d14081 Mon Sep 17 00:00:00 2001 From: CoderCow Date: Thu, 25 Jul 2013 23:33:43 +0200 Subject: [PATCH] Minor REST improvements. --- TShockAPI/Rest/RestManager.cs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/TShockAPI/Rest/RestManager.cs b/TShockAPI/Rest/RestManager.cs index 7ef91fc1..df2a810d 100644 --- a/TShockAPI/Rest/RestManager.cs +++ b/TShockAPI/Rest/RestManager.cs @@ -141,7 +141,7 @@ namespace TShockAPI return RestInvalidParam("confirm"); // Inform players the server is shutting down - var reason = string.IsNullOrWhiteSpace(parameters["message"]) ? "Server is shutting down" : parameters["message"]; + var reason = string.IsNullOrWhiteSpace(parameters["message"]) ? "Server is restarting" : parameters["message"]; TShock.Utils.RestartServer(!GetBool(parameters["nosave"], false), reason); return RestResponse("The server is shutting down and will attempt to restart"); @@ -149,11 +149,7 @@ namespace TShockAPI private object ServerReload(RestVerbs verbs, IParameterCollection parameters, SecureRest.TokenData tokenData) { - try { - TShock.Utils.Reload(new TSRestPlayer(tokenData.Username, tokenData.UserGroup)); - } catch (Exception ex) { - return RestError("Exception was thrown during the reload: " + ex); - } + TShock.Utils.Reload(new TSRestPlayer(tokenData.Username, tokenData.UserGroup)); return RestResponse("Configuration, permissions, and regions reload complete. Some changes may require a server restart."); } @@ -227,8 +223,13 @@ namespace TShockAPI } private object ServerTokenTest(RestVerbs verbs, IParameterCollection parameters, SecureRest.TokenData tokenData) - { - return RestResponse("Token is valid and was passed through correctly"); + { + return new Dictionary + { + {"status", "200"}, + {"response", "Token is valid and was passed through correctly."}, + {"associateduser", tokenData.Username} + }; } #endregion