1.3.8b

- Plugin checks every minute if a player is banned - Minor changes - Removed bot_quota warning - NET8
2026-02-18 10:43:23 +00:00 · 2024-04-16 22:08:44 +02:00
parent 143f0b7e1b
commit 7a8fd066f7
9 changed files with 232 additions and 144 deletions
--- a/Managers/AdminSQLManager.cs
+++ b/Managers/AdminSQLManager.cs
@@ -12,7 +12,7 @@ public class AdminSQLManager

 	// Unused for now
 	//public static readonly ConcurrentDictionary<string, ConcurrentBag<string>> _adminCache = new ConcurrentDictionary<string, ConcurrentBag<string>>();
-	public static readonly ConcurrentDictionary<SteamID, DateTime?> _adminCache = new ConcurrentDictionary<SteamID, DateTime?>();
+	public static readonly ConcurrentDictionary<SteamID, DateTime?> _adminCache = new();

 	//public static readonly ConcurrentDictionary<SteamID, DateTime?> _adminCacheTimestamps = new ConcurrentDictionary<SteamID, DateTime?>();

--- a/Managers/BanManager.cs
+++ b/Managers/BanManager.cs
@@ -1,43 +1,42 @@
-using Dapper;
+using CounterStrikeSharp.API;
+using Dapper;
 using Microsoft.Extensions.Logging;
 using MySqlConnector;

 namespace CS2_SimpleAdmin;

-internal class BanManager
+internal class BanManager(Database database, CS2_SimpleAdminConfig config)
 {
-	private readonly Database _database;
-	private readonly CS2_SimpleAdminConfig _config;
-
-	public BanManager(Database database, CS2_SimpleAdminConfig config)
-	{
-		_database = database;
-		_config = config;
-	}
+	private readonly Database _database = database;
+	private readonly CS2_SimpleAdminConfig _config = config;

 	public async Task BanPlayer(PlayerInfo player, PlayerInfo issuer, string reason, int time = 0)
 	{
 		DateTime now = DateTime.UtcNow.ToLocalTime();
 		DateTime futureTime = now.AddMinutes(time).ToLocalTime();

-		await using MySqlConnection 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)";
-
-		await connection.ExecuteAsync(sql, new
+		try
 		{
-			playerSteamid = player.SteamId,
-			playerName = player.Name,
-			playerIp = _config.BanType == 1 ? player.IpAddress : null,
-			adminSteamid = issuer.SteamId == null ? "Console" : issuer.SteamId,
-			adminName = issuer.Name == null ? "Console" : issuer.Name,
-			banReason = reason,
-			duration = time,
-			ends = futureTime,
-			created = now,
-			serverid = CS2_SimpleAdmin.ServerId
-		});
+			await using MySqlConnection 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)";
+
+			await connection.ExecuteAsync(sql, new
+			{
+				playerSteamid = player.SteamId,
+				playerName = player.Name,
+				playerIp = _config.BanType == 1 ? player.IpAddress : null,
+				adminSteamid = issuer.SteamId ?? "Console",
+				adminName = issuer.Name ?? "Console",
+				banReason = reason,
+				duration = time,
+				ends = futureTime,
+				created = now,
+				serverid = CS2_SimpleAdmin.ServerId
+			});
+		}
+		catch { }
 	}

 	public async Task AddBanBySteamid(string playerSteamId, PlayerInfo issuer, string reason, int time = 0)
@@ -47,22 +46,26 @@ internal class BanManager
 		DateTime now = DateTime.UtcNow.ToLocalTime();
 		DateTime futureTime = now.AddMinutes(time).ToLocalTime();

-		await using MySqlConnection 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)";
-
-		await connection.ExecuteAsync(sql, new
+		try
 		{
-			playerSteamid = playerSteamId,
-			adminSteamid = issuer.SteamId == null ? "Console" : issuer.SteamId,
-			adminName = issuer.Name == null ? "Console" : issuer.Name,
-			banReason = reason,
-			duration = time,
-			ends = futureTime,
-			created = now,
-			serverid = CS2_SimpleAdmin.ServerId
-		});
+			await using MySqlConnection 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)";
+
+			await connection.ExecuteAsync(sql, new
+			{
+				playerSteamid = playerSteamId,
+				adminSteamid = issuer.SteamId ?? "Console",
+				adminName = issuer.Name ?? "Console",
+				banReason = reason,
+				duration = time,
+				ends = futureTime,
+				created = now,
+				serverid = CS2_SimpleAdmin.ServerId
+			});
+		}
+		catch { }
 	}

 	public async Task AddBanByIp(string playerIp, PlayerInfo issuer, string reason, int time = 0)
