[feat] Разделение банов по серверам.
# Conflicts: # Content.Client/Administration/UI/BanList/BanListLine.xaml.cs # Content.Client/Administration/UI/BanList/Bans/BanListHeader.xaml # Content.Client/Administration/UI/BanList/Bans/BanListLine.xaml # Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml # Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml.cs # Content.IntegrationTests/Tests/Commands/PardonCommand.cs # Content.Server/Administration/Commands/BanCommand.cs # Content.Server/Administration/Commands/DepartmentBanCommand.cs # Content.Server/Administration/Commands/RoleBanCommand.cs # Content.Server/Administration/Managers/RoleBanManager.cs # Content.Server/Database/ServerDbManager.cs # Content.Server/Database/ServerDbPostgres.cs # Content.Server/Database/ServerDbSqlite.cs
This commit is contained in:
rhailrake
Remuchi
@@ -7,13 +7,11 @@ using Robust.Server.Player;
|
||||
using Robust.Shared.Configuration;
|
||||
using Robust.Shared.Console;
|
||||
|
||||
|
||||
namespace Content.Server.Administration.Commands;
|
||||
|
||||
[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!;
|
||||
@@ -23,26 +21,24 @@ public sealed class BanCommand : LocalizedCommands
|
||||
|
||||
public override async void Execute(IConsoleShell shell, string argStr, string[] args)
|
||||
{
|
||||
string target;
|
||||
string reason;
|
||||
uint minutes;
|
||||
var target = args[0];
|
||||
var reason = args[1];
|
||||
var minutes = 0u;
|
||||
var isGlobalBan = false;
|
||||
|
||||
if (!Enum.TryParse(_cfg.GetCVar(CCVars.ServerBanDefaultSeverity), out NoteSeverity severity))
|
||||
{
|
||||
Logger.WarningS("admin.server_ban", "Server ban severity could not be parsed from config! Defaulting to high.");
|
||||
Logger.WarningS("admin.server_ban",
|
||||
"Server ban severity could not be parsed from config! Defaulting to high.");
|
||||
|
||||
severity = NoteSeverity.High;
|
||||
}
|
||||
|
||||
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(Loc.GetString("cmd-ban-invalid-minutes", ("minutes", args[2])));
|
||||
@@ -52,8 +48,6 @@ public sealed class BanCommand : LocalizedCommands
|
||||
|
||||
break;
|
||||
case 4:
|
||||
target = args[0];
|
||||
reason = args[1];
|
||||
|
||||
if (!uint.TryParse(args[2], out minutes))
|
||||
{
|
||||
@@ -69,6 +63,29 @@ public sealed class BanCommand : LocalizedCommands
|
||||
return;
|
||||
}
|
||||
|
||||
break;
|
||||
case 5:
|
||||
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;
|
||||
}
|
||||
|
||||
if (!bool.TryParse(args[4], out isGlobalBan))
|
||||
{
|
||||
shell.WriteLine(Loc.GetString($"{args[4]} should be True or False.\n{Help}"));
|
||||
shell.WriteLine(Help);
|
||||
return;
|
||||
}
|
||||
|
||||
break;
|
||||
default:
|
||||
shell.WriteLine(Loc.GetString("cmd-ban-invalid-arguments"));
|
||||
@@ -88,48 +105,38 @@ public sealed class BanCommand : LocalizedCommands
|
||||
var targetUid = located.UserId;
|
||||
var targetHWid = located.LastHWId;
|
||||
|
||||
_bans.CreateServerBan(targetUid, target, player?.UserId, null, targetHWid, minutes, severity, reason);
|
||||
_bans.CreateServerBan(targetUid, target, player?.UserId, null, targetHWid, minutes, severity, reason, isGlobalBan);
|
||||
}
|
||||
|
||||
public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
|
||||
{
|
||||
if (args.Length == 1)
|
||||
|
||||
var durations = new CompletionOption[]
|
||||
{
|
||||
var options = _playerManager.Sessions.Select(c => c.Name).OrderBy(c => c).ToArray();
|
||||
return CompletionResult.FromHintOptions(options, LocalizationManager.GetString("cmd-ban-hint"));
|
||||
}
|
||||
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")),
|
||||
};
|
||||
|
||||
if (args.Length == 2)
|
||||
return CompletionResult.FromHint(LocalizationManager.GetString("cmd-ban-hint-reason"));
|
||||
|
||||
if (args.Length == 3)
|
||||
var severities = new CompletionOption[]
|
||||
{
|
||||
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")),
|
||||
};
|
||||
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(durations, LocalizationManager.GetString("cmd-ban-hint-duration"));
|
||||
}
|
||||
|
||||
if (args.Length == 4)
|
||||
return args.Length switch
|
||||
{
|
||||
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;
|
||||
1 => CompletionResult.FromHintOptions(CompletionHelper.SessionNames(),
|
||||
LocalizationManager.GetString("cmd-ban-hint")),
|
||||
2 => CompletionResult.FromHint(LocalizationManager.GetString("cmd-ban-hint-reason")),
|
||||
3 => CompletionResult.FromHintOptions(durations, LocalizationManager.GetString("cmd-ban-hint-duration")),
|
||||
4 => CompletionResult.FromHintOptions(severities, Loc.GetString("cmd-ban-hint-severity")),
|
||||
_ => args.Length == 5 ? CompletionResult.FromHint("<server>") : CompletionResult.Empty
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user