From 614348fd2a2aefdc5fdef20cdd48d3c09d721575 Mon Sep 17 00:00:00 2001 From: Dollan Date: Thu, 11 Apr 2024 22:57:40 +0200 Subject: [PATCH] fix: remove sa_server_groups, not really needed for core functionality --- Database/database_setup.sql | 8 +------- Managers/AdminSQLManager.cs | 4 ++-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Database/database_setup.sql b/Database/database_setup.sql index 17969f6..237e1a5 100644 --- a/Database/database_setup.sql +++ b/Database/database_setup.sql @@ -49,10 +49,4 @@ CREATE TABLE IF NOT EXISTS `sa_servers` ( `group_ids` VARCHAR(255) NULL, PRIMARY KEY (`id`), UNIQUE KEY `address` (`address`) - ) ENGINE=InnoDB AUTO_INCREMENT=36 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; - -CREATE TABLE IF NOT EXISTS `sa_server_groups` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `group_name` varchar(128) NOT NULL, - PRIMARY KEY (`id`) - ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; \ No newline at end of file + ) ENGINE=InnoDB AUTO_INCREMENT=36 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; \ No newline at end of file diff --git a/Managers/AdminSQLManager.cs b/Managers/AdminSQLManager.cs index 65e873a..80df143 100644 --- a/Managers/AdminSQLManager.cs +++ b/Managers/AdminSQLManager.cs @@ -70,8 +70,8 @@ public class AdminSQLManager { 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(); + 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) AND (group_id LIKE CONCAT('%', @groupid, '%'));"; + List? activeFlags = (await connection.QueryAsync(sql, new { CurrentTime = now, serverid = CS2_SimpleAdmin.ServerId, groupid = CS2_SimpleAdmin.GroupIds }))?.ToList(); if (activeFlags == null) {