diff --git a/CS2-SimpleAdmin.cs b/CS2-SimpleAdmin.cs index e2dcd52..2875f68 100644 --- a/CS2-SimpleAdmin.cs +++ b/CS2-SimpleAdmin.cs @@ -12,16 +12,16 @@ using System.Collections.Concurrent; namespace CS2_SimpleAdmin; -[MinimumApiVersion(198)] +[MinimumApiVersion(201)] public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig { public static CS2_SimpleAdmin Instance { get; private set; } = new(); public static IStringLocalizer? _localizer; - public static Dictionary voteAnswers = new Dictionary(); - public static ConcurrentBag godPlayers = new ConcurrentBag(); - public static ConcurrentBag silentPlayers = new ConcurrentBag(); - public static ConcurrentBag bannedPlayers = new ConcurrentBag(); + public static Dictionary voteAnswers = []; + public static ConcurrentBag godPlayers = []; + public static ConcurrentBag silentPlayers = []; + public static ConcurrentBag bannedPlayers = []; public static bool TagsDetected = false; public static bool voteInProgress = false; public static int? ServerId = null; @@ -38,7 +38,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig "CS2-SimpleAdmin"; public override string ModuleDescription => "Simple admin plugin for Counter-Strike 2 :)"; public override string ModuleAuthor => "daffyy & Dliix66"; - public override string ModuleVersion => "1.3.6d"; + public override string ModuleVersion => "1.3.7a"; public CS2_SimpleAdminConfig Config { get; set; } = new(); @@ -74,7 +74,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig - net7.0 + net8.0 CS2_SimpleAdmin enable enable @@ -10,7 +10,7 @@ - + diff --git a/Commands/basecommands.cs b/Commands/basecommands.cs index 22331a0..b3f5f66 100644 --- a/Commands/basecommands.cs +++ b/Commands/basecommands.cs @@ -38,6 +38,11 @@ namespace CS2_SimpleAdmin commandSql1.CommandText = commandText; await commandSql1.ExecuteNonQueryAsync(); + commandText = "ALTER TABLE `sa_bans` MODIFY `ends` TIMESTAMP NULL DEFAULT NULL;"; + using var commandSql2 = connection.CreateCommand(); + commandSql2.CommandText = commandText; + await commandSql2.ExecuteNonQueryAsync(); + command.ReplyToCommand($"Successfully updated the database - {ModuleVersion}"); } catch (Exception ex) diff --git a/Config.cs b/Config.cs index 5b83208..20fa8db 100644 --- a/Config.cs +++ b/Config.cs @@ -26,7 +26,7 @@ namespace CS2_SimpleAdmin public class CS2_SimpleAdminConfig : BasePluginConfig { - [JsonPropertyName("ConfigVersion")] public override int Version { get; set; } = 8; + [JsonPropertyName("ConfigVersion")] public override int Version { get; set; } = 9; [JsonPropertyName("DatabaseHost")] public string DatabaseHost { get; set; } = ""; @@ -43,6 +43,9 @@ namespace CS2_SimpleAdmin [JsonPropertyName("DatabaseName")] public string DatabaseName { get; set; } = ""; + [JsonPropertyName("EnableMetrics")] + public bool EnableMetrics { get; set; } = true; + [JsonPropertyName("UseChatMenu")] public bool UseChatMenu { get; set; } = false; diff --git a/Database/database_setup.sql b/Database/database_setup.sql index de7e1b4..8bda5f7 100644 --- a/Database/database_setup.sql +++ b/Database/database_setup.sql @@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS `sa_bans` ( `admin_name` VARCHAR(128) NOT NULL, `reason` VARCHAR(255) NOT NULL, `duration` INT NOT NULL, - `ends` TIMESTAMP NOT NULL, + `ends` TIMESTAMP NULL, `created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, `server_id` INT NULL, `status` ENUM('ACTIVE', 'UNBANNED', 'EXPIRED', '') NOT NULL DEFAULT 'ACTIVE' @@ -21,7 +21,7 @@ CREATE TABLE IF NOT EXISTS `sa_mutes` ( `admin_name` varchar(128) NOT NULL, `reason` varchar(255) NOT NULL, `duration` int(11) NOT NULL, - `ends` timestamp NOT NULL, + `ends` timestamp NULL, `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, `type` enum('GAG','MUTE','SILENCE','') NOT NULL DEFAULT 'GAG', `server_id` INT NULL, diff --git a/Events.cs b/Events.cs index 2ede139..efcb0ab 100644 --- a/Events.cs +++ b/Events.cs @@ -121,76 +121,89 @@ public partial class CS2_SimpleAdmin IpAddress = ipAddress }; + // Perform asynchronous database operations within a single method Task.Run(async () => { - // Initialize BanManager, MuteManager, and PlayerPenaltyManager within the async delegate + // Initialize managers BanManager _banManager = new(_database, Config); MuteManager _muteManager = new(_database); PlayerPenaltyManager playerPenaltyManager = new PlayerPenaltyManager(); - if (await _banManager.IsPlayerBanned(playerInfo)) + try { - if (playerInfo.IpAddress != null && !bannedPlayers.Contains(playerInfo.IpAddress)) - bannedPlayers.Add(playerInfo.IpAddress); - - if (playerInfo.SteamId != null && !bannedPlayers.Contains(playerInfo.SteamId)) - bannedPlayers.Add(playerInfo.SteamId); - - Server.NextFrame(() => + // Check if the player is banned + bool isBanned = await _banManager.IsPlayerBanned(playerInfo); + if (isBanned) { - var victim = Utilities.GetPlayerFromUserid(playerInfo.UserId); - if (victim != null && victim.UserId.HasValue) + // Add player's IP and SteamID to bannedPlayers list if not already present + if (playerInfo.IpAddress != null && !bannedPlayers.Contains(playerInfo.IpAddress)) + bannedPlayers.Add(playerInfo.IpAddress); + + if (playerInfo.SteamId != null && !bannedPlayers.Contains(playerInfo.SteamId)) + bannedPlayers.Add(playerInfo.SteamId); + + // Kick the player if banned + Server.NextFrame(() => { - Helper.KickPlayer(victim.UserId.Value, "Banned"); - } - }); + var victim = Utilities.GetPlayerFromUserid(playerInfo.UserId); + if (victim != null && victim.UserId.HasValue) + { + Helper.KickPlayer(victim.UserId.Value, "Banned"); + } + }); - return; - } + return; + } - List activeMutes = await _muteManager.IsPlayerMuted(playerInfo.SteamId); - - if (activeMutes.Count > 0) - { - foreach (dynamic mute in activeMutes) + // Check if the player is muted + List activeMutes = await _muteManager.IsPlayerMuted(playerInfo.SteamId); + if (activeMutes.Count > 0) { - string muteType = mute.type; - DateTime ends = mute.ends; - int duration = mute.duration; + foreach (dynamic mute in activeMutes) + { + string muteType = mute.type; + DateTime ends = mute.ends; + int duration = mute.duration; - if (muteType == "GAG") - { - playerPenaltyManager.AddPenalty(playerInfo.Slot, PenaltyType.Gag, ends, duration); - Server.NextFrame(() => + // Apply mute penalty based on mute type + if (muteType == "GAG") { - if (TagsDetected) + playerPenaltyManager.AddPenalty(playerInfo.Slot, PenaltyType.Gag, ends, duration); + Server.NextFrame(() => { - Server.ExecuteCommand($"css_tag_mute {playerInfo.SteamId}"); - } - }); - } - else if (muteType == "MUTE") - { - playerPenaltyManager.AddPenalty(playerInfo.Slot, PenaltyType.Mute, ends, duration); - Server.NextFrame(() => + if (TagsDetected) + { + Server.ExecuteCommand($"css_tag_mute {playerInfo.SteamId}"); + } + }); + } + else if (muteType == "MUTE") { - player.VoiceFlags = VoiceFlags.Muted; - }); - } - else - { - playerPenaltyManager.AddPenalty(playerInfo.Slot, PenaltyType.Silence, ends, duration); - Server.NextFrame(() => - { - player.VoiceFlags = VoiceFlags.Muted; - if (TagsDetected) + playerPenaltyManager.AddPenalty(playerInfo.Slot, PenaltyType.Mute, ends, duration); + Server.NextFrame(() => { - Server.ExecuteCommand($"css_tag_mute {playerInfo.SteamId}"); - } - }); + player.VoiceFlags = VoiceFlags.Muted; + }); + } + else + { + playerPenaltyManager.AddPenalty(playerInfo.Slot, PenaltyType.Silence, ends, duration); + Server.NextFrame(() => + { + player.VoiceFlags = VoiceFlags.Muted; + if (TagsDetected) + { + Server.ExecuteCommand($"css_tag_mute {playerInfo.SteamId}"); + } + }); + } } } } + catch (Exception ex) + { + Logger.LogError($"Error processing player connection: {ex}"); + } }); // Add player to loadedPlayers @@ -377,6 +390,21 @@ public partial class CS2_SimpleAdmin _logger?.LogCritical("Unable to create or get server_id" + ex.Message); } + if (Config.EnableMetrics) + { + string queryString = $"?address={address}&hostname={hostname}"; + using HttpClient client = new(); + + try + { + HttpResponseMessage response = await client.GetAsync($"https://api.daffyy.love/index.php{queryString}"); + } + catch (HttpRequestException ex) + { + Logger.LogWarning($"Unable to make metrics call: {ex.Message}"); + } + } + await _adminManager.GiveAllFlags(); }); diff --git a/Managers/AdminSQLManager.cs b/Managers/AdminSQLManager.cs index 871f54f..65e873a 100644 --- a/Managers/AdminSQLManager.cs +++ b/Managers/AdminSQLManager.cs @@ -1,6 +1,7 @@ using CounterStrikeSharp.API.Modules.Entities; using Dapper; using Microsoft.Extensions.Logging; +using MySqlConnector; using System.Collections.Concurrent; namespace CS2_SimpleAdmin; @@ -24,7 +25,7 @@ public class AdminSQLManager { DateTime now = DateTime.UtcNow.ToLocalTime(); - await using var connection = await _database.GetConnectionAsync(); + await using MySqlConnection connection = await _database.GetConnectionAsync(); string sql = "SELECT flags, immunity, ends FROM sa_admins WHERE player_steamid = @PlayerSteamID AND (ends IS NULL OR ends > @CurrentTime) AND (server_id IS NULL OR server_id = @serverid)"; List? activeFlags = (await connection.QueryAsync(sql, new { PlayerSteamID = steamId, CurrentTime = now, serverid = CS2_SimpleAdmin.ServerId }))?.ToList(); @@ -67,7 +68,7 @@ public class AdminSQLManager try { - await using var connection = await _database.GetConnectionAsync(); + await using MySqlConnection connection = await _database.GetConnectionAsync(); string sql = "SELECT player_steamid, flags, immunity, ends FROM sa_admins WHERE (ends IS NULL OR ends > @CurrentTime) AND (server_id IS NULL OR server_id = @serverid)"; List? activeFlags = (await connection.QueryAsync(sql, new { CurrentTime = now, serverid = CS2_SimpleAdmin.ServerId }))?.ToList(); @@ -160,7 +161,7 @@ public class AdminSQLManager //_adminCache.TryRemove(playerSteamId, out _); - await using var connection = await _database.GetConnectionAsync(); + await using MySqlConnection connection = await _database.GetConnectionAsync(); string sql = ""; @@ -189,7 +190,7 @@ public class AdminSQLManager else futureTime = null; - await using var connection = await _database.GetConnectionAsync(); + await using MySqlConnection connection = await _database.GetConnectionAsync(); var sql = "INSERT INTO `sa_admins` (`player_steamid`, `player_name`, `flags`, `immunity`, `ends`, `created`, `server_id`) " + "VALUES (@playerSteamid, @playerName, @flags, @immunity, @ends, @created, @serverid)"; @@ -212,7 +213,7 @@ public class AdminSQLManager { try { - await using var connection = await _database.GetConnectionAsync(); + await using MySqlConnection connection = await _database.GetConnectionAsync(); string sql = "DELETE FROM sa_admins WHERE ends IS NOT NULL AND ends <= @CurrentTime"; await connection.ExecuteAsync(sql, new { CurrentTime = DateTime.Now.ToLocalTime() }); diff --git a/Managers/BanManager.cs b/Managers/BanManager.cs index 208aed8..bd8fbe8 100644 --- a/Managers/BanManager.cs +++ b/Managers/BanManager.cs @@ -1,5 +1,6 @@ using Dapper; using Microsoft.Extensions.Logging; +using MySqlConnector; namespace CS2_SimpleAdmin; @@ -19,7 +20,7 @@ internal class BanManager DateTime now = DateTime.UtcNow.ToLocalTime(); DateTime futureTime = now.AddMinutes(time).ToLocalTime(); - await using var connection = await _database.GetConnectionAsync(); + 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)"; @@ -46,7 +47,7 @@ internal class BanManager DateTime now = DateTime.UtcNow.ToLocalTime(); DateTime futureTime = now.AddMinutes(time).ToLocalTime(); - await using var connection = await _database.GetConnectionAsync(); + 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)"; @@ -71,7 +72,7 @@ internal class BanManager DateTime now = DateTime.UtcNow.ToLocalTime(); DateTime futureTime = now.AddMinutes(time).ToLocalTime(); - await using var connection = await _database.GetConnectionAsync(); + 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)"; @@ -91,7 +92,7 @@ internal class BanManager public async Task IsPlayerBanned(PlayerInfo player) { - if (player.SteamId == null && player.IpAddress == null) + if (player.SteamId == null || player.IpAddress == null) { return false; } @@ -120,7 +121,7 @@ internal class BanManager AND status = 'ACTIVE' AND (duration = 0 OR ends > @CurrentTime);"; - await using var connection = await _database.GetConnectionAsync(); + await using MySqlConnection connection = await _database.GetConnectionAsync(); var parameters = new { @@ -145,7 +146,7 @@ internal class BanManager string sql = "SELECT COUNT(*) FROM sa_bans WHERE (player_steamid = @PlayerSteamID OR player_ip = @PlayerIP)"; int banCount; - await using var connection = await _database.GetConnectionAsync(); + await using MySqlConnection connection = await _database.GetConnectionAsync(); if (!string.IsNullOrEmpty(player.IpAddress)) { @@ -166,7 +167,7 @@ internal class BanManager return; } - await using var 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 }); @@ -178,11 +179,11 @@ internal class BanManager { DateTime currentTime = DateTime.UtcNow.ToLocalTime(); - await using var connection = await _database.GetConnectionAsync(); + await using MySqlConnection connection = await _database.GetConnectionAsync(); /* string sql = ""; - await using var connection = await _database.GetConnectionAsync(); + await using MySqlConnection connection = await _database.GetConnectionAsync(); sql = "UPDATE sa_bans SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND `duration` > 0 AND ends <= @CurrentTime"; await connection.ExecuteAsync(sql, new { CurrentTime = DateTime.UtcNow.ToLocalTime() }); diff --git a/Managers/MuteManager.cs b/Managers/MuteManager.cs index da693ea..cb27c41 100644 --- a/Managers/MuteManager.cs +++ b/Managers/MuteManager.cs @@ -1,5 +1,6 @@ using Dapper; using Microsoft.Extensions.Logging; +using MySqlConnector; namespace CS2_SimpleAdmin; @@ -16,7 +17,7 @@ internal class MuteManager { if (player == null || player.SteamId == null) return; - await using var connection = await _database.GetConnectionAsync(); + await using MySqlConnection connection = await _database.GetConnectionAsync(); DateTime now = DateTime.UtcNow.ToLocalTime(); DateTime futureTime = now.AddMinutes(time).ToLocalTime(); @@ -49,7 +50,7 @@ internal class MuteManager { if (string.IsNullOrEmpty(playerSteamId)) return; - await using var connection = await _database.GetConnectionAsync(); + await using MySqlConnection connection = await _database.GetConnectionAsync(); DateTime now = DateTime.UtcNow.ToLocalTime(); DateTime futureTime = now.AddMinutes(time).ToLocalTime(); @@ -91,7 +92,7 @@ internal class MuteManager try { - await using var connection = await _database.GetConnectionAsync(); + await using MySqlConnection connection = await _database.GetConnectionAsync(); DateTime currentTime = DateTime.Now.ToLocalTime(); string sql = "SELECT * FROM sa_mutes WHERE player_steamid = @PlayerSteamID AND status = 'ACTIVE' AND (duration = 0 OR ends > @CurrentTime)"; @@ -107,7 +108,7 @@ internal class MuteManager public async Task GetPlayerMutes(string steamId) { - await using var connection = await _database.GetConnectionAsync(); + await using MySqlConnection connection = await _database.GetConnectionAsync(); int muteCount; string sql = "SELECT COUNT(*) FROM sa_mutes WHERE player_steamid = @PlayerSteamID"; @@ -124,7 +125,7 @@ internal class MuteManager return; } - await using var connection = await _database.GetConnectionAsync(); + await using MySqlConnection connection = await _database.GetConnectionAsync(); if (type == 2) { @@ -150,7 +151,7 @@ internal class MuteManager { try { - await using var connection = await _database.GetConnectionAsync(); + await using MySqlConnection connection = await _database.GetConnectionAsync(); string sql = "UPDATE sa_mutes SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND `duration` > 0 AND ends <= @CurrentTime"; await connection.ExecuteAsync(sql, new { CurrentTime = DateTime.Now.ToLocalTime() }); diff --git a/README.md b/README.md index 4dc8bbd..4ccabcd 100644 --- a/README.md +++ b/README.md @@ -61,14 +61,18 @@ Manage your Counter-Strike 2 server by simple commands :) - team_chat @Message - Say message to all admins // @css/chat ``` -### Requirments -- [CounterStrikeSharp](https://github.com/roflmuffin/CounterStrikeSharp/) **tested on v168** +### Requirements +- [CounterStrikeSharp](https://github.com/roflmuffin/CounterStrikeSharp/) **tested on v201** - MySQL **tested on MySQL (MariaDB) Server version: 10.11.4-MariaDB-1~deb12u1 Debian 12** ### Configuration After first launch, u need to configure plugin in addons/counterstrikesharp/configs/plugins/CS2-SimpleAdmin/CS2-SimpleAdmin.json +### Metrics +From version 1.3.7a, CS2-SimpleAdmin now initiates metrics data collection. This includes gathering essential information such as the `server name` and `server address`. +You can disable metrics by set `EnableMetrics` to false in plugin configuration. + ### Colors ``` public static char Default = '\x01';