diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b1e69d1..fe9a120f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin * Update Assembly Company to Pryaxis (@Ryozuki) * Removed `/restart` command. (@hakusaro) * Removed `Permissions.updateplugins` permission. (@hakusaro) +* Removed REST `/v3/server/restart/` route and `/server/restart/` route. (@hakusaro) ## TShock 4.3.24 * Updated OpenTerraria API to 1.3.5.3 (@DeathCradle) diff --git a/TShockAPI/Rest/RestManager.cs b/TShockAPI/Rest/RestManager.cs index 01341d46..636e0407 100644 --- a/TShockAPI/Rest/RestManager.cs +++ b/TShockAPI/Rest/RestManager.cs @@ -205,7 +205,6 @@ namespace TShockAPI Rest.RegisterRedirect("/server/broadcast", "/v2/server/broadcast"); Rest.RegisterRedirect("/server/reload", "/v2/server/reload"); Rest.RegisterRedirect("/server/off", "/v2/server/off"); - Rest.RegisterRedirect("/server/restart", "/v3/server/restart"); Rest.RegisterRedirect("/server/rawcmd", "/v3/server/rawcmd"); //user commands @@ -247,7 +246,6 @@ namespace TShockAPI Rest.Register(new SecureRestCommand("/v2/server/broadcast", ServerBroadcast)); Rest.Register(new SecureRestCommand("/v3/server/reload", ServerReload, RestPermissions.restcfg)); Rest.Register(new SecureRestCommand("/v2/server/off", ServerOff, RestPermissions.restmaintenance)); - Rest.Register(new SecureRestCommand("/v3/server/restart", ServerRestart, RestPermissions.restmaintenance)); Rest.Register(new SecureRestCommand("/v3/server/rawcmd", ServerCommandV3, RestPermissions.restrawcommand)); Rest.Register(new SecureRestCommand("/tokentest", ServerTokenTest)); @@ -335,25 +333,6 @@ namespace TShockAPI return RestResponse("The server is shutting down"); } - [Description("Attempt to restart the server.")] - [Route("/v3/server/restart")] - [Permission(RestPermissions.restmaintenance)] - [Noun("confirm", true, "Confirm that you actually want to restart the server", typeof(bool))] - [Noun("message", false, "The shutdown message.", typeof(String))] - [Noun("nosave", false, "Shutdown without saving.", typeof(bool))] - [Token] - private object ServerRestart(RestRequestArgs args) - { - if (!GetBool(args.Parameters["confirm"], false)) - return RestInvalidParam("confirm"); - - // Inform players the server is shutting down - var reason = string.IsNullOrWhiteSpace(args.Parameters["message"]) ? "Server is restarting" : args.Parameters["message"]; - TShock.Utils.RestartServer(!GetBool(args.Parameters["nosave"], false), reason); - - return RestResponse("The server is shutting down and will attempt to restart"); - } - [Description("Reload config files for the server.")] [Route("/v3/server/reload")] [Permission(RestPermissions.restcfg)]