Added info about crashes with bots

This commit is contained in:
Dawid Bepierszcz
2024-02-06 00:57:28 +01:00
parent 3793385ce4
commit aa95815fbd
6 changed files with 89 additions and 56 deletions

View File

@@ -19,7 +19,7 @@ namespace CS2_SimpleAdmin
DateTime now = DateTime.Now;
DateTime futureTime = now.AddMinutes(time);
using var connection = await _database.GetConnection();
await using var connection = await _database.GetConnectionAsync();
var sql = "INSERT INTO `sa_bans` (`player_steamid`, `player_name`, `player_ip`, `admin_steamid`, `admin_name`, `reason`, `duration`, `ends`, `created`, `server_id`) " +
"VALUES (@playerSteamid, @playerName, @playerIp, @adminSteamid, @adminName, @banReason, @duration, @ends, @created, @serverid)";
@@ -46,7 +46,7 @@ namespace CS2_SimpleAdmin
DateTime now = DateTime.Now;
DateTime futureTime = now.AddMinutes(time);
using var connection = await _database.GetConnection();
await using var connection = await _database.GetConnectionAsync();
var sql = "INSERT INTO `sa_bans` (`player_steamid`, `admin_steamid`, `admin_name`, `reason`, `duration`, `ends`, `created`, `server_id`) " +
"VALUES (@playerSteamid, @adminSteamid, @adminName, @banReason, @duration, @ends, @created, @serverid)";
@@ -71,7 +71,7 @@ namespace CS2_SimpleAdmin
DateTime now = DateTime.Now;
DateTime futureTime = now.AddMinutes(time);
using var connection = await _database.GetConnection();
await using var connection = await _database.GetConnectionAsync();
var sql = "INSERT INTO `sa_bans` (`player_ip`, `admin_steamid`, `admin_name`, `reason`, `duration`, `ends`, `created`, `server_id`) " +
"VALUES (@playerIp, @adminSteamid, @adminName, @banReason, @duration, @ends, @created, @serverid)";
@@ -91,18 +91,23 @@ namespace CS2_SimpleAdmin
public async Task<bool> IsPlayerBanned(PlayerInfo player)
{
if (player == null)
if (player.SteamId == null && player.IpAddress == null)
{
return false;
}
#if DEBUG
if (CS2_SimpleAdmin._logger != null)
CS2_SimpleAdmin._logger.LogCritical($"IsPlayerBanned for {player.Name}");
#endif
DateTime currentTimeUtc = DateTime.UtcNow;
string sql = "SELECT COUNT(*) FROM sa_bans WHERE (player_steamid = @PlayerSteamID OR player_ip = @PlayerIP) AND status = 'ACTIVE' AND (duration = 0 OR ends > @CurrentTime)";
int banCount = 0;
try
{
using var connection = await _database.GetConnection();
await using var connection = await _database.GetConnectionAsync();
var parameters = new
{
@@ -120,12 +125,13 @@ namespace CS2_SimpleAdmin
return banCount > 0;
}
public async Task<int> GetPlayerBans(PlayerInfo player)
{
string sql = "SELECT COUNT(*) FROM sa_bans WHERE (player_steamid = @PlayerSteamID OR player_ip = @PlayerIP)";
int banCount;
using var connection = await _database.GetConnection();
await using var connection = await _database.GetConnectionAsync();
if (!string.IsNullOrEmpty(player.IpAddress))
{
@@ -146,7 +152,7 @@ namespace CS2_SimpleAdmin
return;
}
using var connection = await _database.GetConnection();
await using var connection = await _database.GetConnectionAsync();
string sqlUnban = "UPDATE sa_bans SET status = 'UNBANNED' WHERE player_steamid = @pattern OR player_name = @pattern OR player_ip = @pattern AND status = 'ACTIVE'";
await connection.ExecuteAsync(sqlUnban, new { pattern = playerPattern });
@@ -156,7 +162,7 @@ namespace CS2_SimpleAdmin
{
try
{
using var connection = await _database.GetConnection();
await using var connection = await _database.GetConnectionAsync();
string sql = "UPDATE sa_bans SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND `duration` > 0 AND ends <= @CurrentTime";
await connection.ExecuteAsync(sql, new { CurrentTime = DateTime.Now });