themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Re-added /status and added mute bool to /v3/players/read.

Browse source 
`/status` is now a root endpoint and will always point to `/v2/server/status` with an added `upgrade` field describing the route to the latest status endpoint.
Closes #1358. Closes #1348
This commit is contained in:
White 2016-12-31 11:55:10 +10:30
parent 4f7a15f9bf
commit 24da389050
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
TShockAPI/Rest/RestManager.cs
View file

@ -23,7 +23,6 @@ using System.ComponentModel;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Reflection.Emit;
using System.Text; using System.Text;
using HttpServer; using HttpServer;
using Rests; using Rests;
@ -102,12 +101,14 @@ namespace TShockAPI
// Server Commands // Server Commands
if (TShock.Config.EnableTokenEndpointAuthentication) if (TShock.Config.EnableTokenEndpointAuthentication)
{ {
Rest.Register(new SecureRestCommand("/status", ServerStatusRoot));
Rest.Register(new SecureRestCommand("/v2/server/status", ServerStatusV2)); Rest.Register(new SecureRestCommand("/v2/server/status", ServerStatusV2));
Rest.Register(new SecureRestCommand("/v3/server/motd", ServerMotd)); Rest.Register(new SecureRestCommand("/v3/server/motd", ServerMotd));
Rest.Register(new SecureRestCommand("/v3/server/rules", ServerRules)); Rest.Register(new SecureRestCommand("/v3/server/rules", ServerRules));
} }
else else
{ {
Rest.Register(new RestCommand("/status", (a) => this.ServerStatusRoot(new RestRequestArgs(a.Verbs, a.Parameters, a.Request, SecureRest.TokenData.None, a.Context))));
Rest.Register(new RestCommand("/v2/server/status", (a) => this.ServerStatusV2(new RestRequestArgs(a.Verbs, a.Parameters, a.Request, SecureRest.TokenData.None, a.Context)))); Rest.Register(new RestCommand("/v2/server/status", (a) => this.ServerStatusV2(new RestRequestArgs(a.Verbs, a.Parameters, a.Request, SecureRest.TokenData.None, a.Context))));
Rest.Register(new RestCommand("/v3/server/motd", (a) => this.ServerMotd(new RestRequestArgs(a.Verbs, a.Parameters, a.Request, SecureRest.TokenData.None, a.Context)))); Rest.Register(new RestCommand("/v3/server/motd", (a) => this.ServerMotd(new RestRequestArgs(a.Verbs, a.Parameters, a.Request, SecureRest.TokenData.None, a.Context))));
Rest.Register(new RestCommand("/v3/server/rules", (a) => this.ServerRules(new RestRequestArgs(a.Verbs, a.Parameters, a.Request, SecureRest.TokenData.None, a.Context)))); Rest.Register(new RestCommand("/v3/server/rules", (a) => this.ServerRules(new RestRequestArgs(a.Verbs, a.Parameters, a.Request, SecureRest.TokenData.None, a.Context))));
@ -274,6 +275,16 @@ namespace TShockAPI
}; };
} }
[Description("Get a list of information about the current TShock server.")]
[Route("/status")]
[Token]
private object ServerStatusRoot(RestRequestArgs args)
{
RestObject status = (RestObject)ServerStatusV2(args);
status.Add("upgrade", "/v2/server/status");
return status;
}
[Description("Get a list of information about the current TShock server.")] [Description("Get a list of information about the current TShock server.")]
[Route("/v2/server/status")] [Route("/v2/server/status")]
[Token] [Token]
@ -761,10 +772,11 @@ namespace TShockAPI
return new RestObject() return new RestObject()
{ {
{"nickname", player.Name}, {"nickname", player.Name},
{"username", null == player.User ? "" : player.User.Name}, {"username", player.User?.Name},
{"ip", player.IP}, {"ip", player.IP},
{"group", player.Group.Name}, {"group", player.Group.Name},
{"registered", null == player.User ? "" : player.User.Registered}, {"registered", player.User?.Registered},
{"muted", player.mute },
{"position", player.TileX + "," + player.TileY}, {"position", player.TileX + "," + player.TileY},
{"inventory", string.Join(", ", inventory.Select(p => (p.name + ":" + p.stack)))}, {"inventory", string.Join(", ", inventory.Select(p => (p.name + ":" + p.stack)))},
{"armor", string.Join(", ", equipment.Select(p => (p.netID + ":" + p.prefix)))}, {"armor", string.Join(", ", equipment.Select(p => (p.netID + ":" + p.prefix)))},