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

Role ban improvements (#6855)

Browse Source
This commit is contained in:
ShadowCommander
2022-02-21 21:00:55 -08:00
committed by GitHub
parent 8ccdff4416
commit 4a68718050
5 changed files with 96 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -217,9 +217,9 @@ namespace Content.Server.Database
db.PgDbContext.Unban.Add(new ServerUnban
{
BanId = serverUnban.BanId,
UnbanningAdmin = serverUnban.UnbanningAdmin?.UserId,
UnbanTime = serverUnban.UnbanTime.UtcDateTime
BanId = serverUnban.BanId,
UnbanningAdmin = serverUnban.UnbanningAdmin?.UserId,
UnbanTime = serverUnban.UnbanTime.UtcDateTime
});
await db.PgDbContext.SaveChangesAsync();
@@ -401,9 +401,9 @@ namespace Content.Server.Database
db.PgDbContext.RoleUnban.Add(new ServerRoleUnban
{
BanId = serverRoleUnban.BanId,
UnbanningAdmin = serverRoleUnban.UnbanningAdmin?.UserId,
UnbanTime = serverRoleUnban.UnbanTime.UtcDateTime
BanId = serverRoleUnban.BanId,
UnbanningAdmin = serverRoleUnban.UnbanningAdmin?.UserId,
UnbanTime = serverRoleUnban.UnbanTime.UtcDateTime
});
await db.PgDbContext.SaveChangesAsync();

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

@@ -187,7 +187,7 @@ namespace Content.Server.Database
var queryBans = await GetAllRoleBans(db.SqliteDbContext, includeUnbanned);
return queryBans
.Where(b => BanMatches(b, address, userId, hwId))
.Where(b => RoleBanMatches(b, address, userId, hwId))
.Select(ConvertRoleBan)
.ToList()!;
}
@@ -206,7 +206,7 @@ namespace Content.Server.Database
return await query.ToListAsync();
}
private static bool BanMatches(
private static bool RoleBanMatches(
ServerRoleBan ban,
IPAddress? address,
NetUserId? userId,