GarpBot/CS2-SimpleAdmin
1
0
Fork 0
mirror of https://github.com/daffyyyy/CS2-SimpleAdmin.git synced 2026-02-20 19:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

1.4.2a

Browse Source 
- Config upgrade
- Translatable  and customizable menu
- More async
- Minor changes
This commit is contained in:
Dawid Bepierszcz
2024-04-29 00:04:42 +02:00
parent aefa6c6355
commit c321502937
37 changed files with 1078 additions and 701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
Managers/AdminSQLManager.cs
View File

@@ -4,17 +4,14 @@ using Microsoft.Extensions.Logging;
using MySqlConnector;
using Newtonsoft.Json;
using System.Collections.Concurrent;
using static Dapper.SqlMapper;
namespace CS2_SimpleAdmin;
public class AdminSQLManager(Database database)
{
private readonly Database _database = database;
// Unused for now
//public static readonly ConcurrentDictionary<string, ConcurrentBag<string>> _adminCache = new ConcurrentDictionary<string, ConcurrentBag<string>>();
public static readonly ConcurrentDictionary<SteamID, DateTime?> _adminCache = new();
public static readonly ConcurrentDictionary<SteamID, DateTime?> AdminCache = new();
/*
public async Task<List<(List<string>, int)>> GetAdminFlags(string steamId)
@@ -59,28 +56,24 @@ public class AdminSQLManager(Database database)
}
*/
public async Task<List<(string, string, List<string>, int, DateTime?)>> GetAllPlayersFlags()
private async Task<List<(string, string, List<string>, int, DateTime?)>> GetAllPlayersFlags()
{
var now = DateTime.UtcNow.ToLocalTime();
try
{
await using var connection = await _database.GetConnectionAsync();
await using var connection = await database.GetConnectionAsync();
string sql = @"
SELECT sa_admins.player_steamid, sa_admins.player_name, sa_admins_flags.flag, sa_admins.immunity, sa_admins.ends
FROM sa_admins_flags
JOIN sa_admins ON sa_admins_flags.admin_id = sa_admins.id
WHERE (sa_admins.ends IS NULL OR sa_admins.ends > @CurrentTime)
AND (sa_admins.server_id IS NULL OR sa_admins.server_id = @serverid)
ORDER BY sa_admins.player_steamid";
const string sql = """
SELECT sa_admins.player_steamid, sa_admins.player_name, sa_admins_flags.flag, sa_admins.immunity, sa_admins.ends
FROM sa_admins_flags
JOIN sa_admins ON sa_admins_flags.admin_id = sa_admins.id
WHERE (sa_admins.ends IS NULL OR sa_admins.ends > @CurrentTime)
AND (sa_admins.server_id IS NULL OR sa_admins.server_id = @serverid)
ORDER BY sa_admins.player_steamid
""";
var activeFlags = (await connection.QueryAsync(sql, new { CurrentTime = now, serverid = CS2_SimpleAdmin.ServerId }))?.ToList();
if (activeFlags == null)
{
return [];
}
var activeFlags = (await connection.QueryAsync(sql, new { CurrentTime = now, serverid = CS2_SimpleAdmin.ServerId })).ToList();
List<(string, string, List<string>, int, DateTime?)> filteredFlagsWithImmunity = [];
var currentSteamId = string.Empty;
@@ -95,7 +88,7 @@ public class AdminSQLManager(Database database)
{
continue;
}
if (!flagInfoDict.TryGetValue("player_steamid", out var steamIdObj) ||
!flagInfoDict.TryGetValue("player_name", out var playerNameObj) ||
!flagInfoDict.TryGetValue("flag", out var flagObj) ||
@@ -113,11 +106,14 @@ public class AdminSQLManager(Database database)
continue;
}
if (DateTime.TryParse(endsObj.ToString(), out var parsedEnds))
if (ends != null)
{
ends = parsedEnds;
if (DateTime.TryParse(endsObj.ToString(), out var parsedEnds))
{
ends = parsedEnds;
}
}
if (currentSteamId != steamId && !string.IsNullOrEmpty(currentSteamId))
{
filteredFlagsWithImmunity.Add((currentSteamId, currentPlayerName, currentFlags, immunityValue, ends));
@@ -127,6 +123,7 @@ public class AdminSQLManager(Database database)
currentSteamId = steamId;
currentPlayerName = playerName;
currentFlags.Add(flag);
}
if (!string.IsNullOrEmpty(currentSteamId))
@@ -209,18 +206,19 @@ public class AdminSQLManager(Database database)
private async Task<Dictionary<string, (List<string>, int)>> GetAllGroupsData()
{
await using MySqlConnection connection = await _database.GetConnectionAsync();
await using MySqlConnection connection = await database.GetConnectionAsync();
try
{
var sql = "SELECT group_id FROM sa_groups_servers WHERE server_id = @serverid";
var groupDataSql = connection.Query<int>(sql, new { serverid = CS2_SimpleAdmin.ServerId }).ToList();
sql = @"
SELECT g.group_id, sg.name AS group_name, sg.immunity, f.flag
FROM sa_groups_flags f
JOIN sa_groups_servers g ON f.group_id = g.group_id
JOIN sa_groups sg ON sg.id = g.group_id
WHERE g.server_id = @serverid";
sql = """
SELECT g.group_id, sg.name AS group_name, sg.immunity, f.flag
FROM sa_groups_flags f
JOIN sa_groups_servers g ON f.group_id = g.group_id
JOIN sa_groups sg ON sg.id = g.group_id
WHERE g.server_id = @serverid
""";
var groupData = connection.Query(sql, new { serverid = CS2_SimpleAdmin.ServerId }).ToList();
@@ -350,9 +348,9 @@ public class AdminSQLManager(Database database)
steamId = id;
}
if (steamId != null && !_adminCache.ContainsKey(steamId))
if (steamId != null && !AdminCache.ContainsKey(steamId))
{
_adminCache.TryAdd(steamId, player.ends);
AdminCache.TryAdd(steamId, player.ends);
}
return new
@@ -381,10 +379,11 @@ public class AdminSQLManager(Database database)
try
{
await using var connection = await _database.GetConnectionAsync();
await using var connection = await database.GetConnectionAsync();
var sql = "";
sql = globalDelete ? "DELETE FROM sa_admins WHERE player_steamid = @PlayerSteamID" : "DELETE FROM sa_admins WHERE player_steamid = @PlayerSteamID AND server_id = @ServerId";
var sql = globalDelete
? "DELETE FROM sa_admins WHERE player_steamid = @PlayerSteamID"
: "DELETE FROM sa_admins WHERE player_steamid = @PlayerSteamID AND server_id = @ServerId";
await connection.ExecuteAsync(sql, new { PlayerSteamID = playerSteamId, CS2_SimpleAdmin.ServerId });
}
@@ -405,7 +404,7 @@ public class AdminSQLManager(Database database)
try
{
await using var connection = await _database.GetConnectionAsync();
await using var connection = await database.GetConnectionAsync();
// Insert admin into sa_admins table
const string insertAdminSql = "INSERT INTO `sa_admins` (`player_steamid`, `player_name`, `immunity`, `ends`, `created`, `server_id`) " +
@@ -460,7 +459,7 @@ public class AdminSQLManager(Database database)
{
if (string.IsNullOrEmpty(groupName) || flagsList.Count == 0) return;
await using var connection = await _database.GetConnectionAsync();
await using var connection = await database.GetConnectionAsync();
try
{
// Insert group into sa_groups table
@@ -502,7 +501,7 @@ public class AdminSQLManager(Database database)
{
if (string.IsNullOrEmpty(groupName)) return;
await using var connection = await _database.GetConnectionAsync();
await using var connection = await database.GetConnectionAsync();
try
{
const string sql = "DELETE FROM `sa_groups` WHERE name = @groupName";
@@ -518,7 +517,7 @@ public class AdminSQLManager(Database database)
{
try
{
await using var connection = await _database.GetConnectionAsync();
await using var connection = await database.GetConnectionAsync();
const string sql = "DELETE FROM sa_admins WHERE ends IS NOT NULL AND ends <= @CurrentTime";
await connection.ExecuteAsync(sql, new { CurrentTime = DateTime.Now.ToLocalTime() });

79
Managers/BanManager.cs
View File

@@ -7,27 +7,23 @@ namespace CS2_SimpleAdmin;
internal class BanManager(Database database, CS2_SimpleAdminConfig 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();
try
{
await using MySqlConnection connection = await _database.GetConnectionAsync();
var sql =
const string 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)";
"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,
playerIp = config.BanType == 1 ? player.IpAddress : null,
adminSteamid = issuer.SteamId ?? "Console",
adminName = issuer.Name ?? "Console",
banReason = reason,
@@ -49,7 +45,7 @@ internal class BanManager(Database database, CS2_SimpleAdminConfig config)
try
{
await using MySqlConnection 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)";
@@ -78,7 +74,7 @@ internal class BanManager(Database database, CS2_SimpleAdminConfig config)
try
{
await using MySqlConnection 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)";
@@ -110,28 +106,25 @@ internal class BanManager(Database database, CS2_SimpleAdminConfig config)
CS2_SimpleAdmin._logger.LogCritical($"IsPlayerBanned for {player.Name}");
#endif
int banCount = 0;
int banCount;
DateTime currentTime = DateTime.Now.ToLocalTime();
try
{
var sql = "";
sql = _config.MultiServerMode ? """
UPDATE sa_bans
SET player_ip = CASE WHEN player_ip IS NULL THEN @PlayerIP ELSE player_ip END,
player_name = CASE WHEN player_name IS NULL THEN @PlayerName ELSE player_name END
WHERE (player_steamid = @PlayerSteamID OR player_ip = @PlayerIP)
AND status = 'ACTIVE'
AND (duration = 0 OR ends > @CurrentTime);
SELECT COUNT(*) FROM sa_bans
WHERE (player_steamid = @PlayerSteamID OR player_ip = @PlayerIP)
AND status = 'ACTIVE'
AND (duration = 0 OR ends > @CurrentTime);
""" : @"
var sql = config.MultiServerMode ? """
UPDATE sa_bans
SET player_ip = CASE WHEN player_ip IS NULL THEN @PlayerIP ELSE player_ip END,
player_name = CASE WHEN player_name IS NULL THEN @PlayerName ELSE player_name END
WHERE (player_steamid = @PlayerSteamID OR player_ip = @PlayerIP)
AND status = 'ACTIVE'
AND (duration = 0 OR ends > @CurrentTime);
SELECT COUNT(*) FROM sa_bans
WHERE (player_steamid = @PlayerSteamID OR player_ip = @PlayerIP)
AND status = 'ACTIVE'
AND (duration = 0 OR ends > @CurrentTime);
""" : @"
UPDATE sa_bans
SET player_ip = CASE WHEN player_ip IS NULL THEN @PlayerIP ELSE player_ip END,
player_name = CASE WHEN player_name IS NULL THEN @PlayerName ELSE player_name END
@@ -144,12 +137,12 @@ internal class BanManager(Database database, CS2_SimpleAdminConfig config)
AND status = 'ACTIVE'
AND (duration = 0 OR ends > @CurrentTime) AND server_id = @serverid;";
await using var connection = await _database.GetConnectionAsync();
await using var connection = await database.GetConnectionAsync();
var parameters = new
{
PlayerSteamID = player.SteamId,
PlayerIP = _config.BanType == 0 || string.IsNullOrEmpty(player.IpAddress) ? null : player.IpAddress,
PlayerIP = config.BanType == 0 || string.IsNullOrEmpty(player.IpAddress) ? null : player.IpAddress,
PlayerName = !string.IsNullOrEmpty(player.Name) ? player.Name : string.Empty,
CurrentTime = currentTime,
serverid = CS2_SimpleAdmin.ServerId
@@ -171,13 +164,13 @@ internal class BanManager(Database database, CS2_SimpleAdminConfig config)
{
var sql = "";
sql = _config.MultiServerMode
sql = config.MultiServerMode
? "SELECT COUNT(*) FROM sa_bans WHERE (player_steamid = @PlayerSteamID OR player_ip = @PlayerIP) AND server_id = @serverid"
: "SELECT COUNT(*) FROM sa_bans WHERE (player_steamid = @PlayerSteamID OR player_ip = @PlayerIP)";
int banCount;
await using var connection = await _database.GetConnectionAsync();
await using var connection = await database.GetConnectionAsync();
if (!string.IsNullOrEmpty(player.IpAddress))
{
@@ -211,10 +204,10 @@ internal class BanManager(Database database, CS2_SimpleAdminConfig config)
}
try
{
await using var connection = await _database.GetConnectionAsync();
await using var connection = await database.GetConnectionAsync();
var sqlRetrieveBans = "";
if (_config.MultiServerMode)
string sqlRetrieveBans;
if (config.MultiServerMode)
{
sqlRetrieveBans = "SELECT id FROM sa_bans WHERE (player_steamid = @pattern OR player_name = @pattern OR player_ip = @pattern) AND status = 'ACTIVE' " +
"AND server_id = @serverid";
@@ -226,7 +219,7 @@ internal class BanManager(Database database, CS2_SimpleAdminConfig config)
var bans = await connection.QueryAsync(sqlRetrieveBans, new { pattern = playerPattern, serverid = CS2_SimpleAdmin.ServerId });
var bansList = bans as dynamic[] ?? bans.ToArray();
if (!bansList.Any())
if (bansList.Length == 0)
return;
const string sqlAdmin = "SELECT id FROM sa_admins WHERE player_steamid = @adminSteamId";
@@ -269,10 +262,10 @@ internal class BanManager(Database database, CS2_SimpleAdminConfig config)
{
try
{
await using var connection = await _database.GetConnectionAsync();
var sql = "";
await using var connection = await database.GetConnectionAsync();
string sql;
if (_config.MultiServerMode)
if (config.MultiServerMode)
{
sql = "SELECT COUNT(*) FROM sa_bans WHERE (player_steamid = @PlayerSteamID OR player_ip = @PlayerIP) AND status = 'ACTIVE' AND" +
" server_id = @serverid";
@@ -314,7 +307,7 @@ internal class BanManager(Database database, CS2_SimpleAdminConfig config)
{
var currentTime = DateTime.UtcNow.ToLocalTime();
await using var connection = await _database.GetConnectionAsync();
await using var connection = await database.GetConnectionAsync();
try
{
/*
@@ -327,7 +320,7 @@ internal class BanManager(Database database, CS2_SimpleAdminConfig config)
var sql = "";
sql = _config.MultiServerMode ? """
sql = config.MultiServerMode ? """
UPDATE sa_bans
SET
@@ -354,10 +347,10 @@ internal class BanManager(Database database, CS2_SimpleAdminConfig config)
await connection.ExecuteAsync(sql, new { currentTime, serverid = CS2_SimpleAdmin.ServerId });
if (_config.ExpireOldIpBans > 0)
if (config.ExpireOldIpBans > 0)
{
var ipBansTime = currentTime.AddDays(-_config.ExpireOldIpBans).ToLocalTime();
sql = _config.MultiServerMode ? """
var ipBansTime = currentTime.AddDays(-config.ExpireOldIpBans).ToLocalTime();
sql = config.MultiServerMode ? """
UPDATE sa_bans
SET

27
Managers/MuteManager.cs
View File

@@ -1,18 +1,14 @@
using Dapper;
using Microsoft.Extensions.Logging;
using MySqlConnector;
namespace CS2_SimpleAdmin;
internal class MuteManager(Database database)
{
private readonly Database _database = database;
public async Task MutePlayer(PlayerInfo player, PlayerInfo issuer, string reason, int time = 0, int type = 0)
{
if (player.SteamId == null) return;
var now = DateTime.UtcNow.ToLocalTime();
var futureTime = now.AddMinutes(time).ToLocalTime();
@@ -25,7 +21,7 @@ internal class MuteManager(Database database)
try
{
await using var connection = await _database.GetConnectionAsync();
await using var connection = await database.GetConnectionAsync();
const string sql =
"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)";
@@ -64,7 +60,7 @@ internal class MuteManager(Database database)
try
{
await using var connection = await _database.GetConnectionAsync();
await using var connection = await database.GetConnectionAsync();
const string sql = "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)";
@@ -98,9 +94,9 @@ internal class MuteManager(Database database)
try
{
await using var connection = await _database.GetConnectionAsync();
await using var connection = await database.GetConnectionAsync();
var currentTime = DateTime.Now.ToLocalTime();
var sql = "";
string sql;
if (CS2_SimpleAdmin.Instance.Config.MultiServerMode)
{
@@ -126,11 +122,9 @@ internal class MuteManager(Database database)
{
try
{
await using var connection = await _database.GetConnectionAsync();
await using var connection = await database.GetConnectionAsync();
var sql = "";
sql = CS2_SimpleAdmin.Instance.Config.MultiServerMode
var sql = CS2_SimpleAdmin.Instance.Config.MultiServerMode
? "SELECT COUNT(*) FROM sa_mutes WHERE player_steamid = @PlayerSteamID AND server_id = @serverid"
: "SELECT COUNT(*) FROM sa_mutes WHERE player_steamid = @PlayerSteamID";
@@ -152,7 +146,7 @@ internal class MuteManager(Database database)
try
{
await using var connection = await _database.GetConnectionAsync();
await using var connection = await database.GetConnectionAsync();
var muteType = type switch
{
@@ -161,7 +155,7 @@ internal class MuteManager(Database database)
_ => "GAG"
};
var sqlRetrieveMutes = "";
string sqlRetrieveMutes;
if (CS2_SimpleAdmin.Instance.Config.MultiServerMode)
{
@@ -217,10 +211,9 @@ internal class MuteManager(Database database)
{
try
{
await using var connection = await _database.GetConnectionAsync();
await using var connection = await database.GetConnectionAsync();
var sql = "";
sql = CS2_SimpleAdmin.Instance.Config.MultiServerMode
var sql = CS2_SimpleAdmin.Instance.Config.MultiServerMode
? "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 ends <= @CurrentTime";

2
Managers/PlayerPenaltyManager.cs
View File

@@ -12,7 +12,7 @@ public enum PenaltyType
public class PlayerPenaltyManager
{
private static readonly ConcurrentDictionary<int, Dictionary<PenaltyType, List<(DateTime EndDateTime, int Duration)>>> Penalties =
new ConcurrentDictionary<int, Dictionary<PenaltyType, List<(DateTime, int)>>>();
new();
// Add a penalty for a player
public static void AddPenalty(int slot, PenaltyType penaltyType, DateTime endDateTime, int durationSeconds)