Role ban improvements (#6855)

2022-02-21 21:00:55 -08:00
parent 8ccdff4416
commit 4a68718050
5 changed files with 96 additions and 13 deletions
--- a/Content.Server/Database/ServerDbSqlite.cs
+++ b/Content.Server/Database/ServerDbSqlite.cs
@@ -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,