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

Admin notes bugfixes (#18189)

Browse Source
This commit is contained in:
Pieter-Jan Briers
2023-07-21 15:43:47 +02:00
committed by GitHub
parent 703f3d8bc6
commit b4b0fe41db
10 changed files with 51 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml.cs
View File

@@ -1,4 +1,4 @@
using Content.Shared.Administration.Notes;
using Content.Shared.Administration.Notes;
using Content.Shared.Database;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
@@ -18,6 +18,7 @@ public sealed partial class AdminNotesLinePopup : Popup
public AdminNotesLinePopup(SharedAdminNote note, string playerName, bool showDelete, bool showEdit)
{
IoCManager.InjectDependencies(this);
RobustXamlLoader.Load(this);
NoteId = note.Id;

4
Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs
View File

@@ -163,7 +163,7 @@ public sealed partial class NoteEdit : FancyWindow
return;
if (DeleteResetOn is null)
{
DeleteResetOn = _gameTiming.CurTime.Add(TimeSpan.FromSeconds(3));
DeleteResetOn = _gameTiming.RealTime + TimeSpan.FromSeconds(3);
SubmitButton.Text = Loc.GetString("admin-note-editor-submit-confirm");
SubmitButton.ModulateSelfOverride = Color.Red;
// Task.Delay(3000).ContinueWith(_ => ResetSubmitButton()); // TODO: fix
@@ -185,7 +185,7 @@ public sealed partial class NoteEdit : FancyWindow
{
base.FrameUpdate(args);
// This checks for null for free, do not invert it as null always produces a false value
if (DeleteResetOn > _gameTiming.CurTime)
if (DeleteResetOn < _gameTiming.RealTime)
{
ResetSubmitButton();
DeleteResetOn = null;

4
Content.Server.Database/Migrations/Postgres/20230503001749_AdminNotesImprovement.cs
View File

@@ -28,10 +28,6 @@ namespace Content.Server.Database.Migrations.Postgres
name: "FK_admin_notes_player_player_user_id",
table: "admin_notes");
migrationBuilder.DropCheckConstraint(
name: "HaveEitherAddressOrUserIdOrHWId",
table: "server_role_ban");
migrationBuilder.DropCheckConstraint(
name: "HaveEitherAddressOrUserIdOrHWId",
table: "server_ban");

11
Content.Server/Administration/BanList/BanListEui.cs
View File

@@ -31,6 +31,13 @@ public sealed class BanListEui : BaseEui
_admins.OnPermsChanged += OnPermsChanged;
}
public override void Closed()
{
base.Closed();
_admins.OnPermsChanged -= OnPermsChanged;
}
public override EuiStateBase GetNewState()
{
return new BanListEuiState(BanListPlayerName, Bans);
@@ -42,10 +49,6 @@ public sealed class BanListEui : BaseEui
{
Close();
}
else
{
StateDirty();
}
}
private async Task LoadFromDb()

2
Content.Server/Administration/Commands/DepartmentBanCommand.cs
View File

@@ -99,8 +99,6 @@ public sealed class DepartmentBanCommand : IConsoleCommand
{
_banManager.CreateRoleBan(targetUid, located.Username, shell.Player?.UserId, null, targetHWid, job, minutes, severity, reason, now);
}
_banManager.SendRoleBans(located.UserId);
}
public CompletionResult GetCompletion(IConsoleShell shell, string[] args)

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

@@ -1,4 +1,4 @@
using System.Linq;
using System.Linq;
using System.Text;
using Content.Server.Administration.Managers;
using Content.Shared.Administration;
@@ -87,7 +87,6 @@ public sealed class RoleBanCommand : IConsoleCommand
var targetHWid = located.LastHWId;
_bans.CreateRoleBan(targetUid, located.Username, shell.Player?.UserId, null, targetHWid, job, minutes, severity, reason, DateTimeOffset.UtcNow);
_bans.SendRoleBans(located.UserId);
}
public CompletionResult GetCompletion(IConsoleShell shell, string[] args)

7
Content.Server/Administration/Managers/BanManager.cs
View File

@@ -40,6 +40,8 @@ public sealed class BanManager : IBanManager, IPostInjectInit
public void Initialize()
{
_playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
_netManager.RegisterNetMessage<MsgRoleBans>();
}
private async void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs e)
@@ -212,6 +214,11 @@ public sealed class BanManager : IBanManager, IPostInjectInit
var length = expires == null ? Loc.GetString("cmd-roleban-inf") : Loc.GetString("cmd-roleban-until", ("expires", expires));
_chat.SendAdminAlert(Loc.GetString("cmd-roleban-success", ("target", targetUsername ?? "null"), ("role", role), ("reason", reason), ("length", length)));
if (target != null)
{
SendRoleBans(target.Value);
}
}
public HashSet<string>? GetJobBans(NetUserId playerUserId)

1
Content.Server/Content.Server.csproj
View File

@@ -15,7 +15,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Content.Packaging\Content.Packaging.csproj" />

67
Content.Server/Database/ServerDbBase.cs
View File

