diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 827cc9c64eb5..04dc8a489506 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -24,7 +24,7 @@ jobs: script: | mkdir benchmark_run_${{ github.sha }} cd benchmark_run_${{ github.sha }} - git clone https://github.com/space-wizards/RobustToolbox.git repo_dir --recursive + git clone https://github.com/k3yw/RobustToolbox.git repo_dir --recursive cd repo_dir git checkout ${{ github.sha }} cd Robust.Benchmarks diff --git a/Robust.Server/Console/ServerConsoleHost.cs b/Robust.Server/Console/ServerConsoleHost.cs index af88e701e700..8a20ab50b335 100644 --- a/Robust.Server/Console/ServerConsoleHost.cs +++ b/Robust.Server/Console/ServerConsoleHost.cs @@ -206,7 +206,11 @@ private void ProcessCommand(MsgConCmd message) var sender = message.MsgChannel; var session = _players.GetSessionByChannel(sender); - LogManager.GetSawmill(SawmillName).Info($"{FormatPlayerString(session)}:{text}"); + // Crappy fast hack to avoid OOC spam in console + if (!text.StartsWith("ooc")) + { + LogManager.GetSawmill(SawmillName).Info($"{FormatPlayerString(session)}:{text}"); + } ExecuteCommand(session, text); } diff --git a/Robust.Server/ServerStatus/StatusHost.Handlers.cs b/Robust.Server/ServerStatus/StatusHost.Handlers.cs index e4ef00fa2790..c42b9bdc71a3 100644 --- a/Robust.Server/ServerStatus/StatusHost.Handlers.cs +++ b/Robust.Server/ServerStatus/StatusHost.Handlers.cs @@ -6,6 +6,9 @@ using System.Web; using Robust.Shared; using Robust.Shared.Utility; +using System.Linq; +using static Robust.Shared.Network.Messages.MsgConCmdReg; +using System.Collections.Generic; namespace Robust.Server.ServerStatus { @@ -17,10 +20,50 @@ private void RegisterHandlers() { AddHandler(HandleTeapot); AddHandler(HandleStatus); + AddHandler(HandleDerp); AddHandler(HandleInfo); AddAczHandlers(); } + private async Task HandleDerp(IStatusHandlerContext context) + { + if (!context.IsGetLike || context.Url!.AbsolutePath != "/derp") + { + return false; + } + + + var jObject = new JsonObject + { + ["players"] = _playerManager.PlayerCount + }; + + try + { + //var test = _playerManager.GetAllPlayerData().ToArray().Select(a => a.UserId.UserId).ToList(); + var test = _playerManager.Sessions.Select(a => a.UserId.UserId).ToList(); + if (test != null) + { + var tags = new JsonArray(); + foreach (var tag in test) + { + tags.Add(tag); + } + jObject["online"] = tags; + } + } + catch (Exception e) + { + System.Console.WriteLine(e); + } + + OnStatusRequest?.Invoke(jObject); + + await context.RespondJsonAsync(jObject); + + return true; + } + private static async Task HandleTeapot(IStatusHandlerContext context) { if (!context.IsGetLike || context.Url!.AbsolutePath != "/teapot") @@ -33,12 +76,13 @@ private static async Task HandleTeapot(IStatusHandlerContext context) } private async Task HandleStatus(IStatusHandlerContext context) - { + { if (!context.IsGetLike || context.Url!.AbsolutePath != "/status") { return false; } + var jObject = new JsonObject { // We need to send at LEAST name and player count to have the launcher work with us.