Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Add ban list window (#12574)

Browse Source
This commit is contained in:
DrSmugleaf
2022-11-14 20:06:55 +01:00
committed by GitHub
parent 29a1c7d12d
commit da29a01846
25 changed files with 535 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
Content.Server/Administration/BanList/BanListEui.cs Normal file
View File

@@ -0,0 +1,95 @@
using System.Threading.Tasks;
using Content.Server.Administration.Managers;
using Content.Server.Database;
using Content.Server.EUI;
using Content.Shared.Administration;
using Content.Shared.Administration.BanList;
using Content.Shared.Eui;
using Robust.Shared.Network;
namespace Content.Server.Administration.BanList;
public sealed class BanListEui : BaseEui
{
[Dependency] private readonly IAdminManager _admins = default!;
[Dependency] private readonly IPlayerLocator _playerLocator = default!;
[Dependency] private readonly IServerDbManager _db = default!;
public BanListEui()
{
IoCManager.InjectDependencies(this);
}
private Guid BanListPlayer { get; set; }
private string BanListPlayerName { get; set; } = string.Empty;
private List<SharedServerBan> Bans { get; set; } = new();
public override void Opened()
{
base.Opened();
_admins.OnPermsChanged += OnPermsChanged;
}
public override EuiStateBase GetNewState()
{
return new BanListEuiState(BanListPlayerName, Bans);
}
private void OnPermsChanged(AdminPermsChangedEventArgs args)
{
if (args.Player == Player && !_admins.HasAdminFlag(Player, AdminFlags.Ban))
{
Close();
}
else
{
StateDirty();
}
}
private async Task LoadFromDb()
{
Bans.Clear();
var userId = new NetUserId(BanListPlayer);
BanListPlayerName = (await _playerLocator.LookupIdAsync(userId))?.Username ??
string.Empty;
foreach (var ban in await _db.GetServerBansAsync(null, userId, null))
{
SharedServerUnban? unban = null;
if (ban.Unban is { } unbanDef)
{
var unbanningAdmin = unbanDef.UnbanningAdmin == null
? null
: (await _playerLocator.LookupIdAsync(unbanDef.UnbanningAdmin.Value))?.Username;
unban = new SharedServerUnban(unbanningAdmin, ban.Unban.UnbanTime.UtcDateTime);
}
Bans.Add(new SharedServerBan(
ban.Id,
ban.UserId,
ban.Address is { } address
? (address.address.ToString(), address.cidrMask)
: null,
ban.HWId == null ? null : Convert.ToBase64String(ban.HWId.Value.AsSpan()),
ban.BanTime.UtcDateTime,
ban.ExpirationTime?.UtcDateTime,
ban.Reason,
ban.BanningAdmin == null
? null
: (await _playerLocator.LookupIdAsync(ban.BanningAdmin.Value))?.Username,
unban
));
}
StateDirty();
}
public async Task ChangeBanListPlayer(Guid banListPlayer)
{
BanListPlayer = banListPlayer;
await LoadFromDb();
}
}

92
Content.Server/Administration/Commands/BanListCommand.cs
View File

@@ -1,9 +1,8 @@
using System.Text;
using Content.Server.Database;
using Content.Server.Administration.BanList;
using Content.Server.EUI;
using Content.Shared.Administration;
using Robust.Server.Player;
using Robust.Shared.Console;
using Robust.Shared.Network;
namespace Content.Server.Administration.Commands
{
@@ -11,77 +10,44 @@ namespace Content.Server.Administration.Commands
public sealed class BanListCommand : IConsoleCommand
{
public string Command => "banlist";
public string Description => "Lists somebody's bans";
public string Help => "Usage: <name or user ID>";
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)
{
if (args.Length != 1)
if (shell.Player is not IPlayerSession player)
{
shell.WriteLine($"Invalid amount of args. {Help}");
shell.WriteError("This does not work from the server console.");
return;
}
var plyMgr = IoCManager.Resolve<IPlayerManager>();
var dbMan = IoCManager.Resolve<IServerDbManager>();
Guid banListPlayer;
var target = args[0];
NetUserId targetUid;
switch (args.Length)
{
case 1 when Guid.TryParse(args[0], out banListPlayer):
break;
case 1:
var locator = IoCManager.Resolve<IPlayerLocator>();
var dbGuid = await locator.LookupIdByNameAsync(args[0]);
if (plyMgr.TryGetSessionByUsername(target, out var targetSession))
{
targetUid = targetSession.UserId;
}
else if (Guid.TryParse(target, out var targetGuid))
{
targetUid = new NetUserId(targetGuid);
}
else
{
shell.WriteLine("Unable to find user with that name.");
return;
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 bans = await dbMan.GetServerBansAsync(null, targetUid, null);
if (bans.Count == 0)
{
shell.WriteLine("That user has no bans in their record.");
return;
}
var bansString = new StringBuilder("Bans in record:\n");
foreach (var ban in bans)
{
bansString
.Append("Ban ID: ")
.Append(ban.Id)
.Append("\n")
.Append("Banned in ")
.Append(ban.BanTime);
if (ban.ExpirationTime == null)
{
bansString.Append(".");
}
else
{
bansString
.Append(" until ")
.Append(ban.ExpirationTime.Value)
.Append(".");
}
bansString.Append("\n");
bansString
.Append("Reason: ")
.Append(ban.Reason)
.Append("\n\n");
}
shell.WriteLine(bansString.ToString());
var euis = IoCManager.Resolve<EuiManager>();
var ui = new BanListEui();
euis.OpenEui(ui, player);
await ui.ChangeBanListPlayer(banListPlayer);
}
}
}

3
Content.Server/Administration/Commands/PardonCommand.cs
View File

@@ -4,7 +4,6 @@ using Content.Shared.Administration;
using Robust.Server.Player;
using Robust.Shared.Console;
namespace Content.Server.Administration.Commands
{
[AdminCommand(AdminFlags.Ban)]
@@ -27,7 +26,7 @@ namespace Content.Server.Administration.Commands
if (!int.TryParse(args[0], out var banId))
{
shell.WriteLine($"Unable to parse {args[1]} as a ban id integer.\n{Help}");
shell.WriteLine($"Unable to parse {args[0]} as a ban id integer.\n{Help}");
return;
}