Changed to async, instantly mute in CS2-Tags plugin

- Changed to async
- instantly mute in CS2-Tags plugin
This commit is contained in:
daffyyyy
2023-12-03 23:37:44 +01:00
parent 696b8c3877
commit 13e170a9c4
4 changed files with 200 additions and 121 deletions

View File

@@ -9,79 +9,78 @@ namespace CS2_SimpleAdmin
{
internal class BanManager
{
private readonly IDbConnection _dbConnection;
private readonly MySqlConnection _dbConnection;
public BanManager(string connectionString)
{
_dbConnection = new MySqlConnection(connectionString);
}
public void BanPlayer(CCSPlayerController? player, CCSPlayerController? issuer, string reason, int time = 0)
public async Task BanPlayer(CCSPlayerController? player, CCSPlayerController? issuer, string reason, int time = 0)
{
_dbConnection.Open();
if (player == null || !player.IsValid || player.AuthorizedSteamID == null) return;
DateTime now = DateTime.Now;
DateTime futureTime = now.AddMinutes(time);
await using var connection = _dbConnection;
await connection.OpenAsync();
var sql = "INSERT INTO `sa_bans` (`player_steamid`, `player_name`, `player_ip`, `admin_steamid`, `admin_name`, `reason`, `duration`, `ends`, `created`) " +
"VALUES (@playerSteamid, @playerName, @playerIp, @adminSteamid, @adminName, @banReason, @duration, @ends, @created)";
_dbConnection.Execute(sql, new
await connection.ExecuteAsync(sql, new
{
playerSteamid = player.AuthorizedSteamID.SteamId64.ToString(),
playerName = player.PlayerName,
playerIp = player.IpAddress!.Split(":")[0],
adminSteamid = issuer == null ? "Console" : issuer?.AuthorizedSteamID?.SteamId64.ToString(),
adminSteamid = issuer == null ? "Console" : issuer.AuthorizedSteamID?.SteamId64.ToString(),
adminName = issuer == null ? "Console" : issuer.PlayerName,
banReason = reason,
duration = time,
ends = futureTime,
created = now
});
_dbConnection.Close();
}
public void AddBanBySteamid(string playerSteamId, CCSPlayerController? issuer, string reason, int time = 0)
public async Task AddBanBySteamid(string playerSteamId, CCSPlayerController? issuer, string reason, int time = 0)
{
if (string.IsNullOrEmpty(playerSteamId)) return;
_dbConnection.Open();
DateTime now = DateTime.Now;
DateTime futureTime = now.AddMinutes(time);
await using var connection = _dbConnection;
await connection.OpenAsync();
var sql = "INSERT INTO `sa_bans` (`player_steamid`, `admin_steamid`, `admin_name`, `reason`, `duration`, `ends`, `created`) " +
"VALUES (@playerSteamid, @adminSteamid, @adminName, @banReason, @duration, @ends, @created)";
_dbConnection.Execute(sql, new
await connection.ExecuteAsync(sql, new
{
playerSteamid = playerSteamId,
adminSteamid = issuer == null ? "Console" : issuer?.AuthorizedSteamID?.SteamId64.ToString(),
adminSteamid = issuer == null ? "Console" : issuer.AuthorizedSteamID?.SteamId64.ToString(),
adminName = issuer == null ? "Console" : issuer.PlayerName,
banReason = reason,
duration = time,
ends = futureTime,
created = now
});
_dbConnection.Close();
}
public void AddBanByIp(string playerIp, CCSPlayerController? issuer, string reason, int time = 0)
public async Task AddBanByIp(string playerIp, CCSPlayerController? issuer, string reason, int time = 0)
{
if (string.IsNullOrEmpty(playerIp)) return;
_dbConnection.Open();
DateTime now = DateTime.Now;
DateTime futureTime = now.AddMinutes(time);
await using var connection = _dbConnection;
await connection.OpenAsync();
var sql = "INSERT INTO `sa_bans` (`player_ip`, `admin_steamid`, `admin_name`, `reason`, `duration`, `ends`, `created`) " +
"VALUES (@playerIp, @adminSteamid, @adminName, @banReason, @duration, @ends, @created)";
_dbConnection.Execute(sql, new
await connection.ExecuteAsync(sql, new
{
playerIp,
adminSteamid = issuer == null ? "Console" : issuer?.AuthorizedSteamID?.SteamId64.ToString(),
@@ -91,56 +90,76 @@ namespace CS2_SimpleAdmin
ends = futureTime,
created = now
});
_dbConnection.Close();
}
public bool IsPlayerBanned(string steamId, string? ipAddress = null)
public async Task<bool> IsPlayerBanned(string steamId, string? ipAddress = null)
{
_dbConnection.Open();
DateTime now = DateTime.Now;
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;
await using var connection = _dbConnection;
await connection.OpenAsync();
if (!string.IsNullOrEmpty(ipAddress))
{
banCount = _dbConnection.ExecuteScalar<int>(sql, new { PlayerSteamID = steamId, PlayerIP = ipAddress, CurrentTime = now });
banCount = await connection.ExecuteScalarAsync<int>(sql, new { PlayerSteamID = steamId, PlayerIP = ipAddress, CurrentTime = now });
}
else
{
banCount = _dbConnection.ExecuteScalar<int>(sql, new { PlayerSteamID = steamId, PlayerIP = DBNull.Value, CurrentTime = now });
banCount = await connection.ExecuteScalarAsync<int>(sql, new { PlayerSteamID = steamId, PlayerIP = DBNull.Value, CurrentTime = now });
}
return banCount > 0;
}
public void UnbanPlayer(string playerPattern)
public async Task UnbanPlayer(string playerPattern)
{
if (playerPattern == null || playerPattern.Length <= 1)
{
return;
}
_dbConnection.Open();
await using var connection = _dbConnection;
await connection.OpenAsync();
string sqlUnban = "UPDATE sa_bans SET status = 'UNBANNED' WHERE player_steamid = @pattern OR player_name = @pattern OR player_ip = @pattern AND status = 'ACTIVE'";
_dbConnection.Execute(sqlUnban, new { pattern = playerPattern });
_dbConnection.Close();
await connection.ExecuteAsync(sqlUnban, new { pattern = playerPattern });
}
public void ExpireOldBans()
public async Task ExpireOldBans()
{
_dbConnection.Open();
await using var connection = _dbConnection;
await connection.OpenAsync();
string sql = "UPDATE sa_bans SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND `duration` > 0 AND ends <= @CurrentTime";
_dbConnection.Execute(sql, new { CurrentTime = DateTime.Now });
//int affectedRows = _dbConnection.Execute(sql, new { CurrentTime = DateTime.Now });
await connection.ExecuteAsync(sql, new { CurrentTime = DateTime.Now });
}
_dbConnection.Close();
public async Task CheckBan(CCSPlayerController? player)
{
if (player == null || !player.IsValid || player.AuthorizedSteamID == null) return;
string steamId = player.AuthorizedSteamID.SteamId64.ToString();
string? ipAddress = player.IpAddress?.Split(":")[0];
bool isBanned = false;
if (ipAddress != null)
{
isBanned = await IsPlayerBanned(steamId, ipAddress);
}
else
{
isBanned = await IsPlayerBanned(steamId);
}
if (isBanned)
{
Helper.KickPlayer(player.UserId, "Banned");
}
}
}