@@ -1304,70 +1304,67 @@ INSERT INTO player_round (players_id, rounds_id) VALUES ({players[player]}, {id}
// You can't group queries, as player will not always exist. When it doesn't, the
// whole query returns nothing
var player = await db.DbContext.Player.SingleOrDefaultAsync(p => p.UserId == user);
return await (from ban in db.DbContext.Ban
where ban.PlayerUserId == user &&
!ban.Hidden
select ban)
var bans = await db.DbContext.Ban
.Where(ban => ban.PlayerUserId == user && !ban.Hidden)
.Include(ban => ban.Unban)
.Include(ban => ban.Round)
.ThenInclude(r => r!.Server)
.Include(ban => ban.CreatedBy)
.Include(ban => ban.LastEditedBy)
.Include(ban => ban.Unban)
.ToAsyncEnumerable()
.SelectAwait(async ban =>
new ServerBanNote(ban.Id, ban.RoundId, ban.Round, ban.PlayerUserId, player,
ban.PlaytimeAtNote, ban.Reason, ban.Severity, ban.CreatedBy, ban.BanTime,
ban.LastEditedBy, ban.LastEditedAt, ban.ExpirationTime, ban.Hidden,
ban.Unban?.UnbanningAdmin == null
? null
: await db.DbContext.Player.SingleOrDefaultAsync(p => p.UserId == ban.Unban.UnbanningAdmin.Value),
ban.Unban?.UnbanTime)
).ToListAsync();
.ToArrayAsync();
var banNotes = new List<ServerBanNote>();
foreach (var ban in bans)
{
var banNote = new ServerBanNote(ban.Id, ban.RoundId, ban.Round, ban.PlayerUserId, player,
ban.PlaytimeAtNote, ban.Reason, ban.Severity, ban.CreatedBy, ban.BanTime,
ban.LastEditedBy, ban.LastEditedAt, ban.ExpirationTime, ban.Hidden,
ban.Unban?.UnbanningAdmin == null
? null
: await db.DbContext.Player.SingleOrDefaultAsync(
p => p.UserId == ban.Unban.UnbanningAdmin.Value),
ban.Unban?.UnbanTime);
banNotes.Add(banNote);
}
return banNotes;
}
protected async Task<List<ServerRoleBanNote>> GetGroupedServerRoleBansAsNotesForUser(DbGuard db, Guid user)
{
// Server side query
var bansQuery =
(from ban in db.DbContext.RoleBan
where ban.PlayerUserId == user &&
!ban.Hidden
select ban)
var bansQuery = await db.DbContext.RoleBan
.Where(ban => ban.PlayerUserId == user && !ban.Hidden)
.Include(ban => ban.Unban)
.Include(ban => ban.Round)
.ThenInclude(r => r!.Server)
.Include(ban => ban.CreatedBy)
.Include(ban => ban.LastEditedBy)
.Include(ban => ban.Unban)
.ToAsyncEnumerable();
.ToArrayAsync();
// Client side query, as EF can't do groups yet
var bansEnumerable =
(from ban in bansQuery
group ban by new
{
ban.BanTime,
ban.CreatedBy,
ban.Reason,
Unbanned = ban.Unban == null
}
into banGroup
select banGroup)
.AsAsyncEnumerable();
var bansEnumerable = bansQuery
.GroupBy(ban => new { ban.BanTime, ban.CreatedBy, ban.Reason, Unbanned = ban.Unban == null })
.Select(banGroup => banGroup)
.ToArray();
List<ServerRoleBanNote> bans = new();
var player = await db.DbContext.Player.SingleOrDefaultAsync(p => p.UserId == user);
await foreach (var banGroup in bansEnumerable)
foreach (var banGroup in bansEnumerable)
{
var firstBan = await banGroup.FirstAsync();
var firstBan = banGroup.First();
Player? unbanningAdmin = null;
if (firstBan.Unban?.UnbanningAdmin is not null)
unbanningAdmin = await db.DbContext.Player.SingleOrDefaultAsync(p => p.UserId == firstBan.Unban.UnbanningAdmin.Value);
bans.Add(new ServerRoleBanNote(firstBan.Id, firstBan.RoundId, firstBan.Round, firstBan.PlayerUserId,
player, firstBan.PlaytimeAtNote, firstBan.Reason, firstBan.Severity, firstBan.CreatedBy,
firstBan.BanTime, firstBan.LastEditedBy, firstBan.LastEditedAt, firstBan.ExpirationTime,
firstBan.Hidden, await banGroup.Select(ban => ban.RoleId.Replace(BanManager.JobPrefix, null)).ToArrayAsync(),
firstBan.Hidden, banGroup.Select(ban => ban.RoleId.Replace(BanManager.JobPrefix, null)).ToArray(),
unbanningAdmin, firstBan.Unban?.UnbanTime));
}

1
Tools/package_server_build.py
View File

@@ -71,7 +71,6 @@ SERVER_CONTENT_ASSEMBLIES = [
SERVER_EXTRA_ASSEMBLIES = [
"Npgsql.",
"Microsoft",
"System.Linq.Async",
]
SERVER_NOT_EXTRA_ASSEMBLIES = [