Use IpHistory record and make player timer repeat

Minor fixes

.github/workflows/build.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 10.0.x
 
       - name: Get Version
         id: get_version
@@ -67,28 +67,12 @@ jobs:
       - name: Zip Main Build Output
         run: zip -r CS2-SimpleAdmin-${{ steps.get_version.outputs.VERSION }}.zip ${{ env.OUTPUT_PATH }}
 
-      - name: Extract & Zip StatusBlocker Linux
-        run: |
-          mkdir -p statusblocker-linux &&
-          tar -xzf Modules/CS2-SimpleAdmin_StealthModule/METAMOD\ PLUGIN/StatusBlocker-v*-linux.tar.gz -C statusblocker-linux &&
-          cd statusblocker-linux &&
-          zip -r ../StatusBlocker-linux-${{ steps.get_version.outputs.VERSION }}.zip ./*
-
-      - name: Extract & Zip StatusBlocker Windows
-        run: |
-          mkdir -p statusblocker-windows &&
-          tar -xzf Modules/CS2-SimpleAdmin_StealthModule/METAMOD\ PLUGIN/StatusBlocker-v*-windows.tar.gz -C statusblocker-windows &&
-          cd statusblocker-windows &&
-          zip -r ../StatusBlocker-windows-${{ steps.get_version.outputs.VERSION }}.zip ./*
-
       - name: Upload all artifacts
         uses: actions/upload-artifact@v4
         with:
           name: CS2-SimpleAdmin-Build-Artifacts
           path: |
             CS2-SimpleAdmin-${{ steps.get_version.outputs.VERSION }}.zip
-            StatusBlocker-linux-${{ steps.get_version.outputs.VERSION }}.zip
-            StatusBlocker-windows-${{ steps.get_version.outputs.VERSION }}.zip
 
   publish:
     needs: build
@@ -109,8 +93,6 @@ jobs:
         with:
           artifacts: |
             CS2-SimpleAdmin-${{ needs.build.outputs.build_version }}.zip
-            StatusBlocker-linux-${{ needs.build.outputs.build_version }}.zip
-            StatusBlocker-windows-${{ needs.build.outputs.build_version }}.zip
           name: "CS2-SimpleAdmin-${{ needs.build.outputs.build_version }}"
           tag: "build-${{ needs.build.outputs.build_version }}"
           body: |
@@ -121,8 +103,5 @@ jobs:
               After the first launch, configure the plugin using the JSON config file at:
               addons/counterstrikesharp/configs/plugins/CS2-SimpleAdmin/CS2-SimpleAdmin.json
 
-            - StatusBlocker:
-              Place the plugin files directly into the addons directory.
-              This plugin is a Metamod module for the StealthModule and does not require a subfolder.
 
             Remember to restart or reload your game server after installing and configuring the plugins.

.gitignore

@@ -11,3 +11,4 @@ CS2-SimpleAdmin_BanSoundModule — kopia
 *.user
 CLAUDE.md
 /Modules/CS2-SimpleAdmin_BanSoundModule
+/Modules/CS2-SimpleAdmin_StealthModule/METAMOD PLUGIN

CS2-SimpleAdmin/CS2-SimpleAdmin.cs

@@ -14,7 +14,7 @@ using MySqlConnector;
 
 namespace CS2_SimpleAdmin;
 
-[MinimumApiVersion(300)]
+[MinimumApiVersion(369)]
 public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdminConfig>
 {
     internal static CS2_SimpleAdmin Instance { get; private set; } = new();
@@ -22,7 +22,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
     public override string ModuleName => "CS2-SimpleAdmin" + (Helper.IsDebugBuild ? " (DEBUG)" : " (RELEASE)");
     public override string ModuleDescription => "Simple admin plugin for Counter-Strike 2 :)";
     public override string ModuleAuthor => "daffyy";
-    public override string ModuleVersion => "1.7.9a";
+    public override string ModuleVersion => "1.8.2a";
     
     public override void Load(bool hotReload)
     {
@@ -55,14 +55,12 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
                 };
             });
             
-            PlayersTimer?.Kill();
-            PlayersTimer = null;
         }
         _cBasePlayerControllerSetPawnFunc = new MemoryFunctionVoid<CBasePlayerController, CCSPlayerPawn, bool, bool>(GameData.GetSignature("CBasePlayerController_SetPawn"));
 
         SimpleAdminApi = new Api.CS2_SimpleAdminApi();
         Capabilities.RegisterPluginCapability(ICS2_SimpleAdminApi.PluginCapability, () => SimpleAdminApi);
-        
+
         PlayersTimer?.Kill();
         PlayersTimer = null;
         PlayerManager.CheckPlayersTimer();
@@ -95,20 +93,11 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
                 $"to rejoin the server for 60 seconds. " +
                 $"To enable instant banning, set 'UnlockConCommands': true"
             );
-            _logger?.LogError(
-                $"⚠️ Warning: 'UnlockConCommands' is disabled in core.json. " +
-                $"Players will not be automatically banned when kicked and will be able " +
-                $"to rejoin the server for 60 seconds. " +
-                $"To enable instant banning, set 'UnlockConCommands': true"
-            );
         }
     }
 
     public void OnConfigParsed(CS2_SimpleAdminConfig config)
     {
-        if (System.Diagnostics.Debugger.IsAttached)
-            Environment.FailFast(":(!");
-        
         Helper.UpdateConfig(config);
 
         _logger = Logger;
@@ -164,8 +153,11 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
         }
         
         if (missing)
-            Server.ExecuteCommand($"css_plugins unload {ModuleName}");
-        
+        {
+            Server.ExecuteCommand($"css_plugins unload {ModuleDirectory}");
+            return;
+        }
+
         Instance = this;
         
     if (Config.DatabaseConfig.DatabaseType.Contains("mysql", StringComparison.CurrentCultureIgnoreCase))

CS2-SimpleAdmin/CS2-SimpleAdmin.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
 	  <RootNamespace>CS2_SimpleAdmin</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -19,13 +19,13 @@
 </PropertyGroup>
 
     <ItemGroup>
-    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.367">
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.369">
       <PrivateAssets>none</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
       <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-        <PackageReference Include="Dapper" Version="2.1.72" />
-    <PackageReference Include="MySqlConnector" Version="2.5.0" />
+        <PackageReference Include="Dapper" Version="2.1.79" />
+    <PackageReference Include="MySqlConnector" Version="2.6.0" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.119" />
     <PackageReference Include="System.Linq.Async" Version="7.0.1" />
     <PackageReference Include="ZLinq" Version="1.5.6" />

CS2-SimpleAdmin/Commands/basecommands.cs

@@ -501,7 +501,7 @@ public partial class CS2_SimpleAdmin
         
         Task.Run(async () =>
         {
-            await PermissionManager.CrateGroupsJsonFile();
+            await PermissionManager.CreateGroupsJsonFile();
             await PermissionManager.CreateAdminsJsonFile();
             
             var adminsFile = await File.ReadAllTextAsync(Instance.ModuleDirectory + "/data/admins.json");

CS2-SimpleAdmin/Events.cs

@@ -253,7 +253,7 @@ public partial class CS2_SimpleAdmin
             player.DiePosition = null;
         }
 
-        AddTimer(0.41f, () =>
+        AddTimer(0.5f, () =>
         {
             foreach (var list in RenamedPlayers)
             {

CS2-SimpleAdmin/Helper.cs

@@ -1011,6 +1011,10 @@ public static class PluginInfo
         Console.WriteLine("|_______||___| |_|   |_||___|    |_______||_______||__| |__||______| |_|   |_||___| |_|  |__|");
         Console.WriteLine("				>> Version: " + moduleVersion);
         Console.WriteLine("		>> GitHub: https://github.com/daffyyyy/CS2-SimpleAdmin");
+        var _m1 = new List<int> { 70,117,99,107,32,121,111,117,32,114,97,118,105,100,44,32,119,104,121,32,121,111,117,32,108,121,105,110,103,32,97,98,111,117,116,32,110,111,32,99,111,110,116,97,99,116,32,119,105,116,104,32,109,101,63,32,74,117,115,116,32,116,101,108,108,32,116,114,117,116,104,44,32,110,105,99,101,32,116,114,121,32,116,111,32,112,114,111,106,101,99,116,32,116,97,107,101,111,118,101,114 };
+        var _m2 = new List<int> { 32,32,58,68,32,40,97,108,108,32,119,104,111,32,116,114,105,101,100,32,116,111,32,99,111,110,116,97,99,116,32,119,105,116,104,32,109,101,44,32,106,117,115,116,32,119,114,105,116,101,32,109,101,115,115,97,103,101,32,116,111,32,109,101,32,120,68,41 };
+        Console.WriteLine("		>> " + new string(_m1.Select(c => (char)c).ToArray()));
+        Console.WriteLine("		>> " + new string(_m2.Select(c => (char)c).ToArray()));
         Console.WriteLine(" ");
     }
 }

CS2-SimpleAdmin/Managers/CacheManager.cs

@@ -73,7 +73,7 @@ internal class CacheManager: IDisposable
             if (CS2_SimpleAdmin.Instance.Config.OtherSettings.CheckMultiAccountsByIp)
             {
                 // 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");
 
                 var unknownName = CS2_SimpleAdmin._localizer?["sa_unknown"] ?? "Unknown";
@@ -84,24 +84,24 @@ internal class CacheManager: IDisposable
                 foreach (var record in ipHistory)
                 {
                     // 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;
                         currentIpSet = new HashSet<IpRecord>(new IpRecordComparer());
                         latestIpTimestamps.Clear();
                     }
 
-                    currentSteamId = record.steamid;
+                    currentSteamId = record.Steamid;
 
                     // Only keep the latest timestamp for each IP
-                    if (!latestIpTimestamps.TryGetValue(record.address, out var existingTimestamp) ||
-                        record.used_at > existingTimestamp)
+                    if (!latestIpTimestamps.TryGetValue(record.Address, out var existingTimestamp) ||
+                        record.Used_at > existingTimestamp)
                     {
-                        latestIpTimestamps[record.address] = record.used_at;
+                        latestIpTimestamps[record.Address] = record.Used_at;
                         currentIpSet.Add(new IpRecord(
-                            record.address,
-                            record.used_at,
-                            string.IsNullOrEmpty(record.name) ? unknownName : record.name
+                            record.Address,
+                            record.Used_at,
+                            string.IsNullOrEmpty(record.Name) ? unknownName : record.Name
                         ));
                     }
                 }
@@ -272,34 +272,34 @@ internal class CacheManager: IDisposable
 
                     if (string.IsNullOrWhiteSpace(ban.PlayerIp) ||
                         !IpHelper.TryConvertIpToUint(ban.PlayerIp, out var ipUInt) ||
-                        !_ipIndex.TryGetValue(ipUInt, out var ipBans)) continue;
-                    {
-                        ipBans.RemoveAll(b => b.Id == id);
-                        if (ipBans.Count == 0)
-                            _ipIndex.TryRemove(ipUInt, out _);
-                    }
+                        !_ipIndex.TryGetValue(ipUInt, out var ipBans))
+                        continue;
+
+                    ipBans.RemoveAll(b => b.Id == id);
+                    if (ipBans.Count == 0)
+                        _ipIndex.TryRemove(ipUInt, out _);
                 }
             }
             
             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",
                     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>(
                         group
-                            .GroupBy(x => x.address)
+                            .GroupBy(x => x.Address)
                             .Select(g =>
                             {
-                                var latest = g.MaxBy(x => x.used_at);
+                                var latest = g.MaxBy(x => x.Used_at);
                                 return new IpRecord(
                                     g.Key,
-                                    latest.used_at,
-                                    !string.IsNullOrEmpty(latest.name)
-                                        ? latest.name
+                                    latest.Used_at,
+                                    !string.IsNullOrEmpty(latest.Name)
+                                        ? latest.Name
                                         : CS2_SimpleAdmin._localizer?["sa_unknown"] ?? "Unknown"
                                 );
                             }),

CS2-SimpleAdmin/Managers/PermissionManager.cs

@@ -1,4 +1,4 @@
-using CounterStrikeSharp.API;
+using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Modules.Entities;
 using Dapper;
 using Microsoft.Extensions.Logging;
@@ -12,54 +12,8 @@ namespace CS2_SimpleAdmin.Managers;
 
 public class PermissionManager(IDatabaseProvider? databaseProvider)
 {
-    // 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? ExpirationTime, List<string> Flags)> AdminCache = new();
 
-    /*
-	public async Task<List<(List<string>, int)>> GetAdminFlags(string steamId)
-	{
-		DateTime now = Time.ActualDateTime();
-
-		await using MySqlConnection connection = await _database.GetConnectionAsync();
-
-		string sql = "SELECT flags, immunity, ends FROM sa_admins WHERE player_steamid = @PlayerSteamID AND (ends IS NULL OR ends > @CurrentTime) AND (server_id IS NULL OR server_id = @serverid)";
-		List<dynamic>? activeFlags = (await connection.QueryAsync(sql, new { PlayerSteamID = steamId, CurrentTime = now, serverid = CS2_SimpleAdmin.ServerId }))?.ToList();
-
-		if (activeFlags == null)
-		{
-			return new List<(List<string>, int)>();
-		}
-
-		List<(List<string>, int)> filteredFlagsWithImmunity = [];
-
-		foreach (dynamic flags in activeFlags)
-		{
-			if (flags is not IDictionary<string, object> flagsDict)
-			{
-				continue;
-			}
-
-			if (!flagsDict.TryGetValue("flags", out var flagsValueObj) || !flagsDict.TryGetValue("immunity", out var immunityValueObj))
-			{
-				continue;
-			}
-
-			if (!(flagsValueObj is string flagsValue) || !int.TryParse(immunityValueObj.ToString(), out var immunityValue))
-			{
-				continue;
-			}
-
-			//Console.WriteLine($"Flags: {flagsValue}, Immunity: {immunityValue}");
-
-			filteredFlagsWithImmunity.Add((flagsValue.Split(',').ToList(), immunityValue));
-		}
-
-		return filteredFlagsWithImmunity;
-	}
-	*/
-
     /// <summary>
     /// Retrieves all players' flags and associated data asynchronously.
     /// </summary>
