tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweaks to ShowRulesCommand structure, localization, and autocomplete. (#38855)

Browse Source 
commit
This commit is contained in:
Kyle Tyo
2025-07-11 13:48:58 -04:00
committed by GitHub
parent c10c8eff4f
commit 7845417d10
2 changed files with 30 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
Content.Server/Info/ShowRulesCommand.cs
View File

@@ -10,55 +10,46 @@ using Robust.Shared.Network;
namespace Content.Server.Info;
[AdminCommand(AdminFlags.Admin)]
public sealed class ShowRulesCommand : IConsoleCommand
public sealed class ShowRulesCommand : LocalizedCommands
{
[Dependency] private readonly INetManager _net = default!;
[Dependency] private readonly IConfigurationManager _configuration = default!;
[Dependency] private readonly INetManager _net = default!;
[Dependency] private readonly IPlayerManager _player = default!;
public string Command => "showrules";
public string Description => "Opens the rules popup for the specified player.";
public string Help => "showrules <username> [seconds]";
public async void Execute(IConsoleShell shell, string argStr, string[] args)
public override string Command => "showrules";
public override async void Execute(IConsoleShell shell, string argStr, string[] args)
{
string target;
float seconds;
switch (args.Length)
if (args.Length is < 1 or > 2)
{
case 1:
{
target = args[0];
seconds = _configuration.GetCVar(CCVars.RulesWaitTime);
break;
}
case 2:
{
if (!float.TryParse(args[1], out seconds))
{
shell.WriteError($"{args[1]} is not a valid amount of seconds.\n{Help}");
return;
}
target = args[0];
break;
}
default:
{
shell.WriteLine(Help);
return;
}
shell.WriteError(Loc.GetString("shell-wrong-arguments-number"));
return;
}
var seconds = _configuration.GetCVar(CCVars.RulesWaitTime);
if (!_player.TryGetSessionByUsername(target, out var player))
if (args.Length == 2 && !float.TryParse(args[1], out seconds))
{
shell.WriteError("Unable to find a player with that name.");
return;
shell.WriteError(Loc.GetString("cmd-showrules-invalid-seconds", ("seconds", args[1])));
return;
}
if (!_player.TryGetSessionByUsername(args[0], out var player))
{
shell.WriteError(Loc.GetString("shell-target-player-does-not-exist"));
return;
}
var coreRules = _configuration.GetCVar(CCVars.RulesFile);
var message = new SendRulesInformationMessage { PopupTime = seconds, CoreRules = coreRules, ShouldShowRules = true};
var message = new SendRulesInformationMessage
{ PopupTime = seconds, CoreRules = coreRules, ShouldShowRules = true };
_net.ServerSendMessage(message, player.Channel);
}
public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
{
return args.Length == 1
? CompletionResult.FromOptions(CompletionHelper.SessionNames(players: _player))
: CompletionResult.Empty;
}
}