Migrate menus and votes to Panorama UI Kit

Replace MenuManagerCS2 with Panorama UI Kit for the admin menus and
css_vote. Layout names (menu, vote, banner, toast) are configurable
under MenuConfig and preloaded on startup; MenuType is removed and
ConfigVersion bumped to 26.

- Drop MenuManagerApi.dll and the old chat menu classes
- Reference PanoramaUiKit.Shared.dll, bump CounterStrikeSharp to 1.0.376
- Add .editorconfig and CODING_CONVENTIONS.md, apply them codebase-wide
- Remove the CS2-SimpleAdmin-docs site
- Rewrite README for the fork

CS2-SimpleAdmin/Database/Database.cs

@@ -9,13 +9,13 @@ public class Database(string dbConnectionString)
     {
         try
         {
-            var connection = new MySqlConnection(dbConnectionString);
+            MySqlConnection connection = new MySqlConnection(dbConnectionString);
             connection.Open();
-            
+
             // using var cmd = connection.CreateCommand();
             // cmd.CommandText = "SET NAMES 'utf8mb4' COLLATE 'utf8mb4_general_ci';";
             // cmd.ExecuteNonQueryAsync();
-            
+
             return connection;
         }
         catch (Exception ex)
@@ -29,13 +29,13 @@ public class Database(string dbConnectionString)
     {
         try
         {
-            var connection = new MySqlConnection(dbConnectionString);
+            MySqlConnection connection = new MySqlConnection(dbConnectionString);
             await connection.OpenAsync();
 
             // await using var cmd = connection.CreateCommand();
             // cmd.CommandText = "SET NAMES 'utf8mb4' COLLATE 'utf8mb4_general_ci';";
             // await cmd.ExecuteNonQueryAsync();
-            
+
             return connection;
         }
         catch (Exception ex)
@@ -53,9 +53,9 @@ public class Database(string dbConnectionString)
 
     public bool CheckDatabaseConnection(out string? exception)
     {
-        using var connection = GetConnection();
+        using MySqlConnection connection = GetConnection();
         exception = null;
-        
+
         try
         {
             return connection.Ping();
@@ -66,4 +66,4 @@ public class Database(string dbConnectionString)
             return false;
         }
     }
-}
+}

CS2-SimpleAdmin/Database/IDatabaseProvider.cs

@@ -7,7 +7,7 @@ public interface IDatabaseProvider
     Task<DbConnection> CreateConnectionAsync();
     Task<(bool Success, string? Exception)> CheckConnectionAsync();
     Task DatabaseMigrationAsync();
-    
+
     // CacheManager
     string GetBanSelectQuery(bool multiServer);
     string GetIpHistoryQuery();
@@ -15,7 +15,7 @@ public interface IDatabaseProvider
 
     // PlayerManager
     string GetUpsertPlayerIpQuery();
-    
+
     // PermissionManager
     string GetAdminsQuery();
     string GetDeleteAdminQuery(bool globalDelete);
@@ -29,7 +29,7 @@ public interface IDatabaseProvider
     string GetAddGroupServerQuery();
     string GetDeleteGroupQuery();
     string GetDeleteOldAdminsQuery();
-    
+
     // BanManager
     string GetAddBanQuery();
     string GetAddBanBySteamIdQuery();
@@ -58,7 +58,7 @@ public interface IDatabaseProvider
     string GetInsertUnmuteQuery(bool includeReason);
     string GetUpdateMuteStatusQuery();
     string GetExpireMutesQuery(bool multiServer, int timeMode);
-    
+
     // WarnManager
     string GetAddWarnQuery(bool includePlayerName);
     string GetPlayerWarnsQuery(bool multiServer, bool active);
@@ -69,4 +69,4 @@ public interface IDatabaseProvider
 
     // Penalty history (css_history)
     string GetPenaltyHistoryQuery(bool multiServer);
-}
+}

CS2-SimpleAdmin/Database/Migration.cs

