cs2/SimpleAdmin
1
0
Fork 0
Code Issues Pull requests Projects Releases 15 Packages Wiki Activity Actions

1.3.0b

Browse source 
- Minor changes
- Fixed `css_players`
- Probably fixed problems with taking actions with bots
This commit is contained in:
Dawid Bepierszcz 2024-02-04 21:04:22 +01:00
parent 131030a2cd
commit 3793385ce4
8 changed files with 330 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

27
BanManager.cs
View file

@ -1,4 +1,5 @@
using Dapper;
using Microsoft.Extensions.Logging;
namespace CS2_SimpleAdmin
{
@ -18,7 +19,7 @@ namespace CS2_SimpleAdmin
DateTime now = DateTime.Now;
DateTime futureTime = now.AddMinutes(time);
await using var connection = _database.GetConnection();
using var connection = await _database.GetConnection();
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)";
@ -45,7 +46,7 @@ namespace CS2_SimpleAdmin
DateTime now = DateTime.Now;
DateTime futureTime = now.AddMinutes(time);
await using var connection = _database.GetConnection();
using var connection = await _database.GetConnection();
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)";
@ -70,7 +71,7 @@ namespace CS2_SimpleAdmin
DateTime now = DateTime.Now;
DateTime futureTime = now.AddMinutes(time);
await using var connection = _database.GetConnection();
using var connection = await _database.GetConnection();
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)";
@ -101,7 +102,7 @@ namespace CS2_SimpleAdmin
try
{
await using var connection = _database.GetConnection();
using var connection = await _database.GetConnection();
var parameters = new
{
@ -124,7 +125,7 @@ namespace CS2_SimpleAdmin
string sql = "SELECT COUNT(*) FROM sa_bans WHERE (player_steamid = @PlayerSteamID OR player_ip = @PlayerIP)";
int banCount;
await using var connection = _database.GetConnection();
using var connection = await _database.GetConnection();
if (!string.IsNullOrEmpty(player.IpAddress))
{
@ -145,7 +146,7 @@ namespace CS2_SimpleAdmin
return;
}
await using var connection = _database.GetConnection();
using var connection = await _database.GetConnection();
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 });
@ -153,10 +154,18 @@ namespace CS2_SimpleAdmin
public async Task ExpireOldBans()
{
await using var connection = _database.GetConnection();
try
{
using var connection = await _database.GetConnection();
string sql = "UPDATE sa_bans SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND `duration` > 0 AND ends <= @CurrentTime";
await connection.ExecuteAsync(sql, new { CurrentTime = DateTime.Now });
string sql = "UPDATE sa_bans SET status = 'EXPIRED' WHERE status = 'ACTIVE' AND `duration` > 0 AND ends <= @CurrentTime";
await connection.ExecuteAsync(sql, new { CurrentTime = DateTime.Now });
}
catch (Exception)
{
if (CS2_SimpleAdmin._logger != null)
CS2_SimpleAdmin._logger.LogCritical("Unable to remove expired bans");
}
}
}
}