@@ -72,22 +75,26 @@ internal class BanManager
 		DateTime now = DateTime.UtcNow.ToLocalTime();
 		DateTime futureTime = now.AddMinutes(time).ToLocalTime();

-		await using MySqlConnection 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)";
-
-		await connection.ExecuteAsync(sql, new
+		try
 		{
-			playerIp,
-			adminSteamid = issuer.SteamId == null ? "Console" : issuer.SteamId,
-			adminName = issuer.Name == null ? "Console" : issuer.Name,
-			banReason = reason,
-			duration = time,
-			ends = futureTime,
-			created = now,
-			serverid = CS2_SimpleAdmin.ServerId
-		});
+			await using MySqlConnection 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)";
+
+			await connection.ExecuteAsync(sql, new
+			{
+				playerIp,
+				adminSteamid = issuer.SteamId ?? "Console",
+				adminName = issuer.Name ?? "Console",
+				banReason = reason,
+				duration = time,
+				ends = futureTime,
+				created = now,
+				serverid = CS2_SimpleAdmin.ServerId
+			});
+		}
+		catch { }
 	}

 	public async Task<bool> IsPlayerBanned(PlayerInfo player)
@@ -143,21 +150,27 @@ internal class BanManager

 	public async Task<int> GetPlayerBans(PlayerInfo player)
 	{
-		string sql = "SELECT COUNT(*) FROM sa_bans WHERE (player_steamid = @PlayerSteamID OR player_ip = @PlayerIP)";
-		int banCount;
-
-		await using MySqlConnection connection = await _database.GetConnectionAsync();
-
-		if (!string.IsNullOrEmpty(player.IpAddress))
+		try
 		{
-			banCount = await connection.ExecuteScalarAsync<int>(sql, new { PlayerSteamID = player.SteamId, PlayerIP = player.IpAddress });
-		}
-		else
-		{
-			banCount = await connection.ExecuteScalarAsync<int>(sql, new { PlayerSteamID = player.SteamId, PlayerIP = DBNull.Value });
-		}
+			string sql = "SELECT COUNT(*) FROM sa_bans WHERE (player_steamid = @PlayerSteamID OR player_ip = @PlayerIP)";
+			int banCount;

-		return banCount;
+			await using MySqlConnection connection = await _database.GetConnectionAsync();
+
+			if (!string.IsNullOrEmpty(player.IpAddress))
+			{
+				banCount = await connection.ExecuteScalarAsync<int>(sql, new { PlayerSteamID = player.SteamId, PlayerIP = player.IpAddress });
+			}
+			else
+			{
+				banCount = await connection.ExecuteScalarAsync<int>(sql, new { PlayerSteamID = player.SteamId, PlayerIP = DBNull.Value });
+			}
+
+			return banCount;
+		}
+		catch { }
+
+		return 0;
 	}

 	public async Task UnbanPlayer(string playerPattern)
@@ -166,11 +179,48 @@ internal class BanManager
 		{
 			return;
 		}
+		try
+		{
+			await using MySqlConnection connection = await _database.GetConnectionAsync();

-		await using MySqlConnection 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 });

-		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 });
+		}
+		catch { }
+	}
+
+	public async Task CheckOnlinePlayers(List<(string? IpAddress, ulong SteamID, int? UserId)> players)
+	{
+		try
+		{
+			await using MySqlConnection connection = await _database.GetConnectionAsync();
+			string sql = "SELECT COUNT(*) FROM sa_bans WHERE (player_steamid = @PlayerSteamID OR player_ip = @PlayerIP) AND status = 'ACTIVE'";
+
+			foreach (var (IpAddress, SteamID, UserId) in players)
+			{
+				if (!UserId.HasValue) continue;
+
+				int banCount = 0;
+				if (!string.IsNullOrEmpty(IpAddress))
+				{
+					banCount = await connection.ExecuteScalarAsync<int>(sql, new { PlayerSteamID = SteamID, PlayerIP = IpAddress });
+				}
+				else
+				{
+					banCount = await connection.ExecuteScalarAsync<int>(sql, new { PlayerSteamID = SteamID, PlayerIP = DBNull.Value });
+				}
+
+				if (banCount > 0)
+				{
+					Server.NextFrame(() =>
+					{
+						Helper.KickPlayer(UserId.Value, "Banned");
+					});
+				}
+			}
+		}
+		catch { }
 	}

 	public async Task ExpireOldBans()