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

Fix postgres problems with admins.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-11-13 03:23:13 +01:00
parent f364c4b01f
commit 4b5ab508ed
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -269,7 +269,10 @@ namespace Content.Server.Database
{ {
await using var db = await GetDb(); await using var db = await GetDb();
db.DbContext.Admin.Update(admin); var existing = await db.DbContext.Admin.Include(a => a.Flags).SingleAsync(a => a.UserId == admin.UserId, cancel);
existing.Flags = admin.Flags;
existing.Title = admin.Title;
existing.AdminRankId = admin.AdminRankId;
await db.DbContext.SaveChangesAsync(cancel); await db.DbContext.SaveChangesAsync(cancel);
} }
@@ -297,7 +300,12 @@ namespace Content.Server.Database
{ {
await using var db = await GetDb(); await using var db = await GetDb();
db.DbContext.AdminRank.Update(rank); var existing = await db.DbContext.AdminRank
.Include(r => r.Flags)
.SingleAsync(a => a.Id == rank.Id, cancel);
existing.Flags = rank.Flags;
existing.Name = rank.Name;
await db.DbContext.SaveChangesAsync(cancel); await db.DbContext.SaveChangesAsync(cancel);
} }

4
Content.Server/Database/ServerDbPostgres.cs
View File

@@ -173,9 +173,9 @@ namespace Content.Server.Database
return new PlayerRecord( return new PlayerRecord(
new NetUserId(record.UserId), new NetUserId(record.UserId),
new DateTimeOffset(record.FirstSeenTime, TimeSpan.Zero), new DateTimeOffset(record.FirstSeenTime),
record.LastSeenUserName, record.LastSeenUserName,
new DateTimeOffset(record.LastSeenTime, TimeSpan.Zero), new DateTimeOffset(record.LastSeenTime),
record.LastSeenAddress); record.LastSeenAddress);
} }