Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

merge from 2.3

Browse Source
This commit is contained in:
RaidMax
2019-08-28 13:47:38 -05:00
parent 7c0e37cc8e 27a05ce6db
commit db3a20c60b
4 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
WebfrontCore/Controllers/API/APIController.cs
View File

@ -20,18 +20,19 @@ namespace WebfrontCore.Controllers.API
}
[HttpGet]
public IActionResult Status(int id)
public IActionResult Status(long? id)
{
var serverInfo = Manager.GetServers()
.Select(server => new
{
Id = server.EndPoint,
IsOnline = !server.Throttled,
Name = server.Hostname,
MaxPlayers = server.MaxClients,
CurrentPlayers = server.GetClientsAsList().Count,
Map = server.CurrentMap,
GameMode = server.Gametype,
Port = server.Port,
server.Port,
Game = server.GameName.ToString(),
Players = server.GetClientsAsList()
.Select(player => new
@ -46,7 +47,7 @@ namespace WebfrontCore.Controllers.API
})
});
if (id != 0)
if (id != null)
{
serverInfo = serverInfo.Where(server => server.Id == id);
}
@ -64,11 +65,11 @@ namespace WebfrontCore.Controllers.API
serverToRestart.RestartRequested = false;
}
return serverToRestart != null ?
return serverToRestart != null ?
(IActionResult)Json(new
{
port = serverToRestart.Port
}) :
}) :
Unauthorized();
}
}