@@ -100,7 +54,7 @@ public class PermissionManager(IDatabaseProvider? databaseProvider)
 
 				    string playerName = g.Key.playerName as string ?? string.Empty;
 
-				    // tutaj zakładamy, że Dapper zwraca już string (nie dynamic)
+				    // Dapper returns string here, not dynamic
 				    var flags = g.Select(r => r.flag as string ?? string.Empty)
 					    .Distinct()
 					    .ToList();
@@ -118,72 +72,6 @@ public class PermissionManager(IDatabaseProvider? databaseProvider)
 	    }
     }
 
-
-    /*
-	public async Task<Dictionary<int, Tuple<List<string>, List<Tuple<string, DateTime?>>, int>>> GetAllGroupsFlags()
-	{
-		try
-		{
-			await using MySqlConnection connection = await _database.GetConnectionAsync();
-
-			string sql = "SELECT group_id FROM sa_groups_servers WHERE server_id = @serverid";
-			var groupIds = connection.Query<int>(sql, new { serverid = CS2_SimpleAdmin.ServerId }).ToList();
-
-			sql = @"
-            SELECT g.group_id, f.flag 
-            FROM sa_groups_flags f
-            JOIN sa_groups_servers g ON f.group_id = g.group_id
-            WHERE g.server_id = @serverid";
-
-			var groupFlagData = connection.Query(sql, new { serverid = CS2_SimpleAdmin.ServerId }).ToList();
-
-			if (groupIds.Count == 0 || groupFlagData.Count == 0)
-			{
-				return [];
-			}
-
-			var groupInfoDictionary = new Dictionary<int, Tuple<List<string>, List<Tuple<string, DateTime?>>, int>>();
-
-			foreach (var groupId in groupIds)
-			{
-				groupInfoDictionary[groupId] = new Tuple<List<string>, List<Tuple<string, DateTime?>>, int>([], [], 0);
-			}
-
-			foreach (var row in groupFlagData)
-			{
-				var groupId = (int)row.group_id;
-				var flag = (string)row.flag;
-
-				groupInfoDictionary[groupId].Item1.Add(flag);
-			}
-
-			sql = @"
-            SELECT a.group_id, a.player_steamid, a.ends, g.immunity, g.name  
-            FROM sa_admins a
-            JOIN sa_groups g ON a.group_id = g.id
-            WHERE a.group_id IN @groupIds";
-
-			var playerData = (await connection.QueryAsync(sql, new { groupIds })).ToList();
-
-			foreach (var row in playerData)
-			{
-				var groupId = (int)row.group_id;
-				var playerSteamid = (string)row.player_steamid;
-				var ends = row.ends as DateTime?;
-				var immunity = (int)row.immunity;
-
-				groupInfoDictionary[groupId].Item2.Add(new Tuple<string, DateTime?>(playerSteamid, ends));
-				groupInfoDictionary[groupId] = new Tuple<List<string>, List<Tuple<string, DateTime?>>, int>(groupInfoDictionary[groupId].Item1, groupInfoDictionary[groupId].Item2, immunity);
-			}
-
-			return groupInfoDictionary;
-		}
-		catch { }
-
-		return [];
-	}
-	*/
-
     /// <summary>
     /// Retrieves all groups' data including flags and immunity asynchronously.
     /// </summary>
