diff --git a/TShockAPI/Rest/RestManager.cs b/TShockAPI/Rest/RestManager.cs index 3540a037..50e029a6 100644 --- a/TShockAPI/Rest/RestManager.cs +++ b/TShockAPI/Rest/RestManager.cs @@ -39,7 +39,6 @@ namespace TShockAPI Rest.Register(new RestCommand("/status", Status) {RequiresToken = false}); Rest.Register(new RestCommand("/tokentest", TokenTest) {RequiresToken = true}); - Rest.Register(new RestCommand("/users/activelist", UserList) {RequiresToken = true}); Rest.Register(new RestCommand("/v2/users/activelist", UserListV2) { RequiresToken = true }); Rest.Register(new RestCommand("/v2/users/read", UserInfoV2) { RequiresToken = true }); Rest.Register(new RestCommand("/v2/users/destroy", UserDestroyV2) { RequiresToken = true }); @@ -68,20 +67,6 @@ namespace TShockAPI Rest.Register(new RestCommand("/v2/server/broadcast", Broadcast) { RequiresToken = true}); Rest.Register(new RestCommand("/v2/server/off", Off) {RequiresToken = true}); Rest.Register(new RestCommand("/v2/server/rawcmd", ServerCommand) {RequiresToken = true}); - - #region Deprecated Endpoints - Rest.Register(new RestCommand("/bans/read/{user}/info", BanInfo) { RequiresToken = true }); - Rest.Register(new RestCommand("/bans/destroy/{user}", BanDestroy) { RequiresToken = true }); - - Rest.Register(new RestCommand("/users/read/{user}/info", UserInfo) { RequiresToken = true }); - Rest.Register(new RestCommand("/users/destroy/{user}", UserDestroy) { RequiresToken = true }); - Rest.Register(new RestCommand("/users/update/{user}", UserUpdate) { RequiresToken = true }); - - Rest.Register(new RestCommand("/players/read/{player}", PlayerRead) { RequiresToken = true }); - Rest.Register(new RestCommand("/players/{player}/kick", PlayerKick) { RequiresToken = true }); - Rest.Register(new RestCommand("/players/{player}/ban", PlayerBan) { RequiresToken = true }); - #endregion - } #region RestServerMethods @@ -172,14 +157,15 @@ namespace TShockAPI private object UserListV2(RestVerbs verbs, IParameterCollection parameters) { - var ret = new RestObject("200"); string playerlist = ""; foreach (var TSPlayer in TShock.Players) { playerlist += playerlist == "" ? TSPlayer.UserAccountName : "\t" + TSPlayer.UserAccountName; } - ret["activeusers"] = playerlist; - return ret; + var returnBlock = new Dictionary(); + returnBlock.Add("status", "200"); + returnBlock.Add("activeusers", playerlist); + return returnBlock; } private object UserUpdateV2(RestVerbs verbs, IParameterCollection parameters) @@ -664,266 +650,5 @@ namespace TShockAPI } #endregion - - #region Deperecated endpoints - - private object UserUpdate(RestVerbs verbs, IParameterCollection parameters) - { - var returnBlock = new Dictionary(); - var password = parameters["password"]; - var group = parameters["group"]; - - if (group == null && password == null) - { - returnBlock.Add("status", "400"); - returnBlock.Add("error", "No parameters were passed."); - return returnBlock; - } - - var user = TShock.Users.GetUserByName(verbs["user"]); - if (user == null) - { - returnBlock.Add("status", "400"); - returnBlock.Add("error", "The specefied user doesn't exist."); - return returnBlock; - } - - if (password != null) - { - TShock.Users.SetUserPassword(user, password); - returnBlock.Add("password-response", "Password updated successfully."); - } - - if (group != null) - { - TShock.Users.SetUserGroup(user, group); - returnBlock.Add("group-response", "Group updated successfully."); - } - - returnBlock.Add("status", "200"); - returnBlock.Add("deprecated", "This endpoint is deprecated. It will be fully removed from code in TShock 3.6."); - return returnBlock; - } - - private object UserDestroy(RestVerbs verbs, IParameterCollection parameters) - { - var user = TShock.Users.GetUserByName(verbs["user"]); - if (user == null) - { - return new Dictionary { { "status", "400" }, { "error", "The specified user account does not exist." } }; - } - var returnBlock = new Dictionary(); - try - { - TShock.Users.RemoveUser(user); - } - catch (Exception) - { - returnBlock.Add("status", "400"); - returnBlock.Add("error", "The specified user was unable to be removed."); - return returnBlock; - } - returnBlock.Add("status", "200"); - returnBlock.Add("response", "User deleted successfully."); - returnBlock.Add("deprecated", "This endpoint is deprecated. It will be fully removed from code in TShock 3.6."); - return returnBlock; - } - - private object UserInfo(RestVerbs verbs, IParameterCollection parameters) - { - var user = TShock.Users.GetUserByName(verbs["user"]); - if (user == null) - { - return new Dictionary { { "status", "400" }, { "error", "The specified user account does not exist." } }; - } - - var returnBlock = new Dictionary(); - returnBlock.Add("status", "200"); - returnBlock.Add("group", user.Group); - returnBlock.Add("id", user.ID.ToString()); - returnBlock.Add("deprecated", "This endpoint is deprecated. It will be fully removed from code in TShock 3.6."); - return returnBlock; - } - - private object UserList(RestVerbs verbs, IParameterCollection parameters) - { - var ret = new RestObject("200"); - string playerlist = ""; - foreach (var TSPlayer in TShock.Players) - { - if (playerlist == "") - { - playerlist += TSPlayer.UserAccountName; - } - else - { - playerlist += ", " + TSPlayer.UserAccountName; - } - } - ret["activeuesrs"] = playerlist; - return ret; - } - - private object BanDestroy(RestVerbs verbs, IParameterCollection parameters) - { - var returnBlock = new Dictionary(); - - var type = parameters["type"]; - if (type == null) - { - returnBlock.Add("Error", "Invalid Type"); - return returnBlock; - } - - var ban = new Ban(); - if (type == "ip") ban = TShock.Bans.GetBanByIp(verbs["user"]); - else if (type == "name") ban = TShock.Bans.GetBanByName(verbs["user"]); - else - { - returnBlock.Add("Error", "Invalid Type"); - return returnBlock; - } - - if (ban == null) - { - return new Dictionary { { "status", "400" }, { "error", "The specified ban does not exist." } }; - } - - try - { - TShock.Bans.RemoveBan(ban.IP); - } - catch (Exception) - { - returnBlock.Add("status", "400"); - returnBlock.Add("error", "The specified ban was unable to be removed."); - return returnBlock; - } - returnBlock.Add("status", "200"); - returnBlock.Add("response", "Ban deleted successfully."); - returnBlock.Add("deprecated", "This endpoint is deprecated. It will be fully removed from code in TShock 3.6."); - return returnBlock; - } - - private object PlayerRead(RestVerbs verbs, IParameterCollection parameters) - { - var returnBlock = new Dictionary(); - var playerParam = verbs["player"]; - var found = TShock.Utils.FindPlayer(playerParam); - if (found.Count == 0) - { - returnBlock.Add("status", "400"); - returnBlock.Add("error", "Name " + playerParam + " was not found"); - } - else if (found.Count > 1) - { - returnBlock.Add("status", "400"); - returnBlock.Add("error", "Name " + playerParam + " matches " + playerParam.Count() + " players"); - } - else if (found.Count == 1) - { - var player = found[0]; - returnBlock.Add("status", "200"); - returnBlock.Add("nickname", player.Name); - returnBlock.Add("username", player.UserAccountName == null ? "" : player.UserAccountName); - returnBlock.Add("ip", player.IP); - returnBlock.Add("group", player.Group.Name); - returnBlock.Add("position", player.TileX + "," + player.TileY); - var activeItems = player.TPlayer.inventory.Where(p => p.active).ToList(); - returnBlock.Add("inventory", string.Join(", ", activeItems.Select(p => p.name))); - returnBlock.Add("buffs", string.Join(", ", player.TPlayer.buffType)); - } - returnBlock.Add("deprecated", "This endpoint is deprecated. It will be fully removed from code in TShock 3.6."); - return returnBlock; - } - - private object PlayerKick(RestVerbs verbs, IParameterCollection parameters) - { - var returnBlock = new Dictionary(); - var playerParam = verbs["player"]; - var found = TShock.Utils.FindPlayer(playerParam); - var reason = verbs["reason"]; - if (found.Count == 0) - { - returnBlock.Add("status", "400"); - returnBlock.Add("error", "Name " + playerParam + " was not found"); - } - else if (found.Count > 1) - { - returnBlock.Add("status", "400"); - returnBlock.Add("error", "Name " + playerParam + " matches " + playerParam.Count() + " players"); - } - else if (found.Count == 1) - { - var player = found[0]; - TShock.Utils.ForceKick(player, reason == null ? "Kicked via web" : reason); - returnBlock.Add("status", "200"); - returnBlock.Add("response", "Player " + player.Name + " was kicked"); - } - returnBlock.Add("deprecated", "This endpoint is deprecated. It will be fully removed from code in TShock 3.6."); - return returnBlock; - } - - private object PlayerBan(RestVerbs verbs, IParameterCollection parameters) - { - var returnBlock = new Dictionary(); - var playerParam = verbs["player"]; - var found = TShock.Utils.FindPlayer(playerParam); - var reason = verbs["reason"]; - if (found.Count == 0) - { - returnBlock.Add("status", "400"); - returnBlock.Add("error", "Name " + playerParam + " was not found"); - } - else if (found.Count > 1) - { - returnBlock.Add("status", "400"); - returnBlock.Add("error", "Name " + playerParam + " matches " + playerParam.Count() + " players"); - } - else if (found.Count == 1) - { - var player = found[0]; - TShock.Bans.AddBan(player.IP, player.Name, reason == null ? "Banned via web" : reason); - TShock.Utils.ForceKick(player, reason == null ? "Banned via web" : reason); - returnBlock.Add("status", "200"); - returnBlock.Add("response", "Player " + player.Name + " was banned"); - } - returnBlock.Add("deprecated", "This endpoint is deprecated. It will be fully removed from code in TShock 3.6."); - return returnBlock; - } - - private object BanInfo(RestVerbs verbs, IParameterCollection parameters) - { - var returnBlock = new Dictionary(); - - var type = parameters["type"]; - if (type == null) - { - returnBlock.Add("Error", "Invalid Type"); - return returnBlock; - } - - var ban = new Ban(); - if (type == "ip") ban = TShock.Bans.GetBanByIp(verbs["user"]); - else if (type == "name") ban = TShock.Bans.GetBanByName(verbs["user"]); - else - { - returnBlock.Add("Error", "Invalid Type"); - return returnBlock; - } - - if (ban == null) - { - return new Dictionary { { "status", "400" }, { "error", "The specified ban does not exist." } }; - } - - returnBlock.Add("status", "200"); - returnBlock.Add("name", ban.Name); - returnBlock.Add("ip", ban.IP); - returnBlock.Add("reason", ban.Reason); - returnBlock.Add("deprecated", "This endpoint is deprecated. It will be fully removed from code in TShock 3.6."); - return returnBlock; - } - #endregion } } \ No newline at end of file