Add command to list someone's bans (#12927)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
This commit is contained in:
@@ -14,8 +14,8 @@ namespace Content.Server.Administration.Commands
|
|||||||
public sealed class BanCommand : IConsoleCommand
|
public sealed class BanCommand : IConsoleCommand
|
||||||
{
|
{
|
||||||
public string Command => "ban";
|
public string Command => "ban";
|
||||||
public string Description => "Bans somebody";
|
public string Description => Loc.GetString("cmd-ban-desc");
|
||||||
public string Help => $"Usage: {Command} <name or user ID> <reason> [duration in minutes, leave out or 0 for permanent ban]";
|
public string Help => Loc.GetString("cmd-ban-help", ("Command", Command));
|
||||||
|
|
||||||
public async void Execute(IConsoleShell shell, string argStr, string[] args)
|
public async void Execute(IConsoleShell shell, string argStr, string[] args)
|
||||||
{
|
{
|
||||||
@@ -54,7 +54,7 @@ namespace Content.Server.Administration.Commands
|
|||||||
var located = await locator.LookupIdByNameOrIdAsync(target);
|
var located = await locator.LookupIdByNameOrIdAsync(target);
|
||||||
if (located == null)
|
if (located == null)
|
||||||
{
|
{
|
||||||
shell.WriteError("Unable to find a player with that name.");
|
shell.WriteError(Loc.GetString("cmd-ban-player"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -64,7 +64,7 @@ namespace Content.Server.Administration.Commands
|
|||||||
|
|
||||||
if (player != null && player.UserId == targetUid)
|
if (player != null && player.UserId == targetUid)
|
||||||
{
|
{
|
||||||
shell.WriteLine("You can't ban yourself!");
|
shell.WriteLine(Loc.GetString("cmd-ban-self"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -118,11 +118,11 @@ namespace Content.Server.Administration.Commands
|
|||||||
{
|
{
|
||||||
var playerMgr = IoCManager.Resolve<IPlayerManager>();
|
var playerMgr = IoCManager.Resolve<IPlayerManager>();
|
||||||
var options = playerMgr.ServerSessions.Select(c => c.Name).OrderBy(c => c).ToArray();
|
var options = playerMgr.ServerSessions.Select(c => c.Name).OrderBy(c => c).ToArray();
|
||||||
return CompletionResult.FromHintOptions(options, "<name/user ID>");
|
return CompletionResult.FromHintOptions(options, Loc.GetString("cmd-ban-hint"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (args.Length == 2)
|
if (args.Length == 2)
|
||||||
return CompletionResult.FromHint("<reason>");
|
return CompletionResult.FromHint(Loc.GetString("cmd-ban-hint-reason"));
|
||||||
|
|
||||||
if (args.Length == 3)
|
if (args.Length == 3)
|
||||||
{
|
{
|
||||||
@@ -133,7 +133,7 @@ namespace Content.Server.Administration.Commands
|
|||||||
new("10080", "1 week"),
|
new("10080", "1 week"),
|
||||||
};
|
};
|
||||||
|
|
||||||
return CompletionResult.FromHintOptions(durations, "[duration]");
|
return CompletionResult.FromHintOptions(durations, Loc.GetString("cmd-ban-hint-duration"));
|
||||||
}
|
}
|
||||||
|
|
||||||
return CompletionResult.Empty;
|
return CompletionResult.Empty;
|
||||||
|
|||||||
@@ -1,53 +1,73 @@
|
|||||||
using Content.Server.Administration.BanList;
|
using System.Linq;
|
||||||
|
using Content.Server.Administration.BanList;
|
||||||
|
using Content.Server.Database;
|
||||||
using Content.Server.EUI;
|
using Content.Server.EUI;
|
||||||
using Content.Shared.Administration;
|
using Content.Shared.Administration;
|
||||||
using Robust.Server.Player;
|
using Robust.Server.Player;
|
||||||
using Robust.Shared.Console;
|
using Robust.Shared.Console;
|
||||||
|
|
||||||
namespace Content.Server.Administration.Commands
|
namespace Content.Server.Administration.Commands;
|
||||||
{
|
|
||||||
[AdminCommand(AdminFlags.Ban)]
|
|
||||||
public sealed class BanListCommand : IConsoleCommand
|
|
||||||
{
|
|
||||||
public string Command => "banlist";
|
|
||||||
public string Description => "Opens the ban list panel.";
|
|
||||||
public string Help => $"Usage: {Command} <userid or username>";
|
|
||||||
|
|
||||||
public async void Execute(IConsoleShell shell, string argStr, string[] args)
|
/// <summary>
|
||||||
|
/// Lists someones active Ban Ids or opens a window to see them.
|
||||||
|
/// </summary>
|
||||||
|
[AdminCommand(AdminFlags.Ban)]
|
||||||
|
public sealed class BanListCommand : LocalizedCommands
|
||||||
|
{
|
||||||
|
[Dependency] private readonly IServerDbManager _dbManager = default!;
|
||||||
|
[Dependency] private readonly EuiManager _eui = default!;
|
||||||
|
[Dependency] private readonly IPlayerLocator _locator = default!;
|
||||||
|
|
||||||
|
public override string Command => "banlist";
|
||||||
|
|
||||||
|
public override async void Execute(IConsoleShell shell, string argStr, string[] args)
|
||||||
|
{
|
||||||
|
if (args.Length != 1)
|
||||||
{
|
{
|
||||||
if (shell.Player is not IPlayerSession player)
|
shell.WriteError(Help);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var data = await _locator.LookupIdByNameOrIdAsync(args[0]);
|
||||||
|
|
||||||
|
if (data == null)
|
||||||
|
{
|
||||||
|
shell.WriteError(Loc.GetString("cmd-ban-player"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (shell.Player is not IPlayerSession player)
|
||||||
|
{
|
||||||
|
var bans = await _dbManager.GetServerBansAsync(data.LastAddress, data.UserId, data.LastHWId, false);
|
||||||
|
|
||||||
|
if (bans.Count == 0)
|
||||||
{
|
{
|
||||||
shell.WriteError("This does not work from the server console.");
|
shell.WriteLine(Loc.GetString("cmd-banlist-empty", ("user", data.Username)));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Guid banListPlayer;
|
foreach (var ban in bans)
|
||||||
|
|
||||||
switch (args.Length)
|
|
||||||
{
|
{
|
||||||
case 1 when Guid.TryParse(args[0], out banListPlayer):
|
var msg = $"{ban.Id}: {ban.Reason}";
|
||||||
break;
|
shell.WriteLine(msg);
|
||||||
case 1:
|
|
||||||
var locator = IoCManager.Resolve<IPlayerLocator>();
|
|
||||||
var dbGuid = await locator.LookupIdByNameAsync(args[0]);
|
|
||||||
|
|
||||||
if (dbGuid == null)
|
|
||||||
{
|
|
||||||
shell.WriteError($"Unable to find {args[0]} netuserid");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
banListPlayer = dbGuid.UserId;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
shell.WriteError($"Invalid arguments.\n{Help}");
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var euis = IoCManager.Resolve<EuiManager>();
|
return;
|
||||||
var ui = new BanListEui();
|
|
||||||
euis.OpenEui(ui, player);
|
|
||||||
await ui.ChangeBanListPlayer(banListPlayer);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var ui = new BanListEui();
|
||||||
|
_eui.OpenEui(ui, player);
|
||||||
|
await ui.ChangeBanListPlayer(data.UserId);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
|
||||||
|
{
|
||||||
|
if (args.Length != 1)
|
||||||
|
return CompletionResult.Empty;
|
||||||
|
|
||||||
|
var playerMgr = IoCManager.Resolve<IPlayerManager>();
|
||||||
|
var options = playerMgr.ServerSessions.Select(c => c.Name).OrderBy(c => c).ToArray();
|
||||||
|
return CompletionResult.FromHintOptions(options, Loc.GetString("cmd-banlist-hint"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
14
Resources/Locale/en-US/info/ban.ftl
Normal file
14
Resources/Locale/en-US/info/ban.ftl
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
# ban
|
||||||
|
cmd-ban-desc = Bans somebody
|
||||||
|
cmd-ban-help = Usage: {$Command} <name or user ID> <reason> [duration in minutes, leave out or 0 for permanent ban]
|
||||||
|
cmd-ban-player = Unable to find a player with that name.
|
||||||
|
cmd-ban-self = You can't ban yourself!
|
||||||
|
cmd-ban-hint = <name/user ID>
|
||||||
|
cmd-ban-hint-reason = <reason>
|
||||||
|
cmd-ban-hint-duration = [duration]
|
||||||
|
|
||||||
|
# listbans
|
||||||
|
cmd-banlist-desc = Lists a user's active bans.
|
||||||
|
cmd-banlist-help = Usage: banlist <name or user ID>
|
||||||
|
cmd-banlist-empty = No active bans found for {$user}
|
||||||
|
cmd-banlistF-hint = <name/user ID>
|
||||||
Reference in New Issue
Block a user