@@ -12,12 +12,19 @@ public class Migration(string migrationsPath)
     /// </summary>
     public async Task ExecuteMigrationsAsync()
     {
-        if (CS2_SimpleAdmin.DatabaseProvider == null) return;
-        var files = Directory.GetFiles(migrationsPath, "*.sql").OrderBy(f => f).ToList();
-        if (files.Count == 0) return;
+        if (CS2_SimpleAdmin.DatabaseProvider == null)
+        {
+            return;
+        }
 
-        await using var connection = await CS2_SimpleAdmin.DatabaseProvider.CreateConnectionAsync();
-        await using (var cmd = connection.CreateCommand())
+        List<string> files = Directory.GetFiles(migrationsPath, "*.sql").OrderBy(f => f).ToList();
+        if (files.Count == 0)
+        {
+            return;
+        }
+
+        await using DbConnection connection = await CS2_SimpleAdmin.DatabaseProvider.CreateConnectionAsync();
+        await using (DbCommand cmd = connection.CreateCommand())
         {
             if (migrationsPath.Contains("sqlite", StringComparison.CurrentCultureIgnoreCase))
             {
@@ -42,19 +49,21 @@ public class Migration(string migrationsPath)
             await cmd.ExecuteNonQueryAsync();
         }
 
-        var lastAppliedVersion = await GetLastAppliedVersionAsync(connection);
+        string lastAppliedVersion = await GetLastAppliedVersionAsync(connection);
 
-        foreach (var file in files)
+        foreach (string file in files)
         {
-            var version = Path.GetFileNameWithoutExtension(file);
+            string version = Path.GetFileNameWithoutExtension(file);
             if (string.Compare(version, lastAppliedVersion, StringComparison.OrdinalIgnoreCase) <= 0)
+            {
                 continue;
+            }
 
             try
             {
-                var sqlScript = await File.ReadAllTextAsync(file);
+                string sqlScript = await File.ReadAllTextAsync(file);
 
-                await using (var cmdMigration = connection.CreateCommand())
+                await using (DbCommand cmdMigration = connection.CreateCommand())
                 {
                     cmdMigration.CommandText = sqlScript;
                     await cmdMigration.ExecuteNonQueryAsync();
@@ -79,9 +88,9 @@ public class Migration(string migrationsPath)
     /// <returns>The version string of the last applied migration, or empty string if none.</returns>
     private static async Task<string> GetLastAppliedVersionAsync(DbConnection connection)
     {
-        await using var cmd = connection.CreateCommand();
+        await using DbCommand cmd = connection.CreateCommand();
         cmd.CommandText = "SELECT version FROM sa_migrations ORDER BY id DESC LIMIT 1;";
-        var result = await cmd.ExecuteScalarAsync();
+        object? result = await cmd.ExecuteScalarAsync();
         return result?.ToString() ?? string.Empty;
     }
 
@@ -92,10 +101,10 @@ public class Migration(string migrationsPath)
     /// <param name="version">The version string of the migration applied.</param>
     private static async Task UpdateLastAppliedVersionAsync(DbConnection connection, string version)
     {
-        await using var cmd = connection.CreateCommand();
+        await using DbCommand cmd = connection.CreateCommand();
         cmd.CommandText = "INSERT INTO sa_migrations (version) VALUES (@Version);";
 
-        var param = cmd.CreateParameter();
+        DbParameter param = cmd.CreateParameter();
         param.ParameterName = "@Version";
         param.Value = version;
         cmd.Parameters.Add(param);

CS2-SimpleAdmin/Database/MysqlDatabaseProvider.cs

@@ -7,14 +7,14 @@ public class MySqlDatabaseProvider(string connectionString) : IDatabaseProvider
 {
     public async Task<DbConnection> CreateConnectionAsync()
     {
-        var connection = new MySqlConnection(connectionString);
+        MySqlConnection connection = new MySqlConnection(connectionString);
         await connection.OpenAsync();
-        
-        await using var cmd = connection.CreateCommand();
-        
+
+        await using MySqlCommand cmd = connection.CreateCommand();
+
         cmd.CommandText = "SET NAMES 'utf8mb4' COLLATE 'utf8mb4_general_ci';";
         await cmd.ExecuteNonQueryAsync();
-        
+
         // cmd.CommandText = "SET time_zone = '+00:00';";
         await cmd.ExecuteNonQueryAsync();
 
@@ -25,7 +25,7 @@ public class MySqlDatabaseProvider(string connectionString) : IDatabaseProvider
     {
         try
         {
-            await using var conn = await CreateConnectionAsync();
+            await using DbConnection conn = await CreateConnectionAsync();
             return (true, null);
         }
         catch (Exception ex)
@@ -33,52 +33,62 @@ public class MySqlDatabaseProvider(string connectionString) : IDatabaseProvider
             return (false, ex.Message);
         }
     }
-    
+
     public Task DatabaseMigrationAsync()
     {
-        var migration = new Migration(CS2_SimpleAdmin.Instance.ModuleDirectory + "/Database/Migrations/Mysql");
+        Migration migration = new Migration(CS2_SimpleAdmin.Instance.ModuleDirectory + "/Database/Migrations/Mysql");
         return migration.ExecuteMigrationsAsync();
     }
 
     public string GetBanSelectQuery(bool multiServer)
     {
-        return multiServer ? """
-                             SELECT 
-                             id AS Id,
-                             player_name AS PlayerName,
-                             player_steamid AS PlayerSteamId,
-                             player_ip AS PlayerIp,
-                             status AS Status
-                             FROM sa_bans
-                             """ : """
-                                   SELECT
-                                   id AS Id,
-                                       player_name AS PlayerName,
-                                       player_steamid AS PlayerSteamId,
-                                       player_ip AS PlayerIp,
-                                       status AS Status 
-                                   FROM sa_bans
-                                   WHERE server_id = @serverId
-                                   """;
-    }    
-    
+        if (multiServer)
+        {
+            return """
+                                 SELECT 
+                                 id AS Id,
+                                 player_name AS PlayerName,
+                                 player_steamid AS PlayerSteamId,
+                                 player_ip AS PlayerIp,
+                                 status AS Status
+                                 FROM sa_bans
+                                 """;
+        }
+
+        return """
+              SELECT
+              id AS Id,
+                  player_name AS PlayerName,
+                  player_steamid AS PlayerSteamId,
+                  player_ip AS PlayerIp,
+                  status AS Status 
+              FROM sa_bans
+              WHERE server_id = @serverId
+              """;
+    }
+
     public static string GetBanUpdatedSelectQuery(bool multiServer)
     {
-        return multiServer ? """
-                             SELECT id AS Id,
-                             player_name AS PlayerName,
-                             player_steamid AS PlayerSteamId,
-                             player_ip AS PlayerIp,
-                             status AS Status 
-                             FROM `sa_bans` WHERE updated_at > @lastUpdate OR created > @lastUpdate ORDER BY updated_at DESC
-                             """ : """
-                                   SELECT id AS Id,
-                                   player_name AS PlayerName,
-                                   player_steamid AS PlayerSteamId,
-                                   player_ip AS PlayerIp,
-                                   status AS Status 
-                                   FROM `sa_bans` WHERE (updated_at > @lastUpdate OR created > @lastUpdate) AND server_id = @serverId ORDER BY updated_at DESC
-                                   """;
+        if (multiServer)
+        {
+            return """
+                                 SELECT id AS Id,
+                                 player_name AS PlayerName,
+                                 player_steamid AS PlayerSteamId,
+                                 player_ip AS PlayerIp,
+                                 status AS Status 
+                                 FROM `sa_bans` WHERE updated_at > @lastUpdate OR created > @lastUpdate ORDER BY updated_at DESC
+                                 """;
+        }
+
+        return """
+              SELECT id AS Id,
+              player_name AS PlayerName,
+              player_steamid AS PlayerSteamId,
+              player_ip AS PlayerIp,
+              status AS Status 
+              FROM `sa_bans` WHERE (updated_at > @lastUpdate OR created > @lastUpdate) AND server_id = @serverId ORDER BY updated_at DESC
+              """;
     }
 
     public string GetIpHistoryQuery()
@@ -99,25 +109,30 @@ public class MySqlDatabaseProvider(string connectionString) : IDatabaseProvider
 
     public string GetBanUpdateQuery(bool multiServer)
     {
-        return multiServer ? """
-                             UPDATE sa_bans
-                             SET 
-                                 player_ip = COALESCE(player_ip, @PlayerIP),
-                                 player_name = COALESCE(player_name, @PlayerName)
-                             WHERE 
-                                 (player_steamid = @PlayerSteamID OR player_ip = @PlayerIP)
-                                 AND status = 'ACTIVE'
-                                 AND (duration = 0 OR ends > @CurrentTime)
-                             """ : """
-                                   UPDATE sa_bans
-                                   SET 
-                                       player_ip = COALESCE(player_ip, @PlayerIP),
-                                       player_name = COALESCE(player_name, @PlayerName)
-                                   WHERE 
-                                       (player_steamid = @PlayerSteamID OR player_ip = @PlayerIP)
-                                       AND status = 'ACTIVE'
-                                       AND (duration = 0 OR ends > @CurrentTime) AND server_id = @ServerId
-                                   """;
+        if (multiServer)
+        {
+            return """
+                                 UPDATE sa_bans
+                                 SET 
+                                     player_ip = COALESCE(player_ip, @PlayerIP),
+                                     player_name = COALESCE(player_name, @PlayerName)
+                                 WHERE 
+                                     (player_steamid = @PlayerSteamID OR player_ip = @PlayerIP)
+                                     AND status = 'ACTIVE'
+                                     AND (duration = 0 OR ends > @CurrentTime)
+                                 """;
+        }
+
+        return """
+              UPDATE sa_bans
+              SET 
+                  player_ip = COALESCE(player_ip, @PlayerIP),
+                  player_name = COALESCE(player_name, @PlayerName)
+              WHERE 
+                  (player_steamid = @PlayerSteamID OR player_ip = @PlayerIP)
+                  AND status = 'ACTIVE'
+                  AND (duration = 0 OR ends > @CurrentTime) AND server_id = @ServerId
+              """;
     }
 
     public string GetAdminsQuery()
@@ -131,12 +146,17 @@ public class MySqlDatabaseProvider(string connectionString) : IDatabaseProvider
                ORDER BY sa_admins.player_steamid
                """;
     }
-    
-    public string GetDeleteAdminQuery(bool globalDelete) =>
-        globalDelete
-            ? "DELETE FROM sa_admins WHERE player_steamid = @PlayerSteamID"
-            : "DELETE FROM sa_admins WHERE player_steamid = @PlayerSteamID AND server_id = @ServerId";
-    
+
+    public string GetDeleteAdminQuery(bool globalDelete)
+    {
+        if (globalDelete)
+        {
+            return "DELETE FROM sa_admins WHERE player_steamid = @PlayerSteamID";
+        }
+
+        return "DELETE FROM sa_admins WHERE player_steamid = @PlayerSteamID AND server_id = @ServerId";
+    }
+
     public string GetAddAdminQuery() =>
         "INSERT INTO sa_admins (player_steamid, player_name, immunity, ends, created, server_id) " +
         "VALUES (@playerSteamId, @playerName, @immunity, @ends, @created, @serverid); SELECT LAST_INSERT_ID();";
@@ -160,7 +180,7 @@ public class MySqlDatabaseProvider(string connectionString) : IDatabaseProvider
 
     public string GetAddGroupQuery() =>
         "INSERT INTO sa_groups (name, immunity) VALUES (@groupName, @immunity); SELECT LAST_INSERT_ID();";
-    
+
     public string GetGroupIdByNameQuery() =>
         """
         SELECT sgs.group_id
@@ -181,7 +201,7 @@ public class MySqlDatabaseProvider(string connectionString) : IDatabaseProvider
 
     public string GetDeleteOldAdminsQuery() =>
         "DELETE FROM sa_admins WHERE ends IS NOT NULL AND ends <= @CurrentTime;";
-    
+
     public string GetAddBanQuery()
     {
         return """
@@ -192,7 +212,7 @@ public class MySqlDatabaseProvider(string connectionString) : IDatabaseProvider
                    SELECT LAST_INSERT_ID();
                """;
     }
-    
+
     public string GetAddBanBySteamIdQuery()
     {
         return """
@@ -213,12 +233,15 @@ public class MySqlDatabaseProvider(string connectionString) : IDatabaseProvider
                        (@playerIp, @adminSteamid, @adminName, @banReason, @duration, @ends, @created, @serverid);
                """;
     }
-    
+
     public string GetUnbanRetrieveBansQuery(bool multiServer)
     {
-        return multiServer
-            ? "SELECT id, player_steamid FROM sa_bans WHERE (player_steamid = @pattern OR player_name = @pattern OR player_ip = @pattern) AND status = 'ACTIVE'"
-            : "SELECT id, player_steamid FROM sa_bans WHERE (player_steamid = @pattern OR player_name = @pattern OR player_ip = @pattern) AND status = 'ACTIVE' AND server_id = @serverid";
+        if (multiServer)
+        {
+            return "SELECT id, player_steamid FROM sa_bans WHERE (player_steamid = @pattern OR player_name = @pattern OR player_ip = @pattern) AND status = 'ACTIVE'";
+        }
+
+        return "SELECT id, player_steamid FROM sa_bans WHERE (player_steamid = @pattern OR player_name = @pattern OR player_ip = @pattern) AND status = 'ACTIVE' AND server_id = @serverid";
     }
 
     public string GetUnbanAdminIdQuery()
@@ -228,9 +251,12 @@ public class MySqlDatabaseProvider(string connectionString) : IDatabaseProvider
 
     public string GetInsertUnbanQuery(bool includeReason)
     {
-        return includeReason
-            ? "INSERT INTO sa_unbans (ban_id, admin_id, reason) VALUES (@banId, @adminId, @reason); SELECT LAST_INSERT_ID();"
-            : "INSERT INTO sa_unbans (ban_id, admin_id) VALUES (@banId, @adminId); SELECT LAST_INSERT_ID();";
+        if (includeReason)
+        {
+            return "INSERT INTO sa_unbans (ban_id, admin_id, reason) VALUES (@banId, @adminId, @reason); SELECT LAST_INSERT_ID();";
+        }
+
+        return "INSERT INTO sa_unbans (ban_id, admin_id) VALUES (@banId, @adminId); SELECT LAST_INSERT_ID();";
     }
 
     public string GetUpdateBanStatusQuery()
@@ -249,145 +275,245 @@ public class MySqlDatabaseProvider(string connectionString) : IDatabaseProvider
 
     public string GetExpireBansQuery(bool multiServer)
     {
-        return multiServer
-            ? "UPDATE sa_bans SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND duration > 0 AND ends <= @currentTime"
-            : "UPDATE sa_bans SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND duration > 0 AND ends <= @currentTime AND server_id = @serverid";
+        if (multiServer)
+        {
+            return "UPDATE sa_bans SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND duration > 0 AND ends <= @currentTime";
+        }
+
+        return "UPDATE sa_bans SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND duration > 0 AND ends <= @currentTime AND server_id = @serverid";
     }
 
     public string GetExpireIpBansQuery(bool multiServer)
     {
-        return multiServer
-            ? "UPDATE sa_bans SET player_ip = NULL WHERE status = 'ACTIVE' AND ends <= @ipBansTime"
-            : "UPDATE sa_bans SET player_ip = NULL WHERE status = 'ACTIVE' AND ends <= @ipBansTime AND server_id = @serverid";
+        if (multiServer)
+        {
+            return "UPDATE sa_bans SET player_ip = NULL WHERE status = 'ACTIVE' AND ends <= @ipBansTime";
+        }
+
+        return "UPDATE sa_bans SET player_ip = NULL WHERE status = 'ACTIVE' AND ends <= @ipBansTime AND server_id = @serverid";
     }
 
     public string GetExpireOldPlayerIpsQuery()
     {
         return "DELETE FROM sa_players_ips WHERE used_at <= @ipBansTime";
     }
-    
-    public string GetAddMuteQuery(bool includePlayerName) =>
-        includePlayerName
-            ? """
+
+    public string GetAddMuteQuery(bool includePlayerName)
+    {
+        if (includePlayerName)
+        {
+            return """
               INSERT INTO `sa_mutes`
               (`player_steamid`, `player_name`, `admin_steamid`, `admin_name`, `reason`, `duration`, `ends`, `created`, `type`, `server_id`) 
               VALUES (@playerSteamid, @playerName, @adminSteamid, @adminName, @muteReason, @duration, @ends, @created, @type, @serverid);
               SELECT LAST_INSERT_ID();
-              """
-            : """
-              INSERT INTO `sa_mutes`
-              (`player_steamid`, `admin_steamid`, `admin_name`, `reason`, `duration`, `ends`, `created`, `type`, `server_id`) 
-              VALUES (@playerSteamid, @adminSteamid, @adminName, @muteReason, @duration, @ends, @created, @type, @serverid);
-              SELECT LAST_INSERT_ID();
               """;
+        }
 
-    public string GetIsMutedQuery(bool multiServer, int timeMode) =>
-        multiServer
-            ? (timeMode == 1
-                ? "SELECT * FROM sa_mutes WHERE player_steamid = @PlayerSteamID AND status = 'ACTIVE' AND (duration = 0 OR ends > @CurrentTime)"
-                : "SELECT * FROM sa_mutes WHERE player_steamid = @PlayerSteamID AND status = 'ACTIVE' AND (duration = 0 OR duration > COALESCE(passed, 0))")
-            : (timeMode == 1
-                ? "SELECT * FROM sa_mutes WHERE player_steamid = @PlayerSteamID AND status = 'ACTIVE' AND (duration = 0 OR ends > @CurrentTime) AND server_id = @serverid"
-                : "SELECT * FROM sa_mutes WHERE player_steamid = @PlayerSteamID AND status = 'ACTIVE' AND (duration = 0 OR duration > COALESCE(passed, 0)) AND server_id = @serverid");
+        return """
+          INSERT INTO `sa_mutes`
+          (`player_steamid`, `admin_steamid`, `admin_name`, `reason`, `duration`, `ends`, `created`, `type`, `server_id`) 
+          VALUES (@playerSteamid, @adminSteamid, @adminName, @muteReason, @duration, @ends, @created, @type, @serverid);
+          SELECT LAST_INSERT_ID();
+          """;
+    }
 
-    public string GetMuteStatsQuery(bool multiServer) =>
-        multiServer
-            ? """
+    public string GetIsMutedQuery(bool multiServer, int timeMode)
+    {
+        if (multiServer)
+        {
+            if (timeMode == 1)
+            {
+                return "SELECT * FROM sa_mutes WHERE player_steamid = @PlayerSteamID AND status = 'ACTIVE' AND (duration = 0 OR ends > @CurrentTime)";
+            }
+            else
+            {
+                return "SELECT * FROM sa_mutes WHERE player_steamid = @PlayerSteamID AND status = 'ACTIVE' AND (duration = 0 OR duration > COALESCE(passed, 0))";
+            }
+        }
+
+        if (timeMode == 1)
+        {
+            return "SELECT * FROM sa_mutes WHERE player_steamid = @PlayerSteamID AND status = 'ACTIVE' AND (duration = 0 OR ends > @CurrentTime) AND server_id = @serverid";
+        }
+
+        return "SELECT * FROM sa_mutes WHERE player_steamid = @PlayerSteamID AND status = 'ACTIVE' AND (duration = 0 OR duration > COALESCE(passed, 0)) AND server_id = @serverid";
+    }
+
+    public string GetMuteStatsQuery(bool multiServer)
+    {
+        if (multiServer)
+        {
+            return """
               SELECT
                   COUNT(CASE WHEN type = 'MUTE' THEN 1 END) AS TotalMutes,
                   COUNT(CASE WHEN type = 'GAG' THEN 1 END) AS TotalGags,
                   COUNT(CASE WHEN type = 'SILENCE' THEN 1 END) AS TotalSilences
               FROM sa_mutes
               WHERE player_steamid = @PlayerSteamID;
-              """
-            : """
-              SELECT
-                  COUNT(CASE WHEN type = 'MUTE' THEN 1 END) AS TotalMutes,
-                  COUNT(CASE WHEN type = 'GAG' THEN 1 END) AS TotalGags,
-                  COUNT(CASE WHEN type = 'SILENCE' THEN 1 END) AS TotalSilences
-              FROM sa_mutes
-              WHERE player_steamid = @PlayerSteamID AND server_id = @ServerId;
               """;
+        }
 
-    public string GetUpdateMutePassedQuery(bool multiServer) =>
-        multiServer
-            ? "UPDATE `sa_mutes` SET passed = COALESCE(passed, 0) + 1 WHERE (player_steamid = @PlayerSteamID) AND duration > 0 AND status = 'ACTIVE'"
-            : "UPDATE `sa_mutes` SET passed = COALESCE(passed, 0) + 1 WHERE (player_steamid = @PlayerSteamID) AND duration > 0 AND status = 'ACTIVE' AND server_id = @serverid";
+        return """
+          SELECT
+              COUNT(CASE WHEN type = 'MUTE' THEN 1 END) AS TotalMutes,
+              COUNT(CASE WHEN type = 'GAG' THEN 1 END) AS TotalGags,
+              COUNT(CASE WHEN type = 'SILENCE' THEN 1 END) AS TotalSilences
+          FROM sa_mutes
+          WHERE player_steamid = @PlayerSteamID AND server_id = @ServerId;
+          """;
+    }
 
-    public string GetCheckExpiredMutesQuery(bool multiServer) =>
-        multiServer
-            ? "SELECT * FROM `sa_mutes` WHERE player_steamid = @PlayerSteamID AND passed >= duration AND duration > 0 AND status = 'ACTIVE'"
-            : "SELECT * FROM `sa_mutes` WHERE player_steamid = @PlayerSteamID AND passed >= duration AND duration > 0 AND status = 'ACTIVE' AND server_id = @serverid";
+    public string GetUpdateMutePassedQuery(bool multiServer)
+    {
+        if (multiServer)
+        {
+            return "UPDATE `sa_mutes` SET passed = COALESCE(passed, 0) + 1 WHERE (player_steamid = @PlayerSteamID) AND duration > 0 AND status = 'ACTIVE'";
+        }
 
-    public string GetRetrieveMutesQuery(bool multiServer) =>
-        multiServer
-            ? "SELECT id FROM sa_mutes WHERE (player_steamid = @pattern OR player_name = @pattern) AND type = @muteType AND status = 'ACTIVE'"
-            : "SELECT id FROM sa_mutes WHERE (player_steamid = @pattern OR player_name = @pattern) AND type = @muteType AND status = 'ACTIVE' AND server_id = @serverid";
+        return "UPDATE `sa_mutes` SET passed = COALESCE(passed, 0) + 1 WHERE (player_steamid = @PlayerSteamID) AND duration > 0 AND status = 'ACTIVE' AND server_id = @serverid";
+    }
+
+    public string GetCheckExpiredMutesQuery(bool multiServer)
+    {
+        if (multiServer)
+        {
+            return "SELECT * FROM `sa_mutes` WHERE player_steamid = @PlayerSteamID AND passed >= duration AND duration > 0 AND status = 'ACTIVE'";
+        }
+
+        return "SELECT * FROM `sa_mutes` WHERE player_steamid = @PlayerSteamID AND passed >= duration AND duration > 0 AND status = 'ACTIVE' AND server_id = @serverid";
+    }
+
+    public string GetRetrieveMutesQuery(bool multiServer)
+    {
+        if (multiServer)
+        {
+            return "SELECT id FROM sa_mutes WHERE (player_steamid = @pattern OR player_name = @pattern) AND type = @muteType AND status = 'ACTIVE'";
+        }
+
+        return "SELECT id FROM sa_mutes WHERE (player_steamid = @pattern OR player_name = @pattern) AND type = @muteType AND status = 'ACTIVE' AND server_id = @serverid";
+    }
 
     public string GetUnmuteAdminIdQuery() =>
         "SELECT id FROM sa_admins WHERE player_steamid = @adminSteamId";
 
-    public string GetInsertUnmuteQuery(bool includeReason) =>
-        includeReason
-            ? "INSERT INTO sa_unmutes (mute_id, admin_id, reason) VALUES (@muteId, @adminId, @reason); SELECT LAST_INSERT_ID();"
-            : "INSERT INTO sa_unmutes (mute_id, admin_id) VALUES (@muteId, @adminId); SELECT LAST_INSERT_ID();";
+    public string GetInsertUnmuteQuery(bool includeReason)
+    {
+        if (includeReason)
+        {
+            return "INSERT INTO sa_unmutes (mute_id, admin_id, reason) VALUES (@muteId, @adminId, @reason); SELECT LAST_INSERT_ID();";
+        }
+
+        return "INSERT INTO sa_unmutes (mute_id, admin_id) VALUES (@muteId, @adminId); SELECT LAST_INSERT_ID();";
+    }
 
     public string GetUpdateMuteStatusQuery() =>
         "UPDATE sa_mutes SET status = 'UNMUTED', unmute_id = @unmuteId WHERE id = @muteId";
 
-    public string GetExpireMutesQuery(bool multiServer, int timeMode) =>
-        multiServer
-            ? (timeMode == 1
-                ? "UPDATE sa_mutes SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND `duration` > 0 AND ends <= @CurrentTime"
-                : "UPDATE sa_mutes SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND `duration` > 0 AND `passed` >= `duration`")
-            : (timeMode == 1
-                ? "UPDATE sa_mutes SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND `duration` > 0 AND ends <= @CurrentTime AND server_id = @serverid"
-                : "UPDATE sa_mutes SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND `duration` > 0 AND `passed` >= `duration` AND server_id = @serverid");
-    
-    
-    public string GetAddWarnQuery(bool includePlayerName) =>
-        includePlayerName
-            ? """
+    public string GetExpireMutesQuery(bool multiServer, int timeMode)
+    {
+        if (multiServer)
+        {
+            if (timeMode == 1)
+            {
+                return "UPDATE sa_mutes SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND `duration` > 0 AND ends <= @CurrentTime";
+            }
+            else
+            {
+                return "UPDATE sa_mutes SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND `duration` > 0 AND `passed` >= `duration`";
+            }
+        }
+
+        if (timeMode == 1)
+        {
+            return "UPDATE sa_mutes SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND `duration` > 0 AND ends <= @CurrentTime AND server_id = @serverid";
+        }
+
+        return "UPDATE sa_mutes SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND `duration` > 0 AND `passed` >= `duration` AND server_id = @serverid";
+    }
+
+
+    public string GetAddWarnQuery(bool includePlayerName)
+    {
+        if (includePlayerName)
+        {
+            return """
               INSERT INTO `sa_warns` 
               (`player_steamid`, `player_name`, `admin_steamid`, `admin_name`, `reason`, `duration`, `ends`, `created`, `server_id`) 
               VALUES 
               (@playerSteamid, @playerName, @adminSteamid, @adminName, @warnReason, @duration, @ends, @created, @serverid);
               SELECT LAST_INSERT_ID();
-              """
-            : """
-              INSERT INTO `sa_warns` 
-              (`player_steamid`, `admin_steamid`, `admin_name`, `reason`, `duration`, `ends`, `created`, `server_id`) 
-              VALUES 
-              (@playerSteamid, @adminSteamid, @adminName, @warnReason, @duration, @ends, @created, @serverid);
-              SELECT LAST_INSERT_ID();
               """;
+        }
 
-    public string GetPlayerWarnsQuery(bool multiServer, bool active) =>
-        multiServer
-            ? active
-                ? "SELECT * FROM sa_warns WHERE player_steamid = @PlayerSteamID AND status = 'ACTIVE' ORDER BY id DESC"
-                : "SELECT * FROM sa_warns WHERE player_steamid = @PlayerSteamID ORDER BY id DESC"
-            : active
-                ? "SELECT * FROM sa_warns WHERE player_steamid = @PlayerSteamID AND server_id = @serverid AND status = 'ACTIVE' ORDER BY id DESC"
-                : "SELECT * FROM sa_warns WHERE player_steamid = @PlayerSteamID AND server_id = @serverid ORDER BY id DESC";
+        return """
+          INSERT INTO `sa_warns` 
+          (`player_steamid`, `admin_steamid`, `admin_name`, `reason`, `duration`, `ends`, `created`, `server_id`) 
+          VALUES 
+          (@playerSteamid, @adminSteamid, @adminName, @warnReason, @duration, @ends, @created, @serverid);
+          SELECT LAST_INSERT_ID();
+          """;
+    }
 
-    public string GetPlayerWarnsCountQuery(bool multiServer, bool active) =>
-        multiServer
-            ? active
-                ? "SELECT COUNT(*) FROM sa_warns WHERE player_steamid = @PlayerSteamID AND status = 'ACTIVE'"
-                : "SELECT COUNT(*) FROM sa_warns WHERE player_steamid = @PlayerSteamID"
-            : active
-                ? "SELECT COUNT(*) FROM sa_warns WHERE player_steamid = @PlayerSteamID AND server_id = @serverid AND status = 'ACTIVE'"
-                : "SELECT COUNT(*) FROM sa_warns WHERE player_steamid = @PlayerSteamID AND server_id = @serverid";
+    public string GetPlayerWarnsQuery(bool multiServer, bool active)
+    {
+        if (multiServer)
+        {
+            if (active)
+            {
+                return "SELECT * FROM sa_warns WHERE player_steamid = @PlayerSteamID AND status = 'ACTIVE' ORDER BY id DESC";
+            }
+            else
+            {
+                return "SELECT * FROM sa_warns WHERE player_steamid = @PlayerSteamID ORDER BY id DESC";
+            }
+        }
 
-    public string GetUnwarnByIdQuery(bool multiServer) =>
-        multiServer
-            ? "UPDATE sa_warns SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND player_steamid = @steamid AND id = @warnId"
-            : "UPDATE sa_warns SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND player_steamid = @steamid AND id = @warnId AND server_id = @serverid";
+        if (active)
+        {
+            return "SELECT * FROM sa_warns WHERE player_steamid = @PlayerSteamID AND server_id = @serverid AND status = 'ACTIVE' ORDER BY id DESC";
+        }
 
-    public string GetUnwarnLastQuery(bool multiServer) =>
-        multiServer
-            ? """
+        return "SELECT * FROM sa_warns WHERE player_steamid = @PlayerSteamID AND server_id = @serverid ORDER BY id DESC";
+    }
+
+    public string GetPlayerWarnsCountQuery(bool multiServer, bool active)
+    {
+        if (multiServer)
+        {
+            if (active)
+            {
+                return "SELECT COUNT(*) FROM sa_warns WHERE player_steamid = @PlayerSteamID AND status = 'ACTIVE'";
+            }
+            else
+            {
+                return "SELECT COUNT(*) FROM sa_warns WHERE player_steamid = @PlayerSteamID";
+            }
+        }
+
+        if (active)
+        {
+            return "SELECT COUNT(*) FROM sa_warns WHERE player_steamid = @PlayerSteamID AND server_id = @serverid AND status = 'ACTIVE'";
+        }
+
+        return "SELECT COUNT(*) FROM sa_warns WHERE player_steamid = @PlayerSteamID AND server_id = @serverid";
+    }
+
+    public string GetUnwarnByIdQuery(bool multiServer)
+    {
+        if (multiServer)
+        {
+            return "UPDATE sa_warns SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND player_steamid = @steamid AND id = @warnId";
+        }
+
+        return "UPDATE sa_warns SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND player_steamid = @steamid AND id = @warnId AND server_id = @serverid";
+    }
+
+    public string GetUnwarnLastQuery(bool multiServer)
+    {
+        if (multiServer)
+        {
+            return """
               UPDATE sa_warns 
               JOIN (
                   SELECT MAX(id) AS max_id
@@ -396,45 +522,66 @@ public class MySqlDatabaseProvider(string connectionString) : IDatabaseProvider
               ) AS subquery ON sa_warns.id = subquery.max_id
               SET sa_warns.status = 'EXPIRED'
               WHERE sa_warns.status = 'ACTIVE' AND sa_warns.player_steamid = @steamid;
-              """
-            : """
-              UPDATE sa_warns 
-              JOIN (
-                  SELECT MAX(id) AS max_id
-                  FROM sa_warns
-                  WHERE player_steamid = @steamid AND status = 'ACTIVE' AND server_id = @serverid
-              ) AS subquery ON sa_warns.id = subquery.max_id
-              SET sa_warns.status = 'EXPIRED'
-              WHERE sa_warns.status = 'ACTIVE' AND sa_warns.player_steamid = @steamid AND sa_warns.server_id = @serverid;
               """;
+        }
 
-    public string GetExpireWarnsQuery(bool multiServer) =>
-        multiServer
-            ? "UPDATE sa_warns SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND `duration` > 0 AND ends <= @CurrentTime"
-            : "UPDATE sa_warns SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND `duration` > 0 AND ends <= @CurrentTime AND server_id = @serverid";
+        return """
+          UPDATE sa_warns 
+          JOIN (
+              SELECT MAX(id) AS max_id
+              FROM sa_warns
+              WHERE player_steamid = @steamid AND status = 'ACTIVE' AND server_id = @serverid
+          ) AS subquery ON sa_warns.id = subquery.max_id
+          SET sa_warns.status = 'EXPIRED'
+          WHERE sa_warns.status = 'ACTIVE' AND sa_warns.player_steamid = @steamid AND sa_warns.server_id = @serverid;
+          """;
+    }
 
-    public string GetPenaltyHistoryQuery(bool multiServer) =>
-        $"""
-        SELECT b.id, 'BAN' AS type, b.player_name, b.admin_name, b.reason, b.duration, b.created, b.ends, b.status,
-               ub.reason AS lift_reason, ub.date AS lift_date, ua.player_name AS lift_admin
-        FROM sa_bans b
-        LEFT JOIN sa_unbans ub ON ub.id = b.unban_id
-        LEFT JOIN sa_admins ua ON ua.id = ub.admin_id
-        WHERE b.player_steamid = @PlayerSteamID {(multiServer ? "" : "AND b.server_id = @serverid")}
-        UNION ALL
-        SELECT m.id, m.type, m.player_name, m.admin_name, m.reason, m.duration, m.created, m.ends, m.status,
-               um.reason AS lift_reason, um.date AS lift_date, ua.player_name AS lift_admin
-        FROM sa_mutes m
-        LEFT JOIN sa_unmutes um ON um.id = m.unmute_id
-        LEFT JOIN sa_admins ua ON ua.id = um.admin_id
-        WHERE m.player_steamid = @PlayerSteamID {(multiServer ? "" : "AND m.server_id = @serverid")}
-        UNION ALL
-        SELECT w.id, 'WARN' AS type, w.player_name, w.admin_name, w.reason, w.duration, w.created, w.ends, w.status,
-               NULL AS lift_reason, NULL AS lift_date, NULL AS lift_admin
-        FROM sa_warns w
-        WHERE w.player_steamid = @PlayerSteamID {(multiServer ? "" : "AND w.server_id = @serverid")}
-        ORDER BY created DESC
-        """;
+    public string GetExpireWarnsQuery(bool multiServer)
+    {
+        if (multiServer)
+        {
+            return "UPDATE sa_warns SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND `duration` > 0 AND ends <= @CurrentTime";
+        }
+
+        return "UPDATE sa_warns SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND `duration` > 0 AND ends <= @CurrentTime AND server_id = @serverid";
+    }
+
+    public string GetPenaltyHistoryQuery(bool multiServer)
+    {
+        string banServerFilter = string.Empty;
+        string muteServerFilter = string.Empty;
+        string warnServerFilter = string.Empty;
+
+        if (!multiServer)
+        {
+            banServerFilter = "AND b.server_id = @serverid";
+            muteServerFilter = "AND m.server_id = @serverid";
+            warnServerFilter = "AND w.server_id = @serverid";
+        }
+
+        return $"""
+            SELECT b.id, 'BAN' AS type, b.player_name, b.admin_name, b.reason, b.duration, b.created, b.ends, b.status,
+                   ub.reason AS lift_reason, ub.date AS lift_date, ua.player_name AS lift_admin
+            FROM sa_bans b
+            LEFT JOIN sa_unbans ub ON ub.id = b.unban_id
+            LEFT JOIN sa_admins ua ON ua.id = ub.admin_id
+            WHERE b.player_steamid = @PlayerSteamID {banServerFilter}
+            UNION ALL
+            SELECT m.id, m.type, m.player_name, m.admin_name, m.reason, m.duration, m.created, m.ends, m.status,
+                   um.reason AS lift_reason, um.date AS lift_date, ua.player_name AS lift_admin
+            FROM sa_mutes m
+            LEFT JOIN sa_unmutes um ON um.id = m.unmute_id
+            LEFT JOIN sa_admins ua ON ua.id = um.admin_id
+            WHERE m.player_steamid = @PlayerSteamID {muteServerFilter}
+            UNION ALL
+            SELECT w.id, 'WARN' AS type, w.player_name, w.admin_name, w.reason, w.duration, w.created, w.ends, w.status,
+                   NULL AS lift_reason, NULL AS lift_date, NULL AS lift_admin
+            FROM sa_warns w
+            WHERE w.player_steamid = @PlayerSteamID {warnServerFilter}
+            ORDER BY created DESC
+            """;
+    }
 
     public ValueTask DisposeAsync() => ValueTask.CompletedTask;
 }

CS2-SimpleAdmin/Database/SqliteDatabaseProvider.cs

@@ -9,7 +9,7 @@ public class SqliteDatabaseProvider(string filePath) : IDatabaseProvider
 
     public async Task<DbConnection> CreateConnectionAsync()
     {
-        var conn = new SQLiteConnection(_connectionString);
+        SQLiteConnection conn = new SQLiteConnection(_connectionString);
         await conn.OpenAsync();
         return conn;
     }
@@ -18,8 +18,8 @@ public class SqliteDatabaseProvider(string filePath) : IDatabaseProvider
     {
         try
         {
-            await using var conn = await CreateConnectionAsync();
-            await using var cmd = conn.CreateCommand();
+            await using DbConnection conn = await CreateConnectionAsync();
+            await using DbCommand cmd = conn.CreateCommand();
             cmd.CommandText = "SELECT 1";
             await cmd.ExecuteScalarAsync();
             return (true, null);
@@ -32,33 +32,40 @@ public class SqliteDatabaseProvider(string filePath) : IDatabaseProvider
 
     public Task DatabaseMigrationAsync()
     {
-        var migration = new Migration(CS2_SimpleAdmin.Instance.ModuleDirectory + "/Database/Migrations/Sqlite");
+        Migration migration = new Migration(CS2_SimpleAdmin.Instance.ModuleDirectory + "/Database/Migrations/Sqlite");
         return migration.ExecuteMigrationsAsync();
     }
 
-    public string GetBanSelectQuery(bool multiServer) =>
-        multiServer
-            ? """
+    public string GetBanSelectQuery(bool multiServer)
+    {
+        if (multiServer)
+        {
+            return """
               SELECT id AS Id,
                      player_name AS PlayerName,
                      player_steamid AS PlayerSteamId,
                      player_ip AS PlayerIp,
                      status AS Status
               FROM sa_bans
-              """
-            : """
-              SELECT id AS Id,
-                     player_name AS PlayerName,
-                     player_steamid AS PlayerSteamId,
-                     player_ip AS PlayerIp,
-                     status AS Status
-              FROM sa_bans
-              WHERE server_id = @serverId
               """;
+        }
 
-    public static string GetBanUpdatedSelectQuery(bool multiServer) =>
-        multiServer
-            ? """
+        return """
+          SELECT id AS Id,
+                 player_name AS PlayerName,
+                 player_steamid AS PlayerSteamId,
+                 player_ip AS PlayerIp,
+                 status AS Status
+          FROM sa_bans
+          WHERE server_id = @serverId
+          """;
+    }
+
+    public static string GetBanUpdatedSelectQuery(bool multiServer)
+    {
+        if (multiServer)
+        {
+            return """
               SELECT id AS Id,
                      player_name AS PlayerName,
                      player_steamid AS PlayerSteamId,
@@ -67,18 +74,21 @@ public class SqliteDatabaseProvider(string filePath) : IDatabaseProvider
               FROM sa_bans
               WHERE updated_at > @lastUpdate OR created > @lastUpdate
               ORDER BY updated_at DESC
-              """
-            : """
-              SELECT id AS Id,
-                     player_name AS PlayerName,
-                     player_steamid AS PlayerSteamId,
-                     player_ip AS PlayerIp,
-                     status AS Status
-              FROM sa_bans
-              WHERE (updated_at > @lastUpdate OR created > @lastUpdate)
-              AND server_id = @serverId
-              ORDER BY updated_at DESC
               """;
+        }
+
+        return """
+          SELECT id AS Id,
+                 player_name AS PlayerName,
+                 player_steamid AS PlayerSteamId,
+                 player_ip AS PlayerIp,
+                 status AS Status
+          FROM sa_bans
+          WHERE (updated_at > @lastUpdate OR created > @lastUpdate)
+          AND server_id = @serverId
+          ORDER BY updated_at DESC
+          """;
+    }
 
     public string GetIpHistoryQuery() =>
         "SELECT steamid, name, address, used_at FROM sa_players_ips ORDER BY used_at DESC";
@@ -94,25 +104,30 @@ public class SqliteDatabaseProvider(string filePath) : IDatabaseProvider
             """;
     }
 
-    public string GetBanUpdateQuery(bool multiServer) =>
-        multiServer
-            ? """
+    public string GetBanUpdateQuery(bool multiServer)
+    {
+        if (multiServer)
+        {
+            return """
               UPDATE sa_bans
               SET player_ip   = COALESCE(player_ip, @PlayerIP),
                   player_name = COALESCE(player_name, @PlayerName)
               WHERE (player_steamid = @PlayerSteamID OR player_ip = @PlayerIP)
                 AND status = 'ACTIVE'
                 AND (duration = 0 OR ends > @CurrentTime)
-              """
-            : """
-              UPDATE sa_bans
-              SET player_ip   = COALESCE(player_ip, @PlayerIP),
-                  player_name = COALESCE(player_name, @PlayerName)
-              WHERE (player_steamid = @PlayerSteamID OR player_ip = @PlayerIP)
-                AND status = 'ACTIVE'
-                AND (duration = 0 OR ends > @CurrentTime)
-                AND server_id = @ServerId
               """;
+        }
+
+        return """
+          UPDATE sa_bans
+          SET player_ip   = COALESCE(player_ip, @PlayerIP),
+              player_name = COALESCE(player_name, @PlayerName)
+          WHERE (player_steamid = @PlayerSteamID OR player_ip = @PlayerIP)
+            AND status = 'ACTIVE'
+            AND (duration = 0 OR ends > @CurrentTime)
+            AND server_id = @ServerId
+          """;
+    }
 
     public string GetAddBanQuery() =>
         """
@@ -141,32 +156,52 @@ public class SqliteDatabaseProvider(string filePath) : IDatabaseProvider
         SELECT last_insert_rowid();
         """;
 
-    public string GetUnbanRetrieveBansQuery(bool multiServer) =>
-        multiServer
-            ? "SELECT id, player_steamid FROM sa_bans WHERE (player_steamid = @pattern OR player_name = @pattern OR player_ip = @pattern) AND status = 'ACTIVE'"
-            : "SELECT id, player_steamid FROM sa_bans WHERE (player_steamid = @pattern OR player_name = @pattern OR player_ip = @pattern) AND status = 'ACTIVE' AND server_id = @serverid";
+    public string GetUnbanRetrieveBansQuery(bool multiServer)
+    {
+        if (multiServer)
+        {
+            return "SELECT id, player_steamid FROM sa_bans WHERE (player_steamid = @pattern OR player_name = @pattern OR player_ip = @pattern) AND status = 'ACTIVE'";
+        }
+
+        return "SELECT id, player_steamid FROM sa_bans WHERE (player_steamid = @pattern OR player_name = @pattern OR player_ip = @pattern) AND status = 'ACTIVE' AND server_id = @serverid";
+    }
 
     public string GetUnbanAdminIdQuery() =>
         "SELECT id FROM sa_admins WHERE player_steamid = @adminSteamId";
 
-    public string GetInsertUnbanQuery(bool includeReason) =>
-        includeReason
-            ? "INSERT INTO sa_unbans (ban_id, admin_id, reason) VALUES (@banId, @adminId, @reason); SELECT last_insert_rowid();"
-            : "INSERT INTO sa_unbans (ban_id, admin_id) VALUES (@banId, @adminId); SELECT last_insert_rowid();";
+    public string GetInsertUnbanQuery(bool includeReason)
+    {
+        if (includeReason)
+        {
+            return "INSERT INTO sa_unbans (ban_id, admin_id, reason) VALUES (@banId, @adminId, @reason); SELECT last_insert_rowid();";
+        }
+
+        return "INSERT INTO sa_unbans (ban_id, admin_id) VALUES (@banId, @adminId); SELECT last_insert_rowid();";
+    }
 
     // SQLite has no ON UPDATE CURRENT_TIMESTAMP, so updated_at must be set explicitly or the cache refresh never sees the change
     public string GetUpdateBanStatusQuery() =>
         "UPDATE sa_bans SET status = 'UNBANNED', unban_id = @unbanId, updated_at = CURRENT_TIMESTAMP WHERE id = @banId";
 
-    public string GetExpireBansQuery(bool multiServer) =>
-        multiServer
-            ? "UPDATE sa_bans SET status = 'EXPIRED', updated_at = CURRENT_TIMESTAMP WHERE status = 'ACTIVE' AND duration > 0 AND ends <= @currentTime"
-            : "UPDATE sa_bans SET status = 'EXPIRED', updated_at = CURRENT_TIMESTAMP WHERE status = 'ACTIVE' AND duration > 0 AND ends <= @currentTime AND server_id = @serverid";
+    public string GetExpireBansQuery(bool multiServer)
+    {
+        if (multiServer)
+        {
+            return "UPDATE sa_bans SET status = 'EXPIRED', updated_at = CURRENT_TIMESTAMP WHERE status = 'ACTIVE' AND duration > 0 AND ends <= @currentTime";
+        }
 
-    public string GetExpireIpBansQuery(bool multiServer) =>
-        multiServer
-            ? "UPDATE sa_bans SET player_ip = NULL WHERE status = 'ACTIVE' AND ends <= @ipBansTime"
-            : "UPDATE sa_bans SET player_ip = NULL WHERE status = 'ACTIVE' AND ends <= @ipBansTime AND server_id = @serverid";
+        return "UPDATE sa_bans SET status = 'EXPIRED', updated_at = CURRENT_TIMESTAMP WHERE status = 'ACTIVE' AND duration > 0 AND ends <= @currentTime AND server_id = @serverid";
+    }
+
+    public string GetExpireIpBansQuery(bool multiServer)
+    {
+        if (multiServer)
+        {
+            return "UPDATE sa_bans SET player_ip = NULL WHERE status = 'ACTIVE' AND ends <= @ipBansTime";
+        }
+
+        return "UPDATE sa_bans SET player_ip = NULL WHERE status = 'ACTIVE' AND ends <= @ipBansTime AND server_id = @serverid";
+    }
 
     public string GetExpireOldPlayerIpsQuery() =>
         "DELETE FROM sa_players_ips WHERE used_at <= @ipBansTime";
@@ -190,10 +225,15 @@ public class SqliteDatabaseProvider(string filePath) : IDatabaseProvider
         ORDER BY sa_admins.player_steamid
         """;
 
-    public string GetDeleteAdminQuery(bool globalDelete) =>
-        globalDelete
-            ? "DELETE FROM sa_admins WHERE player_steamid = @PlayerSteamID"
-            : "DELETE FROM sa_admins WHERE player_steamid = @PlayerSteamID AND server_id = @ServerId";
+    public string GetDeleteAdminQuery(bool globalDelete)
+    {
+        if (globalDelete)
+        {
+            return "DELETE FROM sa_admins WHERE player_steamid = @PlayerSteamID";
+        }
+
+        return "DELETE FROM sa_admins WHERE player_steamid = @PlayerSteamID AND server_id = @ServerId";
+    }
 
     public string GetAddAdminQuery() =>
         """
@@ -244,170 +284,285 @@ public class SqliteDatabaseProvider(string filePath) : IDatabaseProvider
 
     public string GetDeleteOldAdminsQuery() =>
         "DELETE FROM sa_admins WHERE ends IS NOT NULL AND ends <= @CurrentTime;";
-    
-    public string GetAddMuteQuery(bool includePlayerName) =>
-        includePlayerName
-            ? """
+
+    public string GetAddMuteQuery(bool includePlayerName)
+    {
+        if (includePlayerName)
+        {
+            return """
               INSERT INTO sa_mutes
               (player_steamid, player_name, admin_steamid, admin_name, reason, duration, ends, created, type, server_id)
               VALUES (@playerSteamid, @playerName, @adminSteamid, @adminName, @muteReason, @duration, @ends, @created, @type, @serverid);
               SELECT last_insert_rowid();
-              """
-            : """
-              INSERT INTO sa_mutes
-              (player_steamid, admin_steamid, admin_name, reason, duration, ends, created, type, server_id)
-              VALUES (@playerSteamid, @adminSteamid, @adminName, @muteReason, @duration, @ends, @created, @type, @serverid);
-              SELECT last_insert_rowid();
               """;
+        }
 
-    public string GetIsMutedQuery(bool multiServer, int timeMode) =>
-        multiServer
-            ? (timeMode == 1
-                ? "SELECT * FROM sa_mutes WHERE player_steamid = @PlayerSteamID AND status = 'ACTIVE' AND (duration = 0 OR ends > @CurrentTime)"
-                : "SELECT * FROM sa_mutes WHERE player_steamid = @PlayerSteamID AND status = 'ACTIVE' AND (duration = 0 OR duration > COALESCE(passed, 0))")
-            : (timeMode == 1
-                ? "SELECT * FROM sa_mutes WHERE player_steamid = @PlayerSteamID AND status = 'ACTIVE' AND (duration = 0 OR ends > @CurrentTime) AND server_id = @serverid"
-                : "SELECT * FROM sa_mutes WHERE player_steamid = @PlayerSteamID AND status = 'ACTIVE' AND (duration = 0 OR duration > COALESCE(passed, 0)) AND server_id = @serverid");
+        return """
+          INSERT INTO sa_mutes
+          (player_steamid, admin_steamid, admin_name, reason, duration, ends, created, type, server_id)
+          VALUES (@playerSteamid, @adminSteamid, @adminName, @muteReason, @duration, @ends, @created, @type, @serverid);
+          SELECT last_insert_rowid();
+          """;
+    }
 
-    public string GetMuteStatsQuery(bool multiServer) =>
-        multiServer
-            ? """
+    public string GetIsMutedQuery(bool multiServer, int timeMode)
+    {
+        if (multiServer)
+        {
+            if (timeMode == 1)
+            {
+                return "SELECT * FROM sa_mutes WHERE player_steamid = @PlayerSteamID AND status = 'ACTIVE' AND (duration = 0 OR ends > @CurrentTime)";
+            }
+            else
+            {
+                return "SELECT * FROM sa_mutes WHERE player_steamid = @PlayerSteamID AND status = 'ACTIVE' AND (duration = 0 OR duration > COALESCE(passed, 0))";
+            }
+        }
+
+        if (timeMode == 1)
+        {
+            return "SELECT * FROM sa_mutes WHERE player_steamid = @PlayerSteamID AND status = 'ACTIVE' AND (duration = 0 OR ends > @CurrentTime) AND server_id = @serverid";
+        }
+
+        return "SELECT * FROM sa_mutes WHERE player_steamid = @PlayerSteamID AND status = 'ACTIVE' AND (duration = 0 OR duration > COALESCE(passed, 0)) AND server_id = @serverid";
+    }
+
+    public string GetMuteStatsQuery(bool multiServer)
+    {
+        if (multiServer)
+        {
+            return """
               SELECT
                   COUNT(CASE WHEN type = 'MUTE' THEN 1 END) AS TotalMutes,
                   COUNT(CASE WHEN type = 'GAG' THEN 1 END) AS TotalGags,
                   COUNT(CASE WHEN type = 'SILENCE' THEN 1 END) AS TotalSilences
               FROM sa_mutes
               WHERE player_steamid = @PlayerSteamID;
-              """
-            : """
-              SELECT
-                  COUNT(CASE WHEN type = 'MUTE' THEN 1 END) AS TotalMutes,
-                  COUNT(CASE WHEN type = 'GAG' THEN 1 END) AS TotalGags,
-                  COUNT(CASE WHEN type = 'SILENCE' THEN 1 END) AS TotalSilences
-              FROM sa_mutes
-              WHERE player_steamid = @PlayerSteamID AND server_id = @ServerId;
               """;
+        }
 
-    public string GetUpdateMutePassedQuery(bool multiServer) =>
-        multiServer
-            ? "UPDATE sa_mutes SET passed = COALESCE(passed, 0) + 1 WHERE (player_steamid = @PlayerSteamID) AND duration > 0 AND status = 'ACTIVE'"
-            : "UPDATE sa_mutes SET passed = COALESCE(passed, 0) + 1 WHERE (player_steamid = @PlayerSteamID) AND duration > 0 AND status = 'ACTIVE' AND server_id = @serverid";
+        return """
+          SELECT
+              COUNT(CASE WHEN type = 'MUTE' THEN 1 END) AS TotalMutes,
+              COUNT(CASE WHEN type = 'GAG' THEN 1 END) AS TotalGags,
+              COUNT(CASE WHEN type = 'SILENCE' THEN 1 END) AS TotalSilences
+          FROM sa_mutes
+          WHERE player_steamid = @PlayerSteamID AND server_id = @ServerId;
+          """;
+    }
 
-    public string GetCheckExpiredMutesQuery(bool multiServer) =>
-        multiServer
-            ? "SELECT * FROM sa_mutes WHERE player_steamid = @PlayerSteamID AND passed >= duration AND duration > 0 AND status = 'ACTIVE'"
-            : "SELECT * FROM sa_mutes WHERE player_steamid = @PlayerSteamID AND passed >= duration AND duration > 0 AND status = 'ACTIVE' AND server_id = @serverid";
+    public string GetUpdateMutePassedQuery(bool multiServer)
+    {
+        if (multiServer)
+        {
+            return "UPDATE sa_mutes SET passed = COALESCE(passed, 0) + 1 WHERE (player_steamid = @PlayerSteamID) AND duration > 0 AND status = 'ACTIVE'";
+        }
 
-    public string GetRetrieveMutesQuery(bool multiServer) =>
-        multiServer
-            ? "SELECT id FROM sa_mutes WHERE (player_steamid = @pattern OR player_name = @pattern) AND type = @muteType AND status = 'ACTIVE'"
-            : "SELECT id FROM sa_mutes WHERE (player_steamid = @pattern OR player_name = @pattern) AND type = @muteType AND status = 'ACTIVE' AND server_id = @serverid";
+        return "UPDATE sa_mutes SET passed = COALESCE(passed, 0) + 1 WHERE (player_steamid = @PlayerSteamID) AND duration > 0 AND status = 'ACTIVE' AND server_id = @serverid";
+    }
+
+    public string GetCheckExpiredMutesQuery(bool multiServer)
+    {
+        if (multiServer)
+        {
+            return "SELECT * FROM sa_mutes WHERE player_steamid = @PlayerSteamID AND passed >= duration AND duration > 0 AND status = 'ACTIVE'";
+        }
+
+        return "SELECT * FROM sa_mutes WHERE player_steamid = @PlayerSteamID AND passed >= duration AND duration > 0 AND status = 'ACTIVE' AND server_id = @serverid";
+    }
+
+    public string GetRetrieveMutesQuery(bool multiServer)
+    {
+        if (multiServer)
+        {
+            return "SELECT id FROM sa_mutes WHERE (player_steamid = @pattern OR player_name = @pattern) AND type = @muteType AND status = 'ACTIVE'";
+        }
+
+        return "SELECT id FROM sa_mutes WHERE (player_steamid = @pattern OR player_name = @pattern) AND type = @muteType AND status = 'ACTIVE' AND server_id = @serverid";
+    }
 
     public string GetUnmuteAdminIdQuery() =>
         "SELECT id FROM sa_admins WHERE player_steamid = @adminSteamId";
 
-    public string GetInsertUnmuteQuery(bool includeReason) =>
-        includeReason
-            ? "INSERT INTO sa_unmutes (mute_id, admin_id, reason) VALUES (@muteId, @adminId, @reason); SELECT last_insert_rowid();"
-            : "INSERT INTO sa_unmutes (mute_id, admin_id) VALUES (@muteId, @adminId); SELECT last_insert_rowid();";
+    public string GetInsertUnmuteQuery(bool includeReason)
+    {
+        if (includeReason)
+        {
+            return "INSERT INTO sa_unmutes (mute_id, admin_id, reason) VALUES (@muteId, @adminId, @reason); SELECT last_insert_rowid();";
+        }
+
+        return "INSERT INTO sa_unmutes (mute_id, admin_id) VALUES (@muteId, @adminId); SELECT last_insert_rowid();";
+    }
 
     public string GetUpdateMuteStatusQuery() =>
         "UPDATE sa_mutes SET status = 'UNMUTED', unmute_id = @unmuteId WHERE id = @muteId";
 
-    public string GetExpireMutesQuery(bool multiServer, int timeMode) =>
-        multiServer
-            ? (timeMode == 1
-                ? "UPDATE sa_mutes SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND duration > 0 AND ends <= @CurrentTime"
-                : "UPDATE sa_mutes SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND duration > 0 AND passed >= duration")
-            : (timeMode == 1
-                ? "UPDATE sa_mutes SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND duration > 0 AND ends <= @CurrentTime AND server_id = @serverid"
-                : "UPDATE sa_mutes SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND duration > 0 AND passed >= duration AND server_id = @serverid");
-    
-    public string GetAddWarnQuery(bool includePlayerName) =>
-        includePlayerName
-            ? """
+    public string GetExpireMutesQuery(bool multiServer, int timeMode)
+    {
+        if (multiServer)
+        {
+            if (timeMode == 1)
+            {
+                return "UPDATE sa_mutes SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND duration > 0 AND ends <= @CurrentTime";
+            }
+            else
+            {
+                return "UPDATE sa_mutes SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND duration > 0 AND passed >= duration";
+            }
+        }
+
+        if (timeMode == 1)
+        {
+            return "UPDATE sa_mutes SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND duration > 0 AND ends <= @CurrentTime AND server_id = @serverid";
+        }
+
+        return "UPDATE sa_mutes SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND duration > 0 AND passed >= duration AND server_id = @serverid";
+    }
+
+    public string GetAddWarnQuery(bool includePlayerName)
+    {
+        if (includePlayerName)
+        {
+            return """
               INSERT INTO sa_warns
               (player_steamid, player_name, admin_steamid, admin_name, reason, duration, ends, created, server_id)
               VALUES
               (@playerSteamid, @playerName, @adminSteamid, @adminName, @warnReason, @duration, @ends, @created, @serverid);
               SELECT last_insert_rowid();
-              """
-            : """
-              INSERT INTO sa_warns
-              (player_steamid, admin_steamid, admin_name, reason, duration, ends, created, server_id)
-              VALUES
-              (@playerSteamid, @adminSteamid, @adminName, @warnReason, @duration, @ends, @created, @serverid);
-              SELECT last_insert_rowid();
               """;
+        }
 
-    public string GetPlayerWarnsQuery(bool multiServer, bool active) =>
-        multiServer
-            ? active
-                ? "SELECT * FROM sa_warns WHERE player_steamid = @PlayerSteamID AND status = 'ACTIVE' ORDER BY id DESC"
-                : "SELECT * FROM sa_warns WHERE player_steamid = @PlayerSteamID ORDER BY id DESC"
-            : active
-                ? "SELECT * FROM sa_warns WHERE player_steamid = @PlayerSteamID AND server_id = @serverid AND status = 'ACTIVE' ORDER BY id DESC"
-                : "SELECT * FROM sa_warns WHERE player_steamid = @PlayerSteamID AND server_id = @serverid ORDER BY id DESC";
+        return """
+          INSERT INTO sa_warns
+          (player_steamid, admin_steamid, admin_name, reason, duration, ends, created, server_id)
+          VALUES
+          (@playerSteamid, @adminSteamid, @adminName, @warnReason, @duration, @ends, @created, @serverid);
+          SELECT last_insert_rowid();
+          """;
+    }
 
-    public string GetPlayerWarnsCountQuery(bool multiServer, bool active) =>
-        multiServer
-            ? active
-                ? "SELECT COUNT(*) FROM sa_warns WHERE player_steamid = @PlayerSteamID AND status = 'ACTIVE'"
-                : "SELECT COUNT(*) FROM sa_warns WHERE player_steamid = @PlayerSteamID"
-            : active
-                ? "SELECT COUNT(*) FROM sa_warns WHERE player_steamid = @PlayerSteamID AND server_id = @serverid AND status = 'ACTIVE'"
-                : "SELECT COUNT(*) FROM sa_warns WHERE player_steamid = @PlayerSteamID AND server_id = @serverid";
+    public string GetPlayerWarnsQuery(bool multiServer, bool active)
+    {
+        if (multiServer)
+        {
+            if (active)
+            {
+                return "SELECT * FROM sa_warns WHERE player_steamid = @PlayerSteamID AND status = 'ACTIVE' ORDER BY id DESC";
+            }
+            else
+            {
+                return "SELECT * FROM sa_warns WHERE player_steamid = @PlayerSteamID ORDER BY id DESC";
+            }
+        }
 
-    public string GetUnwarnByIdQuery(bool multiServer) =>
-        multiServer
-            ? "UPDATE sa_warns SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND player_steamid = @steamid AND id = @warnId"
-            : "UPDATE sa_warns SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND player_steamid = @steamid AND id = @warnId AND server_id = @serverid";
+        if (active)
+        {
+            return "SELECT * FROM sa_warns WHERE player_steamid = @PlayerSteamID AND server_id = @serverid AND status = 'ACTIVE' ORDER BY id DESC";
+        }
 
-    public string GetUnwarnLastQuery(bool multiServer) =>
-        multiServer
-            ? """
+        return "SELECT * FROM sa_warns WHERE player_steamid = @PlayerSteamID AND server_id = @serverid ORDER BY id DESC";
+    }
+
+    public string GetPlayerWarnsCountQuery(bool multiServer, bool active)
+    {
+        if (multiServer)
+        {
+            if (active)
+            {
+                return "SELECT COUNT(*) FROM sa_warns WHERE player_steamid = @PlayerSteamID AND status = 'ACTIVE'";
+            }
+            else
+            {
+                return "SELECT COUNT(*) FROM sa_warns WHERE player_steamid = @PlayerSteamID";
+            }
+        }
+
+        if (active)
+        {
+            return "SELECT COUNT(*) FROM sa_warns WHERE player_steamid = @PlayerSteamID AND server_id = @serverid AND status = 'ACTIVE'";
+        }
+
+        return "SELECT COUNT(*) FROM sa_warns WHERE player_steamid = @PlayerSteamID AND server_id = @serverid";
+    }
+
+    public string GetUnwarnByIdQuery(bool multiServer)
+    {
+        if (multiServer)
+        {
+            return "UPDATE sa_warns SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND player_steamid = @steamid AND id = @warnId";
+        }
+
+        return "UPDATE sa_warns SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND player_steamid = @steamid AND id = @warnId AND server_id = @serverid";
+    }
+
+    public string GetUnwarnLastQuery(bool multiServer)
+    {
+        if (multiServer)
+        {
+            return """
               UPDATE sa_warns
               SET status = 'EXPIRED'
               WHERE status = 'ACTIVE'
               AND player_steamid = @steamid
               ORDER BY id DESC
               LIMIT 1
-              """
-            : """
-              UPDATE sa_warns
-              SET status = 'EXPIRED'
-              WHERE status = 'ACTIVE'
-              AND player_steamid = @steamid
-              AND server_id = @serverid
-              ORDER BY id DESC
-              LIMIT 1
               """;
+        }
 
-    public string GetExpireWarnsQuery(bool multiServer) =>
-        multiServer
-            ? "UPDATE sa_warns SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND duration > 0 AND ends <= @CurrentTime"
-            : "UPDATE sa_warns SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND duration > 0 AND ends <= @CurrentTime AND server_id = @serverid";
+        return """
+          UPDATE sa_warns
+          SET status = 'EXPIRED'
+          WHERE status = 'ACTIVE'
+          AND player_steamid = @steamid
+          AND server_id = @serverid
+          ORDER BY id DESC
+          LIMIT 1
+          """;
+    }
 
-    public string GetPenaltyHistoryQuery(bool multiServer) =>
-        $"""
-        SELECT b.id, 'BAN' AS type, b.player_name, b.admin_name, b.reason, b.duration, b.created, b.ends, b.status,
-               ub.reason AS lift_reason, ub.date AS lift_date, ua.player_name AS lift_admin
-        FROM sa_bans b
-        LEFT JOIN sa_unbans ub ON ub.id = b.unban_id
-        LEFT JOIN sa_admins ua ON ua.id = ub.admin_id
-        WHERE b.player_steamid = @PlayerSteamID {(multiServer ? "" : "AND b.server_id = @serverid")}
-        UNION ALL
-        SELECT m.id, m.type, m.player_name, m.admin_name, m.reason, m.duration, m.created, m.ends, m.status,
-               um.reason AS lift_reason, um.date AS lift_date, ua.player_name AS lift_admin
-        FROM sa_mutes m
-        LEFT JOIN sa_unmutes um ON um.id = m.unmute_id
-        LEFT JOIN sa_admins ua ON ua.id = um.admin_id
-        WHERE m.player_steamid = @PlayerSteamID {(multiServer ? "" : "AND m.server_id = @serverid")}
-        UNION ALL
-        SELECT w.id, 'WARN' AS type, w.player_name, w.admin_name, w.reason, w.duration, w.created, w.ends, w.status,
-               NULL AS lift_reason, NULL AS lift_date, NULL AS lift_admin
-        FROM sa_warns w
-        WHERE w.player_steamid = @PlayerSteamID {(multiServer ? "" : "AND w.server_id = @serverid")}
-        ORDER BY created DESC
-        """;
+    public string GetExpireWarnsQuery(bool multiServer)
+    {
+        if (multiServer)
+        {
+            return "UPDATE sa_warns SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND duration > 0 AND ends <= @CurrentTime";
+        }
+
+        return "UPDATE sa_warns SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND duration > 0 AND ends <= @CurrentTime AND server_id = @serverid";
+    }
+
+    public string GetPenaltyHistoryQuery(bool multiServer)
+    {
+        string banServerFilter = string.Empty;
+        string muteServerFilter = string.Empty;
+        string warnServerFilter = string.Empty;
+
+        if (!multiServer)
+        {
+            banServerFilter = "AND b.server_id = @serverid";
+            muteServerFilter = "AND m.server_id = @serverid";
+            warnServerFilter = "AND w.server_id = @serverid";
+        }
+
+        return $"""
+            SELECT b.id, 'BAN' AS type, b.player_name, b.admin_name, b.reason, b.duration, b.created, b.ends, b.status,
+                   ub.reason AS lift_reason, ub.date AS lift_date, ua.player_name AS lift_admin
+            FROM sa_bans b
+            LEFT JOIN sa_unbans ub ON ub.id = b.unban_id
+            LEFT JOIN sa_admins ua ON ua.id = ub.admin_id
+            WHERE b.player_steamid = @PlayerSteamID {banServerFilter}
+            UNION ALL
+            SELECT m.id, m.type, m.player_name, m.admin_name, m.reason, m.duration, m.created, m.ends, m.status,
+                   um.reason AS lift_reason, um.date AS lift_date, ua.player_name AS lift_admin
+            FROM sa_mutes m
+            LEFT JOIN sa_unmutes um ON um.id = m.unmute_id
+            LEFT JOIN sa_admins ua ON ua.id = um.admin_id
+            WHERE m.player_steamid = @PlayerSteamID {muteServerFilter}
+            UNION ALL
+            SELECT w.id, 'WARN' AS type, w.player_name, w.admin_name, w.reason, w.duration, w.created, w.ends, w.status,
+                   NULL AS lift_reason, NULL AS lift_date, NULL AS lift_admin
+            FROM sa_warns w
+            WHERE w.player_steamid = @PlayerSteamID {warnServerFilter}
+            ORDER BY created DESC
+            """;
+    }
 }