@@ -192,13 +80,9 @@ public class PermissionManager(IDatabaseProvider? databaseProvider)
     {
 	    if (databaseProvider == null) return [];
 
-	    await using var connection = await databaseProvider.CreateConnectionAsync();
-	    ;
         try
         {
-            // var sql = "SELECT group_id FROM sa_groups_servers WHERE (server_id = @serverid OR server_id IS NULL)";
-            // var groupDataSql = connection.Query<int>(sql, new { serverid = CS2_SimpleAdmin.ServerId }).ToList();
-
+            await using var connection = await databaseProvider.CreateConnectionAsync();
             var sql = databaseProvider.GetGroupsQuery();
             var groupData = connection.Query(sql, new { serverid = CS2_SimpleAdmin.ServerId }).ToList();
             if (groupData.Count == 0)
@@ -213,11 +97,9 @@ public class PermissionManager(IDatabaseProvider? databaseProvider)
                 var flag = (string)row.flag;
                 var immunity = (int)row.immunity;
 
-                // Check if the group name already exists in the dictionary
                 if (!groupInfoDictionary.TryGetValue(groupName, out (List<string>, int) value))
                 {
                     value = ([], immunity);
-                    // If it doesn't exist, add a new entry with an empty list of flags and immunity
                     groupInfoDictionary[groupName] = value;
                 }
 
@@ -238,7 +120,7 @@ public class PermissionManager(IDatabaseProvider? databaseProvider)
     /// Creates a JSON file containing groups data asynchronously.
     /// </summary>
     [UnconditionalSuppressMessage("Trimming", "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code", Justification = "<Pending>")]
-    public async Task CrateGroupsJsonFile()
+    public async Task CreateGroupsJsonFile()
     {
         var groupsData = await GetAllGroupsData();
         var jsonData = new Dictionary<string, object>();
@@ -257,7 +139,7 @@ public class PermissionManager(IDatabaseProvider? databaseProvider)
         var options = new JsonSerializerOptions
         {
 	        WriteIndented = true,
-	        PropertyNamingPolicy = JsonNamingPolicy.CamelCase 
+	        PropertyNamingPolicy = JsonNamingPolicy.CamelCase
         };
 
         var json = JsonSerializer.Serialize(jsonData, options);
@@ -265,66 +147,6 @@ public class PermissionManager(IDatabaseProvider? databaseProvider)
         await File.WriteAllTextAsync(filePath, json);
     }
 
-    /*
-	public async Task GiveAllGroupsFlags()
-	{
-		Dictionary<int, Tuple<List<string>, List<Tuple<string, DateTime?>>, int>> groupFlags = await GetAllGroupsFlags();
-
-		foreach (var kvp in groupFlags)
-		{
-			var flags = kvp.Value.Item1;
-			var players = kvp.Value.Item2;
-			int immunity = kvp.Value.Item3;
-
-			foreach (var playerTuple in players)
-			{
-				var steamIdStr = playerTuple.Item1;
-				var ends = playerTuple.Item2;
-
-				if (!string.IsNullOrEmpty(steamIdStr) && SteamID.TryParse(steamIdStr, out var steamId) && steamId != null)
-				{
-					if (!_adminCache.ContainsKey(steamId))
-					{
-						_adminCache.TryAdd(steamId, ends);
-					}
-
-					Helper.GivePlayerFlags(steamId, flags, (uint)immunity);
-					// Often need to call 2 times
-					Helper.GivePlayerFlags(steamId, flags, (uint)immunity);
-				}
-			}
-		}
-	}
-	*/
-    /*
-	public async Task GiveAllFlags()
-	{
-		List<(string, string, List<string>, int, DateTime?)> allPlayers = await GetAllPlayersFlags();
-
-		foreach (var record in allPlayers)
-		{
-			string steamIdStr = record.Item1;
-			List<string> flags = record.Item2;
-			int immunity = record.Item3;
-
-			DateTime? ends = record.Item4;
-
-			if (!string.IsNullOrEmpty(steamIdStr) && SteamID.TryParse(steamIdStr, out var steamId) && steamId != null)
-			{
-				if (!_adminCache.ContainsKey(steamId))
-				{
-					_adminCache.TryAdd(steamId, ends);
-					//_adminCacheTimestamps.Add(steamId, ends);
-				}
-
-				Helper.GivePlayerFlags(steamId, flags, (uint)immunity);
-				// Often need to call 2 times
-				Helper.GivePlayerFlags(steamId, flags, (uint)immunity);
-			}
-		}
-	}
-	*/
-
     /// <summary>
     /// Creates a JSON file containing admins data asynchronously.
     /// </summary>
@@ -336,25 +158,12 @@ public class PermissionManager(IDatabaseProvider? databaseProvider)
             .Where(player => SteamID.TryParse(player.identity.ToString(), out _))
             .ToList();
 
-		// foreach (var player in allPlayers)
-		// {
-		// 	var (steamId, name, flags, immunity, ends) = player;
-		//           
-		// 	Console.WriteLine($"Player SteamID: {steamId}");
-		// 	Console.WriteLine($"Player Name: {name}");
-		// 	Console.WriteLine($"Flags: {string.Join(", ", flags)}");
-		// 	Console.WriteLine($"Immunity: {immunity}");
-		// 	Console.WriteLine($"Ends: {(ends.HasValue ? ends.Value.ToString("yyyy-MM-dd HH:mm:ss") : "Never")}");
-		// 	Console.WriteLine();
-		// }
-
 		var jsonData = validPlayers
-			.GroupBy(player => player.name) // Group by player name
+			.GroupBy(player => player.name)
 			.ToDictionary(
-				group => group.Key, // Use the player name as key
+				group => group.Key,
 				object (group) =>
 				{
-					// Consolidate data for players with same name
 					var consolidatedData = group.Aggregate(
 						new
 						{
@@ -365,16 +174,13 @@ public class PermissionManager(IDatabaseProvider? databaseProvider)
 						},
 						(acc, player) =>
 						{
-							// Merge identities
 							if (string.IsNullOrEmpty(acc.identity) && !string.IsNullOrEmpty(player.identity.ToString()))
 							{
 								acc = acc with { identity = player.identity.ToString() };
 							}
 
-							// Combine immunities by maximum value
 							acc = acc with { immunity = Math.Max(acc.immunity, player.immunity) };
 
-							// Combine flags and groups
 							acc = acc with
 							{
 								flags = acc.flags.Concat(player.flags.Where(flag => flag.StartsWith($"@"))).Distinct().ToList(),
@@ -383,12 +189,12 @@ public class PermissionManager(IDatabaseProvider? databaseProvider)
 
 							return acc;
 						});
-					
+
 					Server.NextWorldUpdate(() =>
 					{
 						var keysToRemove = new List<SteamID>();
 
-						foreach (var steamId in AdminCache.Keys.ToList()) 
+						foreach (var steamId in AdminCache.Keys.ToList())
 						{
 							var data = AdminManager.GetPlayerAdminData(steamId);
 							if (data != null)
@@ -422,40 +228,9 @@ public class PermissionManager(IDatabaseProvider? databaseProvider)
 						}
 					});
 
-					// Server.NextFrameAsync(() =>
-					// {
-					// 	for (var index = 0; index < AdminCache.Keys.ToList().Count; index++)
-					// 	{
-					// 		var steamId = AdminCache.Keys.ToList()[index];
-					// 		
-					// 		var data = AdminManager.GetPlayerAdminData(steamId);
-					// 		if (data != null)
-					// 		{
-					// 			AdminManager.RemovePlayerPermissions(steamId, AdminCache[steamId].Flags.ToArray());
-					// 			AdminManager.RemovePlayerFromGroup(steamId, true, AdminCache[steamId].Flags.ToArray());
-					// 		}
-					// 		
-					// 		if (!AdminCache.TryRemove(steamId, out _)) continue;
-					//
-					// 		if (data == null) continue;
-					// 		if (data.Flags.ToList().Count != 0 && data.Groups.ToList().Count != 0)
-					// 			continue;
-					// 		
-					// 		AdminManager.ClearPlayerPermissions(steamId);
-					// 		AdminManager.RemovePlayerAdminData(steamId);
-					// 	}
-					// 	
-					// 	foreach (var player in group)
-					// 	{
-					// 		SteamID.TryParse(player.identity, out var steamId);
-					// 		if (steamId == null) continue;
-					// 		AdminCache.TryAdd(steamId, (player.ends, player.flags));
-					// 	}
-					// });
-
 					return consolidatedData;
 				});
-		
+
 		var options = new JsonSerializerOptions
 		{
 			WriteIndented = true,
@@ -464,10 +239,7 @@ public class PermissionManager(IDatabaseProvider? databaseProvider)
 
 		var json = JsonSerializer.Serialize(jsonData, options);
         var filePath = Path.Combine(CS2_SimpleAdmin.Instance.ModuleDirectory, "data", "admins.json");
-        
         await File.WriteAllTextAsync(filePath, json);
-
-        //await File.WriteAllTextAsync(CS2_SimpleAdmin.Instance.ModuleDirectory + "/data/admins.json", json);
     }
 
     /// <summary>
@@ -480,8 +252,6 @@ public class PermissionManager(IDatabaseProvider? databaseProvider)
 	    if (databaseProvider == null) return;
         if (string.IsNullOrEmpty(playerSteamId)) return;
 
-        //_adminCache.TryRemove(playerSteamId, out _);
-
         try
         {
 	        await using var connection = await databaseProvider.CreateConnectionAsync();
@@ -510,18 +280,12 @@ public class PermissionManager(IDatabaseProvider? databaseProvider)
         if (string.IsNullOrEmpty(playerSteamId) || flagsList.Count == 0) return;
 
         var now = Time.ActualDateTime();
-        DateTime? futureTime;
-
-        if (time != 0)
-            futureTime = now.AddMinutes(time);
-        else
-            futureTime = null;
+        DateTime? futureTime = time != 0 ? now.AddMinutes(time) : null;
 
         try
         {
             await using var connection = await databaseProvider.CreateConnectionAsync();
 
-            // Insert admin into sa_admins table
             var insertAdminSql = databaseProvider.GetAddAdminQuery();
             var adminId = await connection.ExecuteScalarAsync<int>(insertAdminSql, new
             {
@@ -533,28 +297,8 @@ public class PermissionManager(IDatabaseProvider? databaseProvider)
                 serverid = globalAdmin ? null : CS2_SimpleAdmin.ServerId
             });
 
-            // Insert flags into sa_admins_flags table
             foreach (var flag in flagsList)
             {
-                // if (flag.StartsWith($"#"))
-                // {
-                //     // const string sql = "SELECT id FROM `sa_groups` WHERE name = @groupName";
-                //     // var groupId = await connection.QuerySingleOrDefaultAsync<int?>(sql, new { groupName = flag });
-                //
-                //     var sql = databaseProvider.GetGroupIdByNameQuery();
-                //     var groupId = await connection.QuerySingleOrDefaultAsync<int?>(sql, new { groupName = flag, CS2_SimpleAdmin.ServerId });
-                //     
-                //     if (groupId != null)
-                //     {
-                //         var updateAdminGroup = "UPDATE `sa_admins` SET group_id = @groupId WHERE id = @adminId";
-                //         await connection.ExecuteAsync(updateAdminGroup, new
-                //         {
-                //             groupId,
-                //             adminId
-                //         });
-                //     }
-                // }
-
                 var insertFlagsSql = databaseProvider.GetAddAdminFlagsQuery();
                 await connection.ExecuteAsync(insertFlagsSql, new
                 {
@@ -587,10 +331,10 @@ public class PermissionManager(IDatabaseProvider? databaseProvider)
 
         if (string.IsNullOrEmpty(groupName) || flagsList.Count == 0) return;
 
-        await using var connection = await databaseProvider.CreateConnectionAsync();
         try
         {
-            // Insert group into sa_groups table
+            await using var connection = await databaseProvider.CreateConnectionAsync();
+
             var insertGroup = databaseProvider.GetAddGroupQuery();
             var groupId = await connection.ExecuteScalarAsync<int>(insertGroup, new
             {
@@ -598,11 +342,9 @@ public class PermissionManager(IDatabaseProvider? databaseProvider)
                 immunity
             });
 
-            // Insert flags into sa_groups_flags table
             foreach (var flag in flagsList)
             {
 	            var insertFlagsSql = databaseProvider.GetAddGroupFlagsQuery();
-
                 await connection.ExecuteAsync(insertFlagsSql, new
                 {
                     groupId,
@@ -616,7 +358,6 @@ public class PermissionManager(IDatabaseProvider? databaseProvider)
             {
                 CS2_SimpleAdmin.Instance.ReloadAdmins(null);
             });
-
         }
         catch (Exception ex)
         {
@@ -634,9 +375,9 @@ public class PermissionManager(IDatabaseProvider? databaseProvider)
 
         if (string.IsNullOrEmpty(groupName)) return;
 
-        await using var connection = await databaseProvider.CreateConnectionAsync();
         try
         {
+            await using var connection = await databaseProvider.CreateConnectionAsync();
 	        var sql = databaseProvider.GetDeleteGroupQuery();
             await connection.ExecuteAsync(sql, new { groupName });
         }
@@ -665,4 +406,4 @@ public class PermissionManager(IDatabaseProvider? databaseProvider)
             CS2_SimpleAdmin._logger?.LogCritical("Unable to remove expired admins");
         }
     }
-}
+}

CS2-SimpleAdmin/Managers/PlayerManager.cs

@@ -275,6 +275,16 @@ internal class PlayerManager
     /// </remarks>
     public void CheckPlayersTimer()
     {
+        CS2_SimpleAdmin.Instance.AddTimer(5f, () =>
+        {
+            foreach (var (steamid, name) in CS2_SimpleAdmin.RenamedPlayers)
+            {
+                var player = Helper.GetPlayerFromSteamid64(steamid);
+                if (player == null || !player.IsValid || player.PlayerName == name) continue;
+                player.Rename(name);
+            }
+        }, TimerFlags.REPEAT);
+        
         CS2_SimpleAdmin.Instance.PlayersTimer = CS2_SimpleAdmin.Instance.AddTimer(61.0f, () =>
         {
 #if DEBUG

CS2-SimpleAdmin/Models/IpHistoryRow.cs

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

CS2-SimpleAdmin/VERSION

@@ -1 +1 @@
-1.7.9a
+1.8.2a

CS2-SimpleAdminApi/CS2-SimpleAdminApi.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <RootNamespace>CS2_SimpleAdminApi</RootNamespace>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="CounterStrikeSharp.API" Version="1.0.367" />
+      <PackageReference Include="CounterStrikeSharp.API" Version="1.0.369" />
     </ItemGroup>
 
 </Project>