2e6eaa45c5
God bloody christ. There's like three layers of shit here. So firstly, apparently we were still using Npgsql.EnableLegacyTimestampBehavior. This means that time values (which are stored UTC in the database) were converted to local time when read out. This meant they were passed around as kind Local to clients (instead of UTC in the case of SQLite). That's easy enough to fix just turn off the flag and fix the couple spots we're passing a local DateTime ez. Oh but it turns out there's a DIFFERENT problem with SQLite: See SQLite we definitely store the DateTimes as UTC, but when Microsoft.Data.Sqlite reads them it reads them as Kind Unspecified instead of Utc. Why are these so bad? Because the admin notes system passes DateTime instances from EF Core straight to the rest of the game code. And that means it's a PAIN IN THE ASS to run the necessary conversions to fix the DateTime instances. GOD DAMNIT now I have to make a whole new set of "Record" entities so we avoid leaking the EF Core model entities. WAAAAAAA. Fixes #19897
76 lines
2.7 KiB
C#
76 lines
2.7 KiB
C#
using Content.Server.Database;
|
|
using Content.Shared.Administration.Notes;
|
|
using Content.Shared.Database;
|
|
|
|
namespace Content.Server.Administration.Notes;
|
|
|
|
public static class AdminNotesExtensions
|
|
{
|
|
public static SharedAdminNote ToShared(this IAdminRemarksRecord note)
|
|
{
|
|
NoteSeverity? severity = null;
|
|
var secret = false;
|
|
NoteType type;
|
|
string[]? bannedRoles = null;
|
|
string? unbannedByName = null;
|
|
DateTime? unbannedTime = null;
|
|
bool? seen = null;
|
|
switch (note)
|
|
{
|
|
case AdminNoteRecord adminNote:
|
|
type = NoteType.Note;
|
|
severity = adminNote.Severity;
|
|
secret = adminNote.Secret;
|
|
break;
|
|
case AdminWatchlistRecord:
|
|
type = NoteType.Watchlist;
|
|
secret = true;
|
|
break;
|
|
case AdminMessageRecord adminMessage:
|
|
type = NoteType.Message;
|
|
seen = adminMessage.Seen;
|
|
break;
|
|
case ServerBanNoteRecord ban:
|
|
type = NoteType.ServerBan;
|
|
severity = ban.Severity;
|
|
unbannedTime = ban.UnbanTime;
|
|
unbannedByName = ban.UnbanningAdmin?.LastSeenUserName ?? Loc.GetString("system-user");
|
|
break;
|
|
case ServerRoleBanNoteRecord roleBan:
|
|
type = NoteType.RoleBan;
|
|
severity = roleBan.Severity;
|
|
bannedRoles = roleBan.Roles;
|
|
unbannedTime = roleBan.UnbanTime;
|
|
unbannedByName = roleBan.UnbanningAdmin?.LastSeenUserName ?? Loc.GetString("system-user");
|
|
break;
|
|
default:
|
|
throw new ArgumentOutOfRangeException(nameof(type), note.GetType(), "Unknown note type");
|
|
}
|
|
|
|
// There may be bans without a user, but why would we ever be converting them to shared notes?
|
|
if (note.Player is null)
|
|
throw new ArgumentNullException(nameof(note), "Player user ID cannot be null for a note");
|
|
|
|
return new SharedAdminNote(
|
|
note.Id,
|
|
note.Player!.UserId,
|
|
note.Round?.Id,
|
|
note.Round?.Server.Name,
|
|
note.PlaytimeAtNote,
|
|
type,
|
|
note.Message,
|
|
severity,
|
|
secret,
|
|
note.CreatedBy?.LastSeenUserName ?? Loc.GetString("system-user"),
|
|
note.LastEditedBy?.LastSeenUserName ?? string.Empty,
|
|
note.CreatedAt.UtcDateTime,
|
|
note.LastEditedAt?.UtcDateTime,
|
|
note.ExpirationTime?.UtcDateTime,
|
|
bannedRoles,
|
|
unbannedTime,
|
|
unbannedByName,
|
|
seen
|
|
);
|
|
}
|
|
}
|