Better notes and bans (#14228)
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
This commit is contained in:
@@ -2,144 +2,141 @@ using System.Linq;
|
||||
using System.Net;
|
||||
using System.Net.Sockets;
|
||||
using System.Text;
|
||||
using Content.Server.Administration.Managers;
|
||||
using Content.Server.Administration.Notes;
|
||||
using Content.Server.Database;
|
||||
using Content.Server.GameTicking;
|
||||
using Content.Shared.Administration;
|
||||
using Content.Shared.CCVar;
|
||||
using Content.Shared.Database;
|
||||
using Content.Shared.Players.PlayTimeTracking;
|
||||
using Robust.Server.Player;
|
||||
using Robust.Shared.Configuration;
|
||||
using Robust.Shared.Console;
|
||||
|
||||
|
||||
namespace Content.Server.Administration.Commands
|
||||
namespace Content.Server.Administration.Commands;
|
||||
|
||||
[AdminCommand(AdminFlags.Ban)]
|
||||
public sealed class BanCommand : LocalizedCommands
|
||||
{
|
||||
[AdminCommand(AdminFlags.Ban)]
|
||||
public sealed class BanCommand : LocalizedCommands
|
||||
|
||||
[Dependency] private readonly IPlayerLocator _locator = default!;
|
||||
[Dependency] private readonly IBanManager _bans = default!;
|
||||
[Dependency] private readonly IConfigurationManager _cfg = default!;
|
||||
[Dependency] private readonly IPlayerManager _playerManager = default!;
|
||||
|
||||
public override string Command => "ban";
|
||||
|
||||
public override async void Execute(IConsoleShell shell, string argStr, string[] args)
|
||||
{
|
||||
[Dependency] private readonly IConfigurationManager _cfg = default!;
|
||||
|
||||
public override string Command => "ban";
|
||||
|
||||
public override async void Execute(IConsoleShell shell, string argStr, string[] args)
|
||||
string target;
|
||||
string reason;
|
||||
uint minutes;
|
||||
if (!Enum.TryParse(_cfg.GetCVar(CCVars.ServerBanDefaultSeverity), out NoteSeverity severity))
|
||||
{
|
||||
var player = shell.Player as IPlayerSession;
|
||||
var plyMgr = IoCManager.Resolve<IPlayerManager>();
|
||||
var locator = IoCManager.Resolve<IPlayerLocator>();
|
||||
var dbMan = IoCManager.Resolve<IServerDbManager>();
|
||||
|
||||
string target;
|
||||
string reason;
|
||||
uint minutes;
|
||||
|
||||
switch (args.Length)
|
||||
{
|
||||
case 2:
|
||||
target = args[0];
|
||||
reason = args[1];
|
||||
minutes = 0;
|
||||
break;
|
||||
case 3:
|
||||
target = args[0];
|
||||
reason = args[1];
|
||||
|
||||
if (!uint.TryParse(args[2], out minutes))
|
||||
{
|
||||
shell.WriteLine($"{args[2]} is not a valid amount of minutes.\n{Help}");
|
||||
return;
|
||||
}
|
||||
|
||||
break;
|
||||
default:
|
||||
shell.WriteLine($"Invalid amount of arguments.{Help}");
|
||||
return;
|
||||
}
|
||||
|
||||
var located = await locator.LookupIdByNameOrIdAsync(target);
|
||||
if (located == null)
|
||||
{
|
||||
shell.WriteError(LocalizationManager.GetString("cmd-ban-player"));
|
||||
return;
|
||||
}
|
||||
|
||||
var targetUid = located.UserId;
|
||||
var targetHWid = located.LastHWId;
|
||||
var targetAddr = located.LastAddress;
|
||||
|
||||
if (player != null && player.UserId == targetUid)
|
||||
{
|
||||
shell.WriteLine(LocalizationManager.GetString("cmd-ban-self"));
|
||||
return;
|
||||
}
|
||||
|
||||
DateTimeOffset? expires = null;
|
||||
if (minutes > 0)
|
||||
{
|
||||
expires = DateTimeOffset.Now + TimeSpan.FromMinutes(minutes);
|
||||
}
|
||||
|
||||
(IPAddress, int)? addrRange = null;
|
||||
if (targetAddr != null)
|
||||
{
|
||||
if (targetAddr.IsIPv4MappedToIPv6)
|
||||
targetAddr = targetAddr.MapToIPv4();
|
||||
|
||||
// Ban /64 for IPv4, /32 for IPv4.
|
||||
var cidr = targetAddr.AddressFamily == AddressFamily.InterNetworkV6 ? 64 : 32;
|
||||
addrRange = (targetAddr, cidr);
|
||||
}
|
||||
|
||||
var banDef = new ServerBanDef(
|
||||
null,
|
||||
targetUid,
|
||||
addrRange,
|
||||
targetHWid,
|
||||
DateTimeOffset.Now,
|
||||
expires,
|
||||
reason,
|
||||
player?.UserId,
|
||||
null);
|
||||
|
||||
await dbMan.AddServerBanAsync(banDef);
|
||||
|
||||
var response = new StringBuilder($"Banned {target} with reason \"{reason}\"");
|
||||
|
||||
response.Append(expires == null ? " permanently." : $" until {expires}");
|
||||
|
||||
shell.WriteLine(response.ToString());
|
||||
|
||||
if (plyMgr.TryGetSessionById(targetUid, out var targetPlayer))
|
||||
{
|
||||
var message = banDef.FormatBanMessage(_cfg, LocalizationManager);
|
||||
targetPlayer.ConnectedClient.Disconnect(message);
|
||||
}
|
||||
Logger.WarningS("admin.server_ban", "Server ban severity could not be parsed from config! Defaulting to high.");
|
||||
severity = NoteSeverity.High;
|
||||
}
|
||||
|
||||
public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
|
||||
switch (args.Length)
|
||||
{
|
||||
if (args.Length == 1)
|
||||
{
|
||||
var playerMgr = IoCManager.Resolve<IPlayerManager>();
|
||||
var options = playerMgr.ServerSessions.Select(c => c.Name).OrderBy(c => c).ToArray();
|
||||
return CompletionResult.FromHintOptions(options, LocalizationManager.GetString("cmd-ban-hint"));
|
||||
}
|
||||
case 2:
|
||||
target = args[0];
|
||||
reason = args[1];
|
||||
minutes = 0;
|
||||
break;
|
||||
case 3:
|
||||
target = args[0];
|
||||
reason = args[1];
|
||||
|
||||
if (args.Length == 2)
|
||||
return CompletionResult.FromHint(LocalizationManager.GetString("cmd-ban-hint-reason"));
|
||||
|
||||
if (args.Length == 3)
|
||||
{
|
||||
var durations = new CompletionOption[]
|
||||
if (!uint.TryParse(args[2], out minutes))
|
||||
{
|
||||
new("0", LocalizationManager.GetString("cmd-ban-hint-duration-1")),
|
||||
new("1440", LocalizationManager.GetString("cmd-ban-hint-duration-2")),
|
||||
new("4320", LocalizationManager.GetString("cmd-ban-hint-duration-3")),
|
||||
new("10080", LocalizationManager.GetString("cmd-ban-hint-duration-4")),
|
||||
new("20160", LocalizationManager.GetString("cmd-ban-hint-duration-5")),
|
||||
new("43800", LocalizationManager.GetString("cmd-ban-hint-duration-6")),
|
||||
};
|
||||
shell.WriteLine(Loc.GetString("cmd-ban-invalid-minutes", ("minutes", args[2])));
|
||||
shell.WriteLine(Help);
|
||||
return;
|
||||
}
|
||||
|
||||
return CompletionResult.FromHintOptions(durations, LocalizationManager.GetString("cmd-ban-hint-duration"));
|
||||
}
|
||||
break;
|
||||
case 4:
|
||||
target = args[0];
|
||||
reason = args[1];
|
||||
|
||||
return CompletionResult.Empty;
|
||||
if (!uint.TryParse(args[2], out minutes))
|
||||
{
|
||||
shell.WriteLine(Loc.GetString("cmd-ban-invalid-minutes", ("minutes", args[2])));
|
||||
shell.WriteLine(Help);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!Enum.TryParse(args[3], ignoreCase: true, out severity))
|
||||
{
|
||||
shell.WriteLine(Loc.GetString("cmd-ban-invalid-severity", ("severity", args[3])));
|
||||
shell.WriteLine(Help);
|
||||
return;
|
||||
}
|
||||
|
||||
break;
|
||||
default:
|
||||
shell.WriteLine(Loc.GetString("cmd-ban-invalid-arguments"));
|
||||
shell.WriteLine(Help);
|
||||
return;
|
||||
}
|
||||
|
||||
var located = await _locator.LookupIdByNameOrIdAsync(target);
|
||||
var player = shell.Player as IPlayerSession;
|
||||
|
||||
if (located == null)
|
||||
{
|
||||
shell.WriteError(Loc.GetString("cmd-ban-player"));
|
||||
return;
|
||||
}
|
||||
|
||||
var targetUid = located.UserId;
|
||||
var targetHWid = located.LastHWId;
|
||||
|
||||
_bans.CreateServerBan(targetUid, target, player?.UserId, null, targetHWid, minutes, severity, reason);
|
||||
}
|
||||
|
||||
public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
|
||||
{
|
||||
if (args.Length == 1)
|
||||
{
|
||||
var options = _playerManager.ServerSessions.Select(c => c.Name).OrderBy(c => c).ToArray();
|
||||
return CompletionResult.FromHintOptions(options, LocalizationManager.GetString("cmd-ban-hint"));
|
||||
}
|
||||
|
||||
if (args.Length == 2)
|
||||
return CompletionResult.FromHint(LocalizationManager.GetString("cmd-ban-hint-reason"));
|
||||
|
||||
if (args.Length == 3)
|
||||
{
|
||||
var durations = new CompletionOption[]
|
||||
{
|
||||
new("0", LocalizationManager.GetString("cmd-ban-hint-duration-1")),
|
||||
new("1440", LocalizationManager.GetString("cmd-ban-hint-duration-2")),
|
||||
new("4320", LocalizationManager.GetString("cmd-ban-hint-duration-3")),
|
||||
new("10080", LocalizationManager.GetString("cmd-ban-hint-duration-4")),
|
||||
new("20160", LocalizationManager.GetString("cmd-ban-hint-duration-5")),
|
||||
new("43800", LocalizationManager.GetString("cmd-ban-hint-duration-6")),
|
||||
};
|
||||
|
||||
return CompletionResult.FromHintOptions(durations, LocalizationManager.GetString("cmd-ban-hint-duration"));
|
||||
}
|
||||
|
||||
if (args.Length == 4)
|
||||
{
|
||||
var severities = new CompletionOption[]
|
||||
{
|
||||
new("none", Loc.GetString("admin-note-editor-severity-none")),
|
||||
new("minor", Loc.GetString("admin-note-editor-severity-low")),
|
||||
new("medium", Loc.GetString("admin-note-editor-severity-medium")),
|
||||
new("high", Loc.GetString("admin-note-editor-severity-high")),
|
||||
};
|
||||
|
||||
return CompletionResult.FromHintOptions(severities, Loc.GetString("cmd-ban-hint-severity"));
|
||||
}
|
||||
|
||||
return CompletionResult.Empty;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user