cs2/cs2-SimpleAdmin
1
0
Fork 0
mirror of https://github.com/daffyyyy/CS2-SimpleAdmin.git synced 2026-09-27 20:17:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

Use IpHistory record and make player timer repeat

Browse source
This commit is contained in:
Dawid Bepierszcz 2026-06-17 03:19:34 +02:00
parent b0c7fd12c3
commit a588267165
3 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

32
CS2-SimpleAdmin/Managers/CacheManager.cs
View file

@ -73,7 +73,7 @@ internal class CacheManager: IDisposable
if (CS2_SimpleAdmin.Instance.Config.OtherSettings.CheckMultiAccountsByIp) if (CS2_SimpleAdmin.Instance.Config.OtherSettings.CheckMultiAccountsByIp)
{ {
// Optimization: Load IP history and build cache in single pass // Optimization: Load IP history and build cache in single pass
var ipHistory = await connection.QueryAsync<(ulong steamid, string? name, uint address, DateTime used_at)>( var ipHistory = await connection.QueryAsync<IpHistoryRow>(
"SELECT steamid, name, address, used_at FROM sa_players_ips ORDER BY steamid, address, used_at DESC"); "SELECT steamid, name, address, used_at FROM sa_players_ips ORDER BY steamid, address, used_at DESC");
var unknownName = CS2_SimpleAdmin._localizer?["sa_unknown"] ?? "Unknown"; var unknownName = CS2_SimpleAdmin._localizer?["sa_unknown"] ?? "Unknown";
@ -84,24 +84,24 @@ internal class CacheManager: IDisposable
foreach (var record in ipHistory) foreach (var record in ipHistory)
{ {
// When we encounter a new steamid, save the previous one // When we encounter a new steamid, save the previous one
if (record.steamid != currentSteamId && currentSteamId != 0) if (record.Steamid != currentSteamId && currentSteamId != 0)
{ {
_playerIpsCache[currentSteamId] = currentIpSet; _playerIpsCache[currentSteamId] = currentIpSet;
currentIpSet = new HashSet<IpRecord>(new IpRecordComparer()); currentIpSet = new HashSet<IpRecord>(new IpRecordComparer());
latestIpTimestamps.Clear(); latestIpTimestamps.Clear();
} }
currentSteamId = record.steamid; currentSteamId = record.Steamid;
// Only keep the latest timestamp for each IP // Only keep the latest timestamp for each IP
if (!latestIpTimestamps.TryGetValue(record.address, out var existingTimestamp) || if (!latestIpTimestamps.TryGetValue(record.Address, out var existingTimestamp) ||
record.used_at > existingTimestamp) record.Used_at > existingTimestamp)
{ {
latestIpTimestamps[record.address] = record.used_at; latestIpTimestamps[record.Address] = record.Used_at;
currentIpSet.Add(new IpRecord( currentIpSet.Add(new IpRecord(
record.address, record.Address,
record.used_at, record.Used_at,
string.IsNullOrEmpty(record.name) ? unknownName : record.name string.IsNullOrEmpty(record.Name) ? unknownName : record.Name
)); ));
} }
} }
@ -283,23 +283,23 @@ internal class CacheManager: IDisposable
if (CS2_SimpleAdmin.Instance.Config.OtherSettings.CheckMultiAccountsByIp) if (CS2_SimpleAdmin.Instance.Config.OtherSettings.CheckMultiAccountsByIp)
{ {
var ipHistory = (await connection.QueryAsync<(ulong steamid, string? name, uint address, DateTime used_at)>( var ipHistory = (await connection.QueryAsync<IpHistoryRow>(
"SELECT steamid, name, address, used_at FROM sa_players_ips WHERE used_at >= @lastUpdate ORDER BY used_at DESC LIMIT 300", "SELECT steamid, name, address, used_at FROM sa_players_ips WHERE used_at >= @lastUpdate ORDER BY used_at DESC LIMIT 300",
new { lastUpdate = _lastUpdateTime })); new { lastUpdate = _lastUpdateTime }));
foreach (var group in ipHistory.AsValueEnumerable().GroupBy(x => x.steamid)) foreach (var group in ipHistory.AsValueEnumerable().GroupBy(x => x.Steamid))
{ {
var ipSet = new HashSet<IpRecord>( var ipSet = new HashSet<IpRecord>(
group group
.GroupBy(x => x.address) .GroupBy(x => x.Address)
.Select(g => .Select(g =>
{ {
var latest = g.MaxBy(x => x.used_at); var latest = g.MaxBy(x => x.Used_at);
return new IpRecord( return new IpRecord(
g.Key, g.Key,
latest.used_at, latest.Used_at,
!string.IsNullOrEmpty(latest.name) !string.IsNullOrEmpty(latest.Name)
? latest.name ? latest.Name
: CS2_SimpleAdmin._localizer?["sa_unknown"] ?? "Unknown" : CS2_SimpleAdmin._localizer?["sa_unknown"] ?? "Unknown"
); );
}), }),

2
CS2-SimpleAdmin/Managers/PlayerManager.cs
View file

@ -283,7 +283,7 @@ internal class PlayerManager
if (player == null || !player.IsValid || player.PlayerName == name) continue; if (player == null || !player.IsValid || player.PlayerName == name) continue;
player.Rename(name); player.Rename(name);
} }
}); }, TimerFlags.REPEAT);
CS2_SimpleAdmin.Instance.PlayersTimer = CS2_SimpleAdmin.Instance.AddTimer(61.0f, () => CS2_SimpleAdmin.Instance.PlayersTimer = CS2_SimpleAdmin.Instance.AddTimer(61.0f, () =>
{ {

3
CS2-SimpleAdmin/Models/IpHistoryRow.cs Normal file
View file

@ -0,0 +1,3 @@
namespace CS2_SimpleAdmin.Models;
public record IpHistoryRow(ulong Steamid, string? Name, uint Address, DateTime Used_at);