add back helper methods without cancellation token for plugins

Changed the .NET 6 Direct Download link to the hosting bundle as it includes both the .NET 6 runtime and the ASP .NET 6 runtime which are both needed.

Application/ApplicationManager.cs

@@ -236,13 +236,6 @@ namespace IW4MAdmin.Application
                     .Select(ut => ut.Key)
                     .ToList();
 
-                // this is to prevent the log reader from starting before the initial
-                // query of players on the server
-                if (serverTasksToRemove.Count > 0)
-                {
-                    IsInitialized = true;
-                }
-
                 // remove the update tasks as they have completed
                 foreach (var serverId in serverTasksToRemove.Where(serverId => runningUpdateTasks.ContainsKey(serverId)))
                 {
@@ -419,7 +412,7 @@ namespace IW4MAdmin.Application
 
                 if (!validationResult.IsValid)
                 {
-                    throw new ConfigurationException(_translationLookup["MANAGER_CONFIGURATION_ERROR"])
+                    throw new ConfigurationException("Could not validate configuration")
                     {
                         Errors = validationResult.Errors.Select(_error => _error.ErrorMessage).ToArray(),
                         ConfigurationFileName = ConfigHandler.FileName
@@ -530,6 +523,7 @@ namespace IW4MAdmin.Application
 
             Console.WriteLine(_translationLookup["MANAGER_COMMUNICATION_INFO"]);
             await InitializeServers();
+            IsInitialized = true;
         }
 
         private async Task InitializeServers()

Application/Commands/MapAndGameTypeCommand.cs

@@ -54,20 +54,8 @@ namespace IW4MAdmin.Application.Commands
                 return;
             }
 
-            string map;
-            string gametype;
-
-            if (match.Groups.Count > 3)
-            {
-                map = match.Groups[2].ToString();
-                gametype = match.Groups[4].ToString();
-            }
-
-            else
-            {
-                map = match.Groups[1].ToString();
-                gametype = match.Groups[3].ToString();
-            }
+            var map = match.Groups[1].Length > 0 ? match.Groups[1].ToString() : match.Groups[2].ToString();
+            var gametype = match.Groups[3].Length > 0 ? match.Groups[3].ToString() : match.Groups[4].ToString();
 
             var matchingMaps = gameEvent.Owner.FindMap(map);
             var matchingGametypes = _defaultSettings.FindGametype(gametype, gameEvent.Owner.GameName);
@@ -104,7 +92,7 @@ namespace IW4MAdmin.Application.Commands
 
             _logger.LogDebug("Changing map to {Map} and gametype {Gametype}", map, gametype);
 
-            await gameEvent.Owner.SetDvarAsync("g_gametype", gametype);
+            await gameEvent.Owner.SetDvarAsync("g_gametype", gametype, gameEvent.Owner.Manager.CancellationToken);
             gameEvent.Owner.Broadcast(_translationLookup["COMMANDS_MAP_SUCCESS"].FormatExt(map));
             await Task.Delay(gameEvent.Owner.Manager.GetApplicationSettings().Configuration().MapChangeDelaySeconds);
 

Application/Factories/GameLogReaderFactory.cs

@@ -18,14 +18,22 @@ namespace IW4MAdmin.Application.Factories
         public IGameLogReader CreateGameLogReader(Uri[] logUris, IEventParser eventParser)
         {
             var baseUri = logUris[0];
-            if (baseUri.Scheme == Uri.UriSchemeHttp)
+            if (baseUri.Scheme == Uri.UriSchemeHttp || baseUri.Scheme == Uri.UriSchemeHttps)
             {
-                return new GameLogReaderHttp(logUris, eventParser, _serviceProvider.GetRequiredService<ILogger<GameLogReaderHttp>>());
+                return new GameLogReaderHttp(logUris, eventParser,
+                    _serviceProvider.GetRequiredService<ILogger<GameLogReaderHttp>>());
             }
 
-            else if (baseUri.Scheme == Uri.UriSchemeFile)
+            if (baseUri.Scheme == Uri.UriSchemeFile)
             {
-                return new GameLogReader(baseUri.LocalPath, eventParser, _serviceProvider.GetRequiredService<ILogger<GameLogReader>>());
+                return new GameLogReader(baseUri.LocalPath, eventParser,
+                    _serviceProvider.GetRequiredService<ILogger<GameLogReader>>());
+            }
+
+            if (baseUri.Scheme == Uri.UriSchemeNetTcp)
+            {
+                return new NetworkGameLogReader(logUris, eventParser,
+                    _serviceProvider.GetRequiredService<ILogger<NetworkGameLogReader>>());
             }
 
             throw new NotImplementedException($"No log reader implemented for Uri scheme \"{baseUri.Scheme}\"");

Application/IO/GameLogEventDetection.cs

@@ -21,7 +21,7 @@ namespace IW4MAdmin.Application.IO
         {
             _reader = gameLogReaderFactory.CreateGameLogReader(gameLogUris, server.EventParser);
             _server = server;
-            _ignoreBots = server?.Manager.GetApplicationSettings().Configuration().IgnoreBots ?? false;
+            _ignoreBots = server.Manager.GetApplicationSettings().Configuration()?.IgnoreBots ?? false;
             _logger = logger;
         }
 
@@ -69,7 +69,7 @@ namespace IW4MAdmin.Application.IO
                 return;
             }
 
-            var events = await _reader.ReadEventsFromLog(fileDiff, previousFileSize);
+            var events = await _reader.ReadEventsFromLog(fileDiff, previousFileSize, _server);
 
             foreach (var gameEvent in events)
             {

Application/IO/GameLogReader.cs

@@ -28,7 +28,7 @@ namespace IW4MAdmin.Application.IO
             _logger = logger;
         }
 
-        public async Task<IEnumerable<GameEvent>> ReadEventsFromLog(long fileSizeDiff, long startPosition)
+        public async Task<IEnumerable<GameEvent>> ReadEventsFromLog(long fileSizeDiff, long startPosition, Server server = null)
         {
             // allocate the bytes for the new log lines
             List<string> logLines = new List<string>();

Application/IO/GameLogReaderHttp.cs

@@ -34,7 +34,7 @@ namespace IW4MAdmin.Application.IO
 
         public int UpdateInterval => 500;
 
-        public async Task<IEnumerable<GameEvent>> ReadEventsFromLog(long fileSizeDiff, long startPosition)
+        public async Task<IEnumerable<GameEvent>> ReadEventsFromLog(long fileSizeDiff, long startPosition, Server server = null)
         {
             var events = new List<GameEvent>();
             var response = await _logServerApi.Log(_safeLogPath, lastKey);

Application/IO/NetworkGameLogReader.cs

@@ -0,0 +1,163 @@
+using SharedLibraryCore;
+using SharedLibraryCore.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+using System.Threading.Tasks;
+using Integrations.Cod;
+using Microsoft.Extensions.Logging;
+using Serilog.Context;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
+
+namespace IW4MAdmin.Application.IO
+{
+    /// <summary>
+    /// provides capability of reading log files over udp 
+    /// </summary>
+    class NetworkGameLogReader : IGameLogReader
+    {
+        private readonly IEventParser _eventParser;
+        private readonly ILogger _logger;
+        private readonly Uri _uri;
+        private static readonly NetworkLogState State = new();
+        private bool _stateRegistered;
+        private CancellationToken _token;
+
+        public NetworkGameLogReader(IReadOnlyList<Uri> uris, IEventParser parser, ILogger<NetworkGameLogReader> logger)
+        {
+            _eventParser = parser;
+            _uri = uris[0];
+            _logger = logger;
+        }
+
+        public long Length => -1;
+
+        public int UpdateInterval => 150;
+
+        public Task<IEnumerable<GameEvent>> ReadEventsFromLog(long fileSizeDiff, long startPosition,
+            Server server = null)
+        {
+            // todo: other games might support this
+            var serverEndpoint = (server?.RemoteConnection as CodRConConnection)?.Endpoint;
+
+            if (serverEndpoint is null)
+            {
+                return Task.FromResult(Enumerable.Empty<GameEvent>());
+            }
+
+            if (!_stateRegistered && !State.EndPointExists(serverEndpoint))
+            {
+                try
+                {
+                    var client = State.RegisterEndpoint(serverEndpoint, BuildLocalEndpoint()).Client;
+
+                    _stateRegistered = true;
+                    _token = server.Manager.CancellationToken;
+
+                    if (client == null)
+                    {
+                        using (LogContext.PushProperty("Server", server.ToString()))
+                        {
+                            _logger.LogInformation("Not registering {Name} socket because it is already bound",
+                                nameof(NetworkGameLogReader));
+                        }
+                        return Task.FromResult(Enumerable.Empty<GameEvent>());
+                    }
+
+                    Task.Run(async () => await ReadNetworkData(client, _token), _token);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Could not register {Name} endpoint {Endpoint}",
+                        nameof(NetworkGameLogReader), _uri);
+                    throw;
+                }
+            }
+
+            var events = new List<GameEvent>();
+
+            foreach (var logData in State.GetServerLogData(serverEndpoint)
+                         .Select(log => Utilities.EncodingType.GetString(log)))
+            {
+                if (string.IsNullOrWhiteSpace(logData))
+                {
+                    return Task.FromResult(Enumerable.Empty<GameEvent>());
+                }
+
+                var lines = logData
+                    .Split('\n')
+                    .Where(line => line.Length > 0);
+
+                foreach (var eventLine in lines)
+                {
+                    try
+                    {
+                        // this trim end should hopefully fix the nasty runaway regex
+                        var gameEvent = _eventParser.GenerateGameEvent(eventLine.TrimEnd('\r'));
+                        events.Add(gameEvent);
+                    }
+
+                    catch (Exception ex)
+                    {
+                        _logger.LogError(ex, "Could not properly parse event line from http {EventLine}",
+                            eventLine);
+                    }
+                }
+            }
+
+            return Task.FromResult((IEnumerable<GameEvent>)events);
+        }
+
+        private async Task ReadNetworkData(UdpClient client, CancellationToken token)
+        {
+            while (!token.IsCancellationRequested)
+            {
+                // get more data
+                IPEndPoint remoteEndpoint = null;
+                byte[] bufferedData = null;
+
+                if (client == null)
+                {
+                    // we already have a socket listening on this port for data, so we don't need to run another thread
+                    break;
+                }
+
+                try
+                {
+                    var result = await client.ReceiveAsync(_token);
+                    remoteEndpoint = result.RemoteEndPoint;
+                    bufferedData = result.Buffer;
+                }
+                catch (OperationCanceledException)
+                {
+                    _logger.LogDebug("Stopping network log receive");
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Could not receive lines for {LogReader}", nameof(NetworkGameLogReader));
+                }
+
+                if (bufferedData != null)
+                {
+                    State.QueueServerLogData(remoteEndpoint, bufferedData);
+                }
+            }
+        }
+
+        private IPEndPoint BuildLocalEndpoint()
+        {
+            try
+            {
+                return new IPEndPoint(Dns.GetHostAddresses(_uri.Host).First(), _uri.Port);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Could not setup {LogReader} endpoint", nameof(NetworkGameLogReader));
+                throw;
+            }
+        }
+    }
+}

Application/IO/NetworkLogState.cs

@@ -0,0 +1,138 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+
+namespace IW4MAdmin.Application.IO;
+
+public class NetworkLogState : Dictionary<IPEndPoint, UdpClientState>
+{
+    public UdpClientState RegisterEndpoint(IPEndPoint serverEndpoint, IPEndPoint localEndpoint)
+    {
+        try
+        {
+            lock (this)
+            {
+                if (!ContainsKey(serverEndpoint))
+                {
+                    Add(serverEndpoint, new UdpClientState { Client = new UdpClient(localEndpoint) });
+                }
+            }
+        }
+        catch (SocketException ex) when (ex.SocketErrorCode == SocketError.AddressAlreadyInUse)
+        {
+            lock (this)
+            {
+                // we don't add the udp client because it already exists (listening to multiple servers from one socket)
+                Add(serverEndpoint,  new UdpClientState());
+            }
+        }
+
+        return this[serverEndpoint];
+    }
+
+
+    public List<byte[]> GetServerLogData(IPEndPoint serverEndpoint)
+    {
+        try
+        {
+            var state = this[serverEndpoint];
+            
+            if (state == null)
+            {
+                return new List<byte[]>();
+            }
+            
+            // it's possible that we could be trying to read and write to the queue simultaneously so we need to wait 
+            this[serverEndpoint].OnAction.Wait();
+
+            var data = new List<byte[]>();
+            
+            while (this[serverEndpoint].AvailableLogData.Count > 0)
+            {
+                data.Add(this[serverEndpoint].AvailableLogData.Dequeue());
+            }
+           
+            return data;
+        }
+        finally
+        {
+            if (this[serverEndpoint].OnAction.CurrentCount == 0)
+            {
+                this[serverEndpoint].OnAction.Release(1);
+            }
+        }
+    }
+
+    public void QueueServerLogData(IPEndPoint serverEndpoint, byte[] data)
+    {
+        var endpoint = Keys.FirstOrDefault(key =>
+            Equals(key.Address, serverEndpoint.Address) && key.Port == serverEndpoint.Port);
+
+        try
+        {
+            if (endpoint == null)
+            {
+                return;
+            }
+
+            // currently our expected start and end characters
+            var startsWithPrefix = StartsWith(data, "ÿÿÿÿprint\n");
+            var endsWithDelimiter = data[^1] == '\n';
+
+            // we have the data we expected
+            if (!startsWithPrefix || !endsWithDelimiter)
+            {
+                return;
+            }
+
+            // it's possible that we could be trying to read and write to the queue simultaneously so we need to wait 
+            this[endpoint].OnAction.Wait();
+            this[endpoint].AvailableLogData.Enqueue(data);
+        }
+        finally
+        {
+            if (endpoint != null && this[endpoint].OnAction.CurrentCount == 0)
+            {
+                this[endpoint].OnAction.Release(1);
+            }
+        }
+    }
+
+    public bool EndPointExists(IPEndPoint serverEndpoint)
+    {
+        lock (this)
+        {
+            return ContainsKey(serverEndpoint);
+        }
+    }
+
+    private static bool StartsWith(byte[] sourceArray, string match)
+    {
+        if (sourceArray is null)
+        {
+            return false;
+        }
+        
+        if (match.Length > sourceArray.Length)
+        {
+            return false;
+        }
+
+        return !match.Where((t, i) => sourceArray[i] != (byte)t).Any();
+    }
+}
+
+public class UdpClientState
+{
+    public UdpClient Client { get; set; }
+    public Queue<byte[]> AvailableLogData { get; } = new();
+    public SemaphoreSlim OnAction { get; } = new(1, 1);
+
+    ~UdpClientState()
+    {
+        OnAction.Dispose();
+        Client?.Dispose();
+    }
+}

Application/IW4MServer.cs

@@ -236,7 +236,7 @@ namespace IW4MAdmin
         private async Task CreatePluginTask(IPlugin plugin, GameEvent gameEvent)
         {
             // we don't want to run the events on parser plugins
-            if (plugin is ScriptPlugin scriptPlugin && scriptPlugin.IsParser)
+            if (plugin is ScriptPlugin { IsParser: true })
             {
                 return;
             }
@@ -248,6 +248,11 @@ namespace IW4MAdmin
             {
                 await plugin.OnEventAsync(gameEvent, this).WithWaitCancellation(tokenSource.Token);
             }
+            catch (OperationCanceledException)
+            {
+                ServerLogger.LogWarning("Timed out executing event {EventType} for {Plugin}", gameEvent.Type,
+                    plugin.Name);
+            }
             catch (Exception ex)
             {
                 Console.WriteLine(loc["SERVER_PLUGIN_ERROR"].FormatExt(plugin.Name, ex.GetType().Name));
@@ -290,7 +295,7 @@ namespace IW4MAdmin
                     }
                 }
                 
-                if (E.Type == GameEvent.EventType.ConnectionLost)
+                else if (E.Type == GameEvent.EventType.ConnectionLost)
                 {
                     var exception = E.Extra as Exception;
                     ServerLogger.LogError(exception,
@@ -304,7 +309,7 @@ namespace IW4MAdmin
                     Throttled = true;
                 }
 
-                if (E.Type == GameEvent.EventType.ConnectionRestored)
+                else if (E.Type == GameEvent.EventType.ConnectionRestored)
                 {
                     ServerLogger.LogInformation(
                         "Connection restored with {server}", ToString());
@@ -316,13 +321,13 @@ namespace IW4MAdmin
 
                     if (!string.IsNullOrEmpty(CustomSayName))
                     {
-                        await this.SetDvarAsync("sv_sayname", CustomSayName);
+                        await this.SetDvarAsync("sv_sayname", CustomSayName, Manager.CancellationToken);
                     }
 
                     Throttled = false;
                 }
 
-                if (E.Type == GameEvent.EventType.ChangePermission)
+                else if (E.Type == GameEvent.EventType.ChangePermission)
                 {
                     var newPermission = (Permission) E.Extra;
                     ServerLogger.LogInformation("{origin} is setting {target} to permission level {newPermission}",
@@ -477,7 +482,7 @@ namespace IW4MAdmin
 
                 else if (E.Type == GameEvent.EventType.Unflag)
                 {
-                    var unflagPenalty = new EFPenalty()
+                    var unflagPenalty = new EFPenalty
                     {
                         Type = EFPenalty.PenaltyType.Unflag,
                         Expires = DateTime.UtcNow,
@@ -489,7 +494,8 @@ namespace IW4MAdmin
                     };
 
                     E.Target.SetLevel(Permission.User, E.Origin);
-                    await Manager.GetPenaltyService().RemoveActivePenalties(E.Target.AliasLinkId);
+                    await Manager.GetPenaltyService().RemoveActivePenalties(E.Target.AliasLinkId, E.Target.NetworkId,
+                        E.Target.CurrentAlias?.IPAddress);
                     await Manager.GetPenaltyService().Create(unflagPenalty);
                 }
 
@@ -614,7 +620,7 @@ namespace IW4MAdmin
                     await OnClientUpdate(E.Origin);
                 }
 
-                if (E.Type == GameEvent.EventType.Say)
+                else if (E.Type == GameEvent.EventType.Say)
                 {
                     if (E.Data?.Length > 0)
                     {
@@ -644,7 +650,7 @@ namespace IW4MAdmin
                     }
                 }
 
-                if (E.Type == GameEvent.EventType.MapChange)
+                else if (E.Type == GameEvent.EventType.MapChange)
                 {
                     ServerLogger.LogInformation("New map loaded - {clientCount} active players", ClientNum);
 
@@ -685,7 +691,7 @@ namespace IW4MAdmin
                     }
                 }
 
-                if (E.Type == GameEvent.EventType.MapEnd)
+                else if (E.Type == GameEvent.EventType.MapEnd)
                 {
                     ServerLogger.LogInformation("Game ending...");
 
@@ -695,12 +701,12 @@ namespace IW4MAdmin
                     }
                 }
 
-                if (E.Type == GameEvent.EventType.Tell)
+                else if (E.Type == GameEvent.EventType.Tell)
                 {
                     await Tell(E.Message, E.Target);
                 }
 
-                if (E.Type == GameEvent.EventType.Broadcast)
+                else if (E.Type == GameEvent.EventType.Broadcast)
                 {
                     if (!Utilities.IsDevelopment && E.Data != null) // hides broadcast when in development mode
                     {
@@ -777,7 +783,7 @@ namespace IW4MAdmin
         async Task<List<EFClient>[]> PollPlayersAsync()
         {
             var currentClients = GetClientsAsList();
-            var statusResponse = (await this.GetStatusAsync());
+            var statusResponse = await this.GetStatusAsync(Manager.CancellationToken);
             var polledClients = statusResponse.Clients.AsEnumerable();
 
             if (Manager.GetApplicationSettings().Configuration().IgnoreBots)
@@ -1103,7 +1109,7 @@ namespace IW4MAdmin
             RemoteConnection = RConConnectionFactory.CreateConnection(ResolvedIpEndPoint, Password, RconParser.RConEngine);
             RemoteConnection.SetConfiguration(RconParser);
 
-            var version = await this.GetMappedDvarValueOrDefaultAsync<string>("version");
+            var version = await this.GetMappedDvarValueOrDefaultAsync<string>("version", token: Manager.CancellationToken);
             Version = version.Value;
             GameName = Utilities.GetGame(version.Value ?? RconParser.Version);
 
@@ -1120,7 +1126,7 @@ namespace IW4MAdmin
                 Version = RconParser.Version;
             }
 
-            var svRunning = await this.GetMappedDvarValueOrDefaultAsync<string>("sv_running");
+            var svRunning = await this.GetMappedDvarValueOrDefaultAsync<string>("sv_running", token: Manager.CancellationToken);
 
             if (!string.IsNullOrEmpty(svRunning.Value) && svRunning.Value != "1")
             {
@@ -1129,27 +1135,28 @@ namespace IW4MAdmin
 
             var infoResponse = RconParser.Configuration.CommandPrefixes.RConGetInfo != null ? await this.GetInfoAsync() : null;
 
-            string hostname = (await this.GetMappedDvarValueOrDefaultAsync<string>("sv_hostname", "hostname", infoResponse)).Value;
-            string mapname = (await this.GetMappedDvarValueOrDefaultAsync<string>("mapname", infoResponse: infoResponse)).Value;
-            int maxplayers = (await this.GetMappedDvarValueOrDefaultAsync<int>("sv_maxclients", infoResponse: infoResponse)).Value;
-            string gametype = (await this.GetMappedDvarValueOrDefaultAsync<string>("g_gametype", "gametype", infoResponse)).Value;
-            var basepath = await this.GetMappedDvarValueOrDefaultAsync<string>("fs_basepath");
-            var basegame = await this.GetMappedDvarValueOrDefaultAsync<string>("fs_basegame");
-            var homepath = await this.GetMappedDvarValueOrDefaultAsync<string>("fs_homepath");
-            var game = (await this.GetMappedDvarValueOrDefaultAsync<string>("fs_game", infoResponse: infoResponse));
-            var logfile = await this.GetMappedDvarValueOrDefaultAsync<string>("g_log");
-            var logsync = await this.GetMappedDvarValueOrDefaultAsync<int>("g_logsync");
-            var ip = await this.GetMappedDvarValueOrDefaultAsync<string>("net_ip");
-            var gamePassword = await this.GetMappedDvarValueOrDefaultAsync("g_password", overrideDefault: "");
+            var hostname = (await this.GetMappedDvarValueOrDefaultAsync<string>("sv_hostname", "hostname", infoResponse, token: Manager.CancellationToken)).Value;
+            var mapname = (await this.GetMappedDvarValueOrDefaultAsync<string>("mapname", infoResponse: infoResponse, token: Manager.CancellationToken)).Value;
+            var maxplayers = (await this.GetMappedDvarValueOrDefaultAsync<int>("sv_maxclients", infoResponse: infoResponse, token: Manager.CancellationToken)).Value;
+            var gametype = (await this.GetMappedDvarValueOrDefaultAsync<string>("g_gametype", "gametype", infoResponse, token: Manager.CancellationToken)).Value;
+            var basepath = await this.GetMappedDvarValueOrDefaultAsync<string>("fs_basepath", token: Manager.CancellationToken);
+            var basegame = await this.GetMappedDvarValueOrDefaultAsync<string>("fs_basegame", token: Manager.CancellationToken);
+            var homepath = await this.GetMappedDvarValueOrDefaultAsync<string>("fs_homepath", token: Manager.CancellationToken);
+            var game = await this.GetMappedDvarValueOrDefaultAsync<string>("fs_game", infoResponse: infoResponse, token: Manager.CancellationToken);
+            var logfile = await this.GetMappedDvarValueOrDefaultAsync<string>("g_log", token: Manager.CancellationToken);
+            var logsync = await this.GetMappedDvarValueOrDefaultAsync<int>("g_logsync", token: Manager.CancellationToken);
+            var ip = await this.GetMappedDvarValueOrDefaultAsync<string>("net_ip", token: Manager.CancellationToken);
+            var gamePassword = await this.GetMappedDvarValueOrDefaultAsync("g_password", overrideDefault: "", token: Manager.CancellationToken);
 
             if (Manager.GetApplicationSettings().Configuration().EnableCustomSayName)
             {
-                await this.SetDvarAsync("sv_sayname", Manager.GetApplicationSettings().Configuration().CustomSayName);
+                await this.SetDvarAsync("sv_sayname", Manager.GetApplicationSettings().Configuration().CustomSayName,
+                    Manager.CancellationToken);
             }
 
             try
             {
-                var website = await this.GetMappedDvarValueOrDefaultAsync<string>("_website");
+                var website = await this.GetMappedDvarValueOrDefaultAsync<string>("_website", token: Manager.CancellationToken);
 
                 // this occurs for games that don't give us anything back when
                 // the dvar is not set
@@ -1195,14 +1202,14 @@ namespace IW4MAdmin
 
                 if (logsync.Value == 0)
                 {
-                    await this.SetDvarAsync("g_logsync", 2); // set to 2 for continous in other games, clamps to 1 for IW4
+                    await this.SetDvarAsync("g_logsync", 2, Manager.CancellationToken); // set to 2 for continous in other games, clamps to 1 for IW4
                     needsRestart = true;
                 }
 
                 if (string.IsNullOrWhiteSpace(logfile.Value))
                 {
                     logfile.Value = "games_mp.log";
-                    await this.SetDvarAsync("g_log", logfile.Value);
+                    await this.SetDvarAsync("g_log", logfile.Value, Manager.CancellationToken);
                     needsRestart = true;
                 }
 
@@ -1214,7 +1221,7 @@ namespace IW4MAdmin
                 }
 
                 // this DVAR isn't set until the a map is loaded
-                await this.SetDvarAsync("logfile", 2);
+                await this.SetDvarAsync("logfile", 2, Manager.CancellationToken);
             }
 
             CustomCallback = await ScriptLoaded();
@@ -1439,7 +1446,6 @@ namespace IW4MAdmin
                 Offender = targetClient,
                 Offense = reason,
                 Punisher = originClient,
-                Link = targetClient.AliasLink,
                 IsEvadedOffense = isEvade
             };
 
@@ -1474,7 +1480,8 @@ namespace IW4MAdmin
 
             ServerLogger.LogDebug("Creating unban penalty for {targetClient}", targetClient.ToString());
             targetClient.SetLevel(Permission.User, originClient);
-            await Manager.GetPenaltyService().RemoveActivePenalties(targetClient.AliasLink.AliasLinkId);
+            await Manager.GetPenaltyService().RemoveActivePenalties(targetClient.AliasLink.AliasLinkId,
+                targetClient.NetworkId, targetClient.CurrentAlias?.IPAddress);
             await Manager.GetPenaltyService().Create(unbanPenalty);
         }
 

Application/Main.cs

@@ -18,6 +18,7 @@ using SharedLibraryCore.Repositories;
 using SharedLibraryCore.Services;
 using Stats.Dtos;
 using System;
+using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Text;
@@ -112,10 +113,11 @@ namespace IW4MAdmin.Application
                 var tasks = new[]
                 {
                     versionChecker.CheckVersion(),
-                    _serverManager.Init(),
                     _applicationTask
                 };
 
+                await _serverManager.Init();
+
                 await Task.WhenAll(tasks);
             }
 
@@ -138,11 +140,8 @@ namespace IW4MAdmin.Application
 
                 if (e is ConfigurationException configException)
                 {
-                    if (translationLookup != null)
-                    {
-                        Console.WriteLine(translationLookup[configException.Message]
-                            .FormatExt(configException.ConfigurationFileName));
-                    }
+                    Console.WriteLine("{{fileName}} contains an error."
+                        .FormatExt(Path.GetFileName(configException.ConfigurationFileName)));
 
                     foreach (var error in configException.Errors)
                     {
@@ -155,6 +154,8 @@ namespace IW4MAdmin.Application
                     Console.WriteLine(e.Message);
                 }
                 
+                _serverManager?.Stop();
+
                 Console.WriteLine(exitMessage);
                 await Console.In.ReadAsync(new char[1], 0, 1);
                 return;
@@ -311,9 +312,9 @@ namespace IW4MAdmin.Application
             }
 
             // register any script plugins
-            foreach (var func in pluginImporter.DiscoverScriptPlugins())
+            foreach (var plugin in pluginImporter.DiscoverScriptPlugins())
             {
-                serviceCollection.AddSingleton(sp => func(sp));
+                serviceCollection.AddSingleton(plugin);
             }
 
             // register any eventable types
@@ -418,6 +419,7 @@ namespace IW4MAdmin.Application
                     UpdatedAliasResourceQueryHelper>()
                 .AddSingleton<IResourceQueryHelper<ChatSearchQuery, MessageResponse>, ChatResourceQueryHelper>()
                 .AddSingleton<IResourceQueryHelper<ClientPaginationRequest, ConnectionHistoryResponse>, ConnectionsResourceQueryHelper>()
+                .AddSingleton<IResourceQueryHelper<ClientPaginationRequest, PermissionLevelChangedResponse>, PermissionLevelChangedResourceQueryHelper>()
                 .AddTransient<IParserPatternMatcher, ParserPatternMatcher>()
                 .AddSingleton<IRemoteAssemblyHandler, RemoteAssemblyHandler>()
                 .AddSingleton<IMasterCommunication, MasterCommunication>()

Application/Meta/MetaRegistration.cs

@@ -22,12 +22,16 @@ namespace IW4MAdmin.Application.Meta
         private readonly IResourceQueryHelper<ClientPaginationRequest, UpdatedAliasResponse> _updatedAliasHelper;
         private readonly IResourceQueryHelper<ClientPaginationRequest, ConnectionHistoryResponse>
             _connectionHistoryHelper;
+        private readonly IResourceQueryHelper<ClientPaginationRequest, PermissionLevelChangedResponse>
+            _permissionLevelHelper;
 
-        public MetaRegistration(ILogger<MetaRegistration> logger, IMetaService metaService, ITranslationLookup transLookup, IEntityService<EFClient> clientEntityService,
+        public MetaRegistration(ILogger<MetaRegistration> logger, IMetaService metaService,
+            ITranslationLookup transLookup, IEntityService<EFClient> clientEntityService,
             IResourceQueryHelper<ClientPaginationRequest, ReceivedPenaltyResponse> receivedPenaltyHelper,
             IResourceQueryHelper<ClientPaginationRequest, AdministeredPenaltyResponse> administeredPenaltyHelper,
             IResourceQueryHelper<ClientPaginationRequest, UpdatedAliasResponse> updatedAliasHelper,
-            IResourceQueryHelper<ClientPaginationRequest, ConnectionHistoryResponse> connectionHistoryHelper)
+            IResourceQueryHelper<ClientPaginationRequest, ConnectionHistoryResponse> connectionHistoryHelper,
+            IResourceQueryHelper<ClientPaginationRequest, PermissionLevelChangedResponse> permissionLevelHelper)
         {
             _logger = logger;
             _transLookup = transLookup;
@@ -37,6 +41,7 @@ namespace IW4MAdmin.Application.Meta
             _administeredPenaltyHelper = administeredPenaltyHelper;
             _updatedAliasHelper = updatedAliasHelper;
             _connectionHistoryHelper = connectionHistoryHelper;
+            _permissionLevelHelper = permissionLevelHelper;
         }
 
         public void Register()
@@ -46,6 +51,8 @@ namespace IW4MAdmin.Application.Meta
             _metaService.AddRuntimeMeta<ClientPaginationRequest, AdministeredPenaltyResponse>(MetaType.Penalized, GetAdministeredPenaltiesMeta);
             _metaService.AddRuntimeMeta<ClientPaginationRequest, UpdatedAliasResponse>(MetaType.AliasUpdate, GetUpdatedAliasMeta);
             _metaService.AddRuntimeMeta<ClientPaginationRequest, ConnectionHistoryResponse>(MetaType.ConnectionHistory, GetConnectionHistoryMeta);
+            _metaService.AddRuntimeMeta<ClientPaginationRequest, PermissionLevelChangedResponse>(
+                MetaType.PermissionLevel, GetPermissionLevelMeta);
         }
 
         private async Task<IEnumerable<InformationResponse>> GetProfileMeta(ClientPaginationRequest request)
@@ -174,5 +181,12 @@ namespace IW4MAdmin.Application.Meta
             var connections = await _connectionHistoryHelper.QueryResource(request);
             return connections.Results;
         }
+
+        private async Task<IEnumerable<PermissionLevelChangedResponse>> GetPermissionLevelMeta(
+            ClientPaginationRequest request)
+        {
+            var permissionChanges = await _permissionLevelHelper.QueryResource(request);
+            return permissionChanges.Results;
+        }
     }
 }

Application/Meta/PermissionLevelChangedResourceQueryHelper.cs

@@ -0,0 +1,51 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Data.Abstractions;
+using Data.Models;
+using Microsoft.EntityFrameworkCore;
+using SharedLibraryCore.Dtos.Meta.Responses;
+using SharedLibraryCore.Helpers;
+using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.QueryHelper;
+
+namespace IW4MAdmin.Application.Meta;
+
+public class
+    PermissionLevelChangedResourceQueryHelper : IResourceQueryHelper<ClientPaginationRequest,
+        PermissionLevelChangedResponse>
+{
+    private readonly IDatabaseContextFactory _contextFactory;
+
+    public PermissionLevelChangedResourceQueryHelper(IDatabaseContextFactory contextFactory)
+    {
+        _contextFactory = contextFactory;
+    }
+
+    public async Task<ResourceQueryHelperResult<PermissionLevelChangedResponse>> QueryResource(
+        ClientPaginationRequest query)
+    {
+        await using var context = _contextFactory.CreateContext();
+
+        var auditEntries = context.EFChangeHistory.Where(change => change.TargetEntityId == query.ClientId)
+            .Where(change => change.TypeOfChange == EFChangeHistory.ChangeType.Permission);
+
+        var audits = from change in auditEntries
+            join client in context.Clients
+                on change.OriginEntityId equals client.ClientId
+            select new PermissionLevelChangedResponse
+            {
+                ChangedById = change.OriginEntityId,
+                ChangedByName = client.CurrentAlias.Name,
+                PreviousPermissionLevelValue = change.PreviousValue,
+                CurrentPermissionLevelValue = change.CurrentValue,
+                When = change.TimeChanged,
+                ClientId = change.TargetEntityId,
+                IsSensitive = true
+            };
+
+        return new ResourceQueryHelperResult<PermissionLevelChangedResponse>
+        {
+            Results = await audits.Skip(query.Offset).Take(query.Count).ToListAsync()
+        };
+    }
+}

Application/Meta/ReceivedPenaltyResourceQueryHelper.cs

@@ -61,7 +61,7 @@ namespace IW4MAdmin.Application.Meta
 
                 iqIpLinkedPenalties = ctx.Penalties.AsNoTracking()
                     .Where(penalty =>
-                        linkedPenaltyType.Contains(penalty.Type) && aliasedIds.Contains(penalty.LinkId));
+                        linkedPenaltyType.Contains(penalty.Type) && aliasedIds.Contains(penalty.LinkId ?? -1));
             }
 
             var iqAllPenalties = iqPenalties;

Application/Migration/ConfigurationMigration.cs

@@ -88,7 +88,7 @@ namespace IW4MAdmin.Application.Migration
 
         public static void RemoveObsoletePlugins20210322()
         {
-            var files = new[] {"StatsWeb.dll", "StatsWeb.Views.dll"};
+            var files = new[] {"StatsWeb.dll", "StatsWeb.Views.dll", "IW4ScriptCommands.dll"};
 
             foreach (var file in files)
             {

Application/Misc/BaseConfigurationHandler.cs

@@ -27,6 +27,7 @@ namespace IW4MAdmin.Application.Misc
             _serializerOptions = new JsonSerializerOptions
             {
                 WriteIndented = true,
+                Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping
             };
             _serializerOptions.Converters.Add(new JsonStringEnumConverter());
             _onSaving = new SemaphoreSlim(1, 1);
@@ -59,7 +60,7 @@ namespace IW4MAdmin.Application.Misc
 
             catch (Exception e)
             {
-                throw new ConfigurationException("MANAGER_CONFIGURATION_ERROR")
+                throw new ConfigurationException("Could not load configuration")
                 {
                     Errors = new[] { e.Message },
                     ConfigurationFileName = FileName

Application/Misc/MetaService.cs

@@ -68,6 +68,29 @@ namespace IW4MAdmin.Application.Misc
             await ctx.SaveChangesAsync();
         }
 
+        public async Task SetPersistentMeta(string metaKey, string metaValue, int clientId)
+        {
+            await AddPersistentMeta(metaKey, metaValue, new EFClient { ClientId = clientId });
+        }
+
+        public async Task IncrementPersistentMeta(string metaKey, int incrementAmount, int clientId)
+        {
+            var existingMeta = await GetPersistentMeta(metaKey, new EFClient { ClientId = clientId });
+            
+            if (!long.TryParse(existingMeta?.Value ?? "0", out var existingValue))
+            {
+                existingValue = 0;
+            }
+
+            var newValue = existingValue + incrementAmount;
+            await SetPersistentMeta(metaKey, newValue.ToString(), clientId);
+        }
+
+        public async Task DecrementPersistentMeta(string metaKey, int decrementAmount, int clientId)
+        {
+            await IncrementPersistentMeta(metaKey, -decrementAmount, clientId);
+        }
+
         public async Task AddPersistentMeta(string metaKey, string metaValue)
         {
             await using var ctx = _contextFactory.CreateContext();

Application/Misc/PluginImporter.cs

@@ -38,13 +38,13 @@ namespace IW4MAdmin.Application.Misc
         /// discovers all the script plugins in the plugins dir
         /// </summary>
         /// <returns></returns>
-        public IEnumerable<Func<IServiceProvider, IPlugin>> DiscoverScriptPlugins()
+        public IEnumerable<IPlugin> DiscoverScriptPlugins()
         {
             var pluginDir = $"{Utilities.OperatingDirectory}{PLUGIN_DIR}{Path.DirectorySeparatorChar}";
 
             if (!Directory.Exists(pluginDir))
             {
-                return Enumerable.Empty<Func<IServiceProvider, IPlugin>>();
+                return Enumerable.Empty<IPlugin>();
             }
 
             var scriptPluginFiles =
@@ -52,11 +52,10 @@ namespace IW4MAdmin.Application.Misc
 
             _logger.LogDebug("Discovered {count} potential script plugins", scriptPluginFiles.Count);
 
-            return scriptPluginFiles.Select<string, Func<IServiceProvider, IPlugin>>(fileName => serviceProvider =>
+            return scriptPluginFiles.Select(fileName =>
             {
                 _logger.LogDebug("Discovered script plugin {fileName}", fileName);
-                return new ScriptPlugin(_logger,
-                    serviceProvider.GetRequiredService<IScriptPluginTimerHelper>(), fileName);
+                return new ScriptPlugin(_logger, fileName);
             }).ToList();
         }
 

Application/Misc/ScriptPlugin.cs

@@ -45,9 +45,8 @@ namespace IW4MAdmin.Application.Misc
         private bool _successfullyLoaded;
         private readonly List<string> _registeredCommandNames;
         private readonly ILogger _logger;
-        private readonly IScriptPluginTimerHelper _timerHelper;
 
-        public ScriptPlugin(ILogger logger, IScriptPluginTimerHelper timerHelper, string filename, string workingDirectory = null)
+        public ScriptPlugin(ILogger logger, string filename, string workingDirectory = null)
         {
             _logger = logger;
             _fileName = filename;
@@ -60,8 +59,6 @@ namespace IW4MAdmin.Application.Misc
 
             Watcher.EnableRaisingEvents = true;
             _registeredCommandNames = new List<string>();
-            _timerHelper = timerHelper;
-            _timerHelper.SetDependency(_onProcessing);
         }
 
         ~ScriptPlugin()
@@ -127,6 +124,7 @@ namespace IW4MAdmin.Application.Misc
                 _scriptEngine.Execute(script);
                 _scriptEngine.SetValue("_localization", Utilities.CurrentLocalization);
                 _scriptEngine.SetValue("_serviceResolver", serviceResolver);
+                _scriptEngine.SetValue("_lock", _onProcessing);
                 dynamic pluginObject = _scriptEngine.Evaluate("plugin").ToObject();
 
                 Author = pluginObject.author;
@@ -225,47 +223,49 @@ namespace IW4MAdmin.Application.Misc
 
         public async Task OnEventAsync(GameEvent gameEvent, Server server)
         {
-            if (_successfullyLoaded)
+            if (!_successfullyLoaded)
             {
-                try
+                return;
+            }
+
+            try
+            {
+                await _onProcessing.WaitAsync();
+                _scriptEngine.SetValue("_gameEvent", gameEvent);
+                _scriptEngine.SetValue("_server", server);
+                _scriptEngine.SetValue("_IW4MAdminClient", Utilities.IW4MAdminClient(server));
+                _scriptEngine.Evaluate("plugin.onEventAsync(_gameEvent, _server)");
+            }
+
+            catch (JavaScriptException ex)
+            {
+                using (LogContext.PushProperty("Server", server.ToString()))
                 {
-                    await _onProcessing.WaitAsync();
-                    _scriptEngine.SetValue("_gameEvent", gameEvent);
-                    _scriptEngine.SetValue("_server", server);
-                    _scriptEngine.SetValue("_IW4MAdminClient", Utilities.IW4MAdminClient(server));
-                    _scriptEngine.Evaluate("plugin.onEventAsync(_gameEvent, _server)");
+                    _logger.LogError(ex,
+                        "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} with event type {EventType} {@LocationInfo}",
+                        nameof(OnEventAsync), Path.GetFileName(_fileName), gameEvent.Type, ex.Location);
                 }
 
-                catch (JavaScriptException ex)
-                {
-                    using (LogContext.PushProperty("Server", server.ToString()))
-                    {
-                        _logger.LogError(ex,
-                            "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} with event type {EventType} {@LocationInfo}",
-                            nameof(OnEventAsync), Path.GetFileName(_fileName), gameEvent.Type, ex.Location);
-                    }
+                throw new PluginException("An error occured while executing action for script plugin");
+            }
 
-                    throw new PluginException("An error occured while executing action for script plugin");
+            catch (Exception ex)
+            {
+                using (LogContext.PushProperty("Server", server.ToString()))
+                {
+                    _logger.LogError(ex,
+                        "Encountered error while running {MethodName} for script plugin {Plugin} with event type {EventType}",
+                        nameof(OnEventAsync), _fileName, gameEvent.Type);
                 }
 
-                catch (Exception ex)
-                {
-                    using (LogContext.PushProperty("Server", server.ToString()))
-                    {
-                        _logger.LogError(ex,
-                            "Encountered error while running {MethodName} for script plugin {Plugin} with event type {EventType}",
-                            nameof(OnEventAsync), _fileName, gameEvent.Type);
-                    }
+                throw new PluginException("An error occured while executing action for script plugin");
+            }
 
-                    throw new PluginException("An error occured while executing action for script plugin");
-                }
-
-                finally
+            finally
+            {
+                if (_onProcessing.CurrentCount == 0)
                 {
-                    if (_onProcessing.CurrentCount == 0)
-                    {
-                        _onProcessing.Release(1);
-                    }
+                    _onProcessing.Release(1);
                 }
             }
         }
@@ -276,7 +276,6 @@ namespace IW4MAdmin.Application.Misc
             {
                 _logger.LogDebug("OnLoad executing for {Name}", Name);
                 _scriptEngine.SetValue("_manager", manager);
-                _scriptEngine.SetValue("_timerHelper", _timerHelper);
                 _scriptEngine.Evaluate("plugin.onLoadAsync(_manager)");
 
                 return Task.CompletedTask;

Application/Misc/ScriptPluginTimerHelper.cs

@@ -120,7 +120,7 @@ public class ScriptPluginTimerHelper : IScriptPluginTimerHelper
         {
             if (!_onRunningTick.IsSet)
             {
-                _logger.LogWarning("Previous {OnTick} is still running, so we are skipping this one",
+                _logger.LogDebug("Previous {OnTick} is still running, so we are skipping this one",
                     nameof(OnTick));
                 return;
             }
@@ -129,7 +129,9 @@ public class ScriptPluginTimerHelper : IScriptPluginTimerHelper
 
             // the js engine is not thread safe so we need to ensure we're not executing OnTick and OnEventAsync simultaneously
             _onDependentAction?.WaitAsync().Wait();
+            var start = DateTime.Now;
             _jsAction.DynamicInvoke(JsValue.Undefined, new[] { JsValue.Undefined });
+            _logger.LogDebug("OnTick took {Time}ms", (DateTime.Now - start).TotalMilliseconds);
             ReleaseThreads();
         }
 

Application/RConParsers/BaseRConParser.cs

@@ -7,6 +7,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
+using System.Threading;
 using System.Threading.Tasks;
 using Data.Models;
 using Microsoft.Extensions.Logging;
@@ -77,19 +78,19 @@ namespace IW4MAdmin.Application.RConParsers
         public string RConEngine { get; set; } = "COD";
         public bool IsOneLog { get; set; }
 
-        public async Task<string[]> ExecuteCommandAsync(IRConConnection connection, string command)
+        public async Task<string[]> ExecuteCommandAsync(IRConConnection connection, string command, CancellationToken token = default)
         {
-            var response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND, command);
+            var response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND, command, token);
             return response.Where(item => item != Configuration.CommandPrefixes.RConResponse).ToArray();
         }
 
-        public async Task<Dvar<T>> GetDvarAsync<T>(IRConConnection connection, string dvarName, T fallbackValue = default)
+        public async Task<Dvar<T>> GetDvarAsync<T>(IRConConnection connection, string dvarName, T fallbackValue = default, CancellationToken token = default)
         {
             string[] lineSplit;
 
             try
             {
-                lineSplit = await connection.SendQueryAsync(StaticHelpers.QueryType.GET_DVAR, dvarName);
+                lineSplit = await connection.SendQueryAsync(StaticHelpers.QueryType.GET_DVAR, dvarName, token);
             }
             catch
             {
@@ -98,10 +99,10 @@ namespace IW4MAdmin.Application.RConParsers
                     throw;
                 }
 
-                lineSplit = new string[0];
+                lineSplit = Array.Empty<string>();
             }
 
-            string response = string.Join('\n', lineSplit).TrimEnd('\0');
+            var response = string.Join('\n', lineSplit).TrimEnd('\0');
             var match = Regex.Match(response, Configuration.Dvar.Pattern);
 
             if (response.Contains("Unknown command") ||
@@ -109,7 +110,7 @@ namespace IW4MAdmin.Application.RConParsers
             {
                 if (fallbackValue != null)
                 {
-                    return new Dvar<T>()
+                    return new Dvar<T>
                     {
                         Name = dvarName,
                         Value = fallbackValue
@@ -119,17 +120,17 @@ namespace IW4MAdmin.Application.RConParsers
                 throw new DvarException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_DVAR"].FormatExt(dvarName));
             }
 
-            string value = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarValue]].Value;
-            string defaultValue = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarDefaultValue]].Value;
-            string latchedValue = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarLatchedValue]].Value;
+            var value = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarValue]].Value;
+            var defaultValue = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarDefaultValue]].Value;
+            var latchedValue = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarLatchedValue]].Value;
 
-            string removeTrailingColorCode(string input) => Regex.Replace(input, @"\^7$", "");
+            string RemoveTrailingColorCode(string input) => Regex.Replace(input, @"\^7$", "");
 
-            value = removeTrailingColorCode(value);
-            defaultValue = removeTrailingColorCode(defaultValue);
-            latchedValue = removeTrailingColorCode(latchedValue);
+            value = RemoveTrailingColorCode(value);
+            defaultValue = RemoveTrailingColorCode(defaultValue);
+            latchedValue = RemoveTrailingColorCode(latchedValue);
 
-            return new Dvar<T>()
+            return new Dvar<T>
             {
                 Name = dvarName,
                 Value = string.IsNullOrEmpty(value) ? default : (T)Convert.ChangeType(value, typeof(T)),
@@ -139,10 +140,12 @@ namespace IW4MAdmin.Application.RConParsers
             };
         }
 
-        public virtual async Task<IStatusResponse> GetStatusAsync(IRConConnection connection)
+        public virtual async Task<IStatusResponse> GetStatusAsync(IRConConnection connection, CancellationToken token = default)
         {
-            var response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND_STATUS);
-            _logger.LogDebug("Status Response {response}", string.Join(Environment.NewLine, response));
+            var response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND_STATUS, "status", token);
+            
+            _logger.LogDebug("Status Response {Response}", string.Join(Environment.NewLine, response));
+            
             return new StatusResponse
             {
                 Clients = ClientsFromStatus(response).ToArray(),
@@ -183,13 +186,13 @@ namespace IW4MAdmin.Application.RConParsers
             return (T)Convert.ChangeType(value, typeof(T));
         }
 
-        public async Task<bool> SetDvarAsync(IRConConnection connection, string dvarName, object dvarValue)
+        public async Task<bool> SetDvarAsync(IRConConnection connection, string dvarName, object dvarValue, CancellationToken token = default)
         {
-            string dvarString = (dvarValue is string str)
+            var dvarString = (dvarValue is string str)
                 ? $"{dvarName} \"{str}\""
                 : $"{dvarName} {dvarValue}";
 
-            return (await connection.SendQueryAsync(StaticHelpers.QueryType.SET_DVAR, dvarString)).Length > 0;
+            return (await connection.SendQueryAsync(StaticHelpers.QueryType.SET_DVAR, dvarString, token)).Length > 0;
         }
 
         private List<EFClient> ClientsFromStatus(string[] Status)

Application/RConParsers/DynamicRConParserConfiguration.cs

@@ -31,6 +31,7 @@ namespace IW4MAdmin.Application.RConParsers
         public string NoticeLineSeparator { get; set; } = Environment.NewLine;
         public int? DefaultRConPort { get; set; }
         public string DefaultInstallationDirectoryHint { get; set; }
+        public short FloodProtectInterval { get; set; } = 750;
 
         public ColorCodeMapping ColorCodeMapping { get; set; } = new ColorCodeMapping
         {

Data/Context/DatabaseContext.cs

@@ -18,6 +18,7 @@ namespace Data.Context
         public DbSet<EFAlias> Aliases { get; set; }
         public DbSet<EFAliasLink> AliasLinks { get; set; }
         public DbSet<EFPenalty> Penalties { get; set; }
+        public DbSet<EFPenaltyIdentifier> PenaltyIdentifiers { get; set; }
         public DbSet<EFMeta> EFMeta { get; set; }
         public DbSet<EFChangeHistory> EFChangeHistory { get; set; }
 
@@ -130,6 +131,12 @@ namespace Data.Context
                     .OnDelete(DeleteBehavior.SetNull);
             });
 
+            modelBuilder.Entity<EFPenaltyIdentifier>(ent =>
+            {
+                ent.HasIndex(identifiers => identifiers.NetworkId);
+                ent.HasIndex(identifiers => identifiers.IPv4Address);
+            });
+
             modelBuilder.Entity<EFClientConnectionHistory>(ent => ent.HasIndex(history => history.CreatedDateTime));
 
             // force full name for database conversion
@@ -137,6 +144,7 @@ namespace Data.Context
             modelBuilder.Entity<EFAlias>().ToTable("EFAlias");
             modelBuilder.Entity<EFAliasLink>().ToTable("EFAliasLinks");
             modelBuilder.Entity<EFPenalty>().ToTable("EFPenalties");
+            modelBuilder.Entity<EFPenaltyIdentifier>().ToTable("EFPenaltyIdentifiers");
             modelBuilder.Entity<EFServerSnapshot>().ToTable(nameof(EFServerSnapshot));
             modelBuilder.Entity<EFClientConnectionHistory>().ToTable(nameof(EFClientConnectionHistory));
 

Data/MigrationContext/MySqlDatabaseContext.cs

@@ -24,7 +24,8 @@ namespace Data.MigrationContext
         {
             if (MigrationExtensions.IsMigration)
             {
-                optionsBuilder.UseMySql(ServerVersion.AutoDetect("Server=127.0.0.1;Database=IW4MAdmin_Migration;Uid=root;Pwd=password;"))
+                var connectionString = "Server=127.0.0.1;Database=IW4MAdmin_Migration;Uid=root;Pwd=password;";
+                optionsBuilder.UseMySql(connectionString, ServerVersion.AutoDetect(connectionString))
                     .EnableDetailedErrors()
                     .EnableSensitiveDataLogging();
             }

Data/MigrationContext/PostgresqlDatabaseContext.cs

@@ -23,6 +23,7 @@ namespace Data.MigrationContext
         {
             if (MigrationExtensions.IsMigration)
             {
+                AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
                 optionsBuilder.UseNpgsql(
                         "Host=127.0.0.1;Database=IW4MAdmin_Migration;Username=postgres;Password=password;",
                         options => options.SetPostgresVersion(new Version("12.9")))

Data/Migrations/MySql/20220222215149_AddEFPenaltyIdentifier.cs

@@ -0,0 +1,250 @@
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.MySql
+{
+    public partial class AddEFPenaltyIdentifier : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "EFPenaltyIdentifiers",
+                columns: table => new
+                {
+                    PenaltyIdentifierId = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+                    IPv4Address = table.Column<int>(type: "int", nullable: true),
+                    NetworkId = table.Column<long>(type: "bigint", nullable: false),
+                    PenaltyId = table.Column<int>(type: "int", nullable: false),
+                    Active = table.Column<bool>(type: "tinyint(1)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_EFPenaltyIdentifiers", x => x.PenaltyIdentifierId);
+                    table.ForeignKey(
+                        name: "FK_EFPenaltyIdentifiers_EFPenalties_PenaltyId",
+                        column: x => x.PenaltyId,
+                        principalTable: "EFPenalties",
+                        principalColumn: "PenaltyId",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFPenaltyIdentifiers_IPv4Address",
+                table: "EFPenaltyIdentifiers",
+                column: "IPv4Address");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFPenaltyIdentifiers_NetworkId",
+                table: "EFPenaltyIdentifiers",
+                column: "NetworkId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFPenaltyIdentifiers_PenaltyId",
+                table: "EFPenaltyIdentifiers",
+                column: "PenaltyId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "EFPenaltyIdentifiers");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Message",
+                table: "InboxMessages",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Name",
+                table: "EFWeaponAttachments",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "longtext")
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "HostName",
+                table: "EFServers",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "EndPoint",
+                table: "EFServers",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Offense",
+                table: "EFPenalties",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "longtext")
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "AutomatedOffense",
+                table: "EFPenalties",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Value",
+                table: "EFMeta",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "longtext")
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Extra",
+                table: "EFMeta",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Name",
+                table: "EFMeansOfDeath",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "longtext")
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Name",
+                table: "EFMaps",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "longtext")
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "PasswordSalt",
+                table: "EFClients",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Password",
+                table: "EFClients",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Message",
+                table: "EFClientMessages",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "WeaponReference",
+                table: "EFClientKills",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "PreviousValue",
+                table: "EFChangeHistory",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "CurrentValue",
+                table: "EFChangeHistory",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "WeaponReference",
+                table: "EFACSnapshot",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "HitLocationReference",
+                table: "EFACSnapshot",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+        }
+    }
+}

Data/Migrations/MySql/20220222230049_MakeEFPenaltyLinkIdNullable.cs

@@ -0,0 +1,56 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.MySql
+{
+    public partial class MakeEFPenaltyLinkIdNullable : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_EFPenalties_EFAliasLinks_LinkId",
+                table: "EFPenalties");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "LinkId",
+                table: "EFPenalties",
+                type: "int",
+                nullable: true,
+                oldClrType: typeof(int),
+                oldType: "int");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_EFPenalties_EFAliasLinks_LinkId",
+                table: "EFPenalties",
+                column: "LinkId",
+                principalTable: "EFAliasLinks",
+                principalColumn: "AliasLinkId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_EFPenalties_EFAliasLinks_LinkId",
+                table: "EFPenalties");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "LinkId",
+                table: "EFPenalties",
+                type: "int",
+                nullable: false,
+                defaultValue: 0,
+                oldClrType: typeof(int),
+                oldType: "int",
+                oldNullable: true);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_EFPenalties_EFAliasLinks_LinkId",
+                table: "EFPenalties",
+                column: "LinkId",
+                principalTable: "EFAliasLinks",
+                principalColumn: "AliasLinkId",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

Data/Migrations/MySql/20220223150028_AddAuditFieldsToEFPenaltyIdentifier.cs

@@ -0,0 +1,48 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.MySql
+{
+    public partial class AddAuditFieldsToEFPenaltyIdentifier : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Active",
+                table: "EFPenaltyIdentifiers");
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "CreatedDateTime",
+                table: "EFPenaltyIdentifiers",
+                type: "datetime(6)",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "UpdatedDateTime",
+                table: "EFPenaltyIdentifiers",
+                type: "datetime(6)",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "CreatedDateTime",
+                table: "EFPenaltyIdentifiers");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedDateTime",
+                table: "EFPenaltyIdentifiers");
+
+            migrationBuilder.AddColumn<bool>(
+                name: "Active",
+                table: "EFPenaltyIdentifiers",
+                type: "tinyint(1)",
+                nullable: false,
+                defaultValue: false);
+        }
+    }
+}

Data/Migrations/MySql/MySqlDatabaseContextModelSnapshot.cs

@@ -5,6 +5,8 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
+#nullable disable
+
 namespace Data.Migrations.MySql
 {
     [DbContext(typeof(MySqlDatabaseContext))]
@@ -14,7 +16,7 @@ namespace Data.Migrations.MySql
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "3.1.10")
+                .HasAnnotation("ProductVersion", "6.0.1")
                 .HasAnnotation("Relational:MaxIdentifierLength", 64);
 
             modelBuilder.Entity("Data.Models.Client.EFACSnapshotVector3", b =>
@@ -38,7 +40,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("Vector3Id");
 
-                    b.ToTable("EFACSnapshotVector3");
+                    b.ToTable("EFACSnapshotVector3", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClient", b =>
@@ -75,10 +77,10 @@ namespace Data.Migrations.MySql
                         .HasColumnType("bigint");
 
                     b.Property<string>("Password")
-                        .HasColumnType("longtext CHARACTER SET utf8mb4");
+                        .HasColumnType("longtext");
 
                     b.Property<string>("PasswordSalt")
-                        .HasColumnType("longtext CHARACTER SET utf8mb4");
+                        .HasColumnType("longtext");
 
                     b.Property<int>("TotalConnectionTime")
                         .HasColumnType("int");
@@ -92,7 +94,7 @@ namespace Data.Migrations.MySql
                     b.HasIndex("NetworkId")
                         .IsUnique();
 
-                    b.ToTable("EFClients");
+                    b.ToTable("EFClients", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientConnectionHistory", b =>
@@ -124,7 +126,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFClientConnectionHistory");
+                    b.ToTable("EFClientConnectionHistory", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientKill", b =>
@@ -179,7 +181,7 @@ namespace Data.Migrations.MySql
                         .HasColumnType("int");
 
                     b.Property<string>("WeaponReference")
-                        .HasColumnType("longtext CHARACTER SET utf8mb4");
+                        .HasColumnType("longtext");
 
                     b.Property<DateTime>("When")
                         .HasColumnType("datetime(6)");
@@ -198,7 +200,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ViewAnglesVector3Id");
 
-                    b.ToTable("EFClientKills");
+                    b.ToTable("EFClientKills", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientMessage", b =>
@@ -214,7 +216,7 @@ namespace Data.Migrations.MySql
                         .HasColumnType("int");
 
                     b.Property<string>("Message")
-                        .HasColumnType("longtext CHARACTER SET utf8mb4");
+                        .HasColumnType("longtext");
 
                     b.Property<bool>("SentIngame")
                         .HasColumnType("tinyint(1)");
@@ -233,7 +235,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("TimeSent");
 
-                    b.ToTable("EFClientMessages");
+                    b.ToTable("EFClientMessages", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFACSnapshot", b =>
@@ -273,7 +275,7 @@ namespace Data.Migrations.MySql
                         .HasColumnType("int");
 
                     b.Property<string>("HitLocationReference")
-                        .HasColumnType("longtext CHARACTER SET utf8mb4");
+                        .HasColumnType("longtext");
 
                     b.Property<int>("HitOriginId")
                         .HasColumnType("int");
@@ -321,7 +323,7 @@ namespace Data.Migrations.MySql
                         .HasColumnType("int");
 
                     b.Property<string>("WeaponReference")
-                        .HasColumnType("longtext CHARACTER SET utf8mb4");
+                        .HasColumnType("longtext");
 
                     b.Property<DateTime>("When")
                         .HasColumnType("datetime(6)");
@@ -340,7 +342,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFACSnapshot");
+                    b.ToTable("EFACSnapshot", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientHitStatistic", b =>
@@ -414,7 +416,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("WeaponId");
 
-                    b.ToTable("EFClientHitStatistics");
+                    b.ToTable("EFClientHitStatistics", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientRankingHistory", b =>
@@ -459,7 +461,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ZScore");
 
-                    b.ToTable("EFClientRankingHistory");
+                    b.ToTable("EFClientRankingHistory", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientRatingHistory", b =>
@@ -478,7 +480,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ClientId");
 
-                    b.ToTable("EFClientRatingHistory");
+                    b.ToTable("EFClientRatingHistory", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientStatistics", b =>
@@ -536,7 +538,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ClientId", "TimePlayed", "ZScore");
 
-                    b.ToTable("EFClientStatistics");
+                    b.ToTable("EFClientStatistics", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFHitLocationCount", b =>
@@ -549,12 +551,12 @@ namespace Data.Migrations.MySql
                         .HasColumnType("tinyint(1)");
 
                     b.Property<int>("EFClientStatisticsClientId")
-                        .HasColumnName("EFClientStatisticsClientId")
-                        .HasColumnType("int");
+                        .HasColumnType("int")
+                        .HasColumnName("EFClientStatisticsClientId");
 
                     b.Property<long>("EFClientStatisticsServerId")
-                        .HasColumnName("EFClientStatisticsServerId")
-                        .HasColumnType("bigint");
+                        .HasColumnType("bigint")
+                        .HasColumnName("EFClientStatisticsServerId");
 
                     b.Property<int>("HitCount")
                         .HasColumnType("int");
@@ -574,7 +576,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("EFClientStatisticsClientId", "EFClientStatisticsServerId");
 
-                    b.ToTable("EFHitLocationCounts");
+                    b.ToTable("EFHitLocationCounts", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFRating", b =>
@@ -617,7 +619,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("When", "ServerId", "Performance", "ActivityAmount");
 
-                    b.ToTable("EFRating");
+                    b.ToTable("EFRating", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFHitLocation", b =>
@@ -634,7 +636,7 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasColumnType("varchar(255) CHARACTER SET utf8mb4");
+                        .HasColumnType("varchar(255)");
 
                     b.Property<DateTime?>("UpdatedDateTime")
                         .HasColumnType("datetime(6)");
@@ -643,7 +645,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("Name");
 
-                    b.ToTable("EFHitLocations");
+                    b.ToTable("EFHitLocations", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFMap", b =>
@@ -660,14 +662,14 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasColumnType("longtext CHARACTER SET utf8mb4");
+                        .HasColumnType("longtext");
 
                     b.Property<DateTime?>("UpdatedDateTime")
                         .HasColumnType("datetime(6)");
 
                     b.HasKey("MapId");
 
-                    b.ToTable("EFMaps");
+                    b.ToTable("EFMaps", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFMeansOfDeath", b =>
@@ -684,14 +686,14 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasColumnType("longtext CHARACTER SET utf8mb4");
+                        .HasColumnType("longtext");
 
                     b.Property<DateTime?>("UpdatedDateTime")
                         .HasColumnType("datetime(6)");
 
                     b.HasKey("MeansOfDeathId");
 
-                    b.ToTable("EFMeansOfDeath");
+                    b.ToTable("EFMeansOfDeath", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFWeapon", b =>
@@ -708,7 +710,7 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasColumnType("varchar(255) CHARACTER SET utf8mb4");
+                        .HasColumnType("varchar(255)");
 
                     b.Property<DateTime?>("UpdatedDateTime")
                         .HasColumnType("datetime(6)");
@@ -717,7 +719,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("Name");
 
-                    b.ToTable("EFWeapons");
+                    b.ToTable("EFWeapons", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFWeaponAttachment", b =>
@@ -734,14 +736,14 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasColumnType("longtext CHARACTER SET utf8mb4");
+                        .HasColumnType("longtext");
 
                     b.Property<DateTime?>("UpdatedDateTime")
                         .HasColumnType("datetime(6)");
 
                     b.HasKey("WeaponAttachmentId");
 
-                    b.ToTable("EFWeaponAttachments");
+                    b.ToTable("EFWeaponAttachments", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFWeaponAttachmentCombo", b =>
@@ -776,7 +778,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("Attachment3Id");
 
-                    b.ToTable("EFWeaponAttachmentCombos");
+                    b.ToTable("EFWeaponAttachmentCombos", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.EFAlias", b =>
@@ -799,12 +801,12 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasColumnType("varchar(24) CHARACTER SET utf8mb4")
-                        .HasMaxLength(24);
+                        .HasMaxLength(24)
+                        .HasColumnType("varchar(24)");
 
                     b.Property<string>("SearchableName")
-                        .HasColumnType("varchar(24) CHARACTER SET utf8mb4")
-                        .HasMaxLength(24);
+                        .HasMaxLength(24)
+                        .HasColumnType("varchar(24)");
 
                     b.HasKey("AliasId");
 
@@ -818,7 +820,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("Name", "IPAddress");
 
-                    b.ToTable("EFAlias");
+                    b.ToTable("EFAlias", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.EFAliasLink", b =>
@@ -832,7 +834,7 @@ namespace Data.Migrations.MySql
 
                     b.HasKey("AliasLinkId");
 
-                    b.ToTable("EFAliasLinks");
+                    b.ToTable("EFAliasLinks", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.EFChangeHistory", b =>
@@ -845,11 +847,11 @@ namespace Data.Migrations.MySql
                         .HasColumnType("tinyint(1)");
 
                     b.Property<string>("Comment")
-                        .HasColumnType("varchar(128) CHARACTER SET utf8mb4")
-                        .HasMaxLength(128);
+                        .HasMaxLength(128)
+                        .HasColumnType("varchar(128)");
 
                     b.Property<string>("CurrentValue")
-                        .HasColumnType("longtext CHARACTER SET utf8mb4");
+                        .HasColumnType("longtext");
 
                     b.Property<int?>("ImpersonationEntityId")
                         .HasColumnType("int");
@@ -858,7 +860,7 @@ namespace Data.Migrations.MySql
                         .HasColumnType("int");
 
                     b.Property<string>("PreviousValue")
-                        .HasColumnType("longtext CHARACTER SET utf8mb4");
+                        .HasColumnType("longtext");
 
                     b.Property<int>("TargetEntityId")
                         .HasColumnType("int");
@@ -890,12 +892,12 @@ namespace Data.Migrations.MySql
                         .HasColumnType("datetime(6)");
 
                     b.Property<string>("Extra")
-                        .HasColumnType("longtext CHARACTER SET utf8mb4");
+                        .HasColumnType("longtext");
 
                     b.Property<string>("Key")
                         .IsRequired()
-                        .HasColumnType("varchar(32) CHARACTER SET utf8mb4")
-                        .HasMaxLength(32);
+                        .HasMaxLength(32)
+                        .HasColumnType("varchar(32)");
 
                     b.Property<int?>("LinkedMetaId")
                         .HasColumnType("int");
@@ -905,7 +907,7 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("Value")
                         .IsRequired()
-                        .HasColumnType("longtext CHARACTER SET utf8mb4");
+                        .HasColumnType("longtext");
 
                     b.HasKey("MetaId");
 
@@ -928,7 +930,7 @@ namespace Data.Migrations.MySql
                         .HasColumnType("tinyint(1)");
 
                     b.Property<string>("AutomatedOffense")
-                        .HasColumnType("longtext CHARACTER SET utf8mb4");
+                        .HasColumnType("longtext");
 
                     b.Property<DateTime?>("Expires")
                         .HasColumnType("datetime(6)");
@@ -936,7 +938,7 @@ namespace Data.Migrations.MySql
                     b.Property<bool>("IsEvadedOffense")
                         .HasColumnType("tinyint(1)");
 
-                    b.Property<int>("LinkId")
+                    b.Property<int?>("LinkId")
                         .HasColumnType("int");
 
                     b.Property<int>("OffenderId")
@@ -944,7 +946,7 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("Offense")
                         .IsRequired()
-                        .HasColumnType("longtext CHARACTER SET utf8mb4");
+                        .HasColumnType("longtext");
 
                     b.Property<int>("PunisherId")
                         .HasColumnType("int");
@@ -963,7 +965,39 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("PunisherId");
 
-                    b.ToTable("EFPenalties");
+                    b.ToTable("EFPenalties", (string)null);
+                });
+
+            modelBuilder.Entity("Data.Models.EFPenaltyIdentifier", b =>
+                {
+                    b.Property<int>("PenaltyIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("CreatedDateTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int?>("IPv4Address")
+                        .HasColumnType("int");
+
+                    b.Property<long>("NetworkId")
+                        .HasColumnType("bigint");
+
+                    b.Property<int>("PenaltyId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("UpdatedDateTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("PenaltyIdentifierId");
+
+                    b.HasIndex("IPv4Address");
+
+                    b.HasIndex("NetworkId");
+
+                    b.HasIndex("PenaltyId");
+
+                    b.ToTable("EFPenaltyIdentifiers", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Misc.EFInboxMessage", b =>
@@ -982,7 +1016,7 @@ namespace Data.Migrations.MySql
                         .HasColumnType("tinyint(1)");
 
                     b.Property<string>("Message")
-                        .HasColumnType("longtext CHARACTER SET utf8mb4");
+                        .HasColumnType("longtext");
 
                     b.Property<long?>("ServerId")
                         .HasColumnType("bigint");
@@ -1013,13 +1047,13 @@ namespace Data.Migrations.MySql
                         .HasColumnType("tinyint(1)");
 
                     b.Property<string>("EndPoint")
-                        .HasColumnType("longtext CHARACTER SET utf8mb4");
+                        .HasColumnType("longtext");
 
                     b.Property<int?>("GameName")
                         .HasColumnType("int");
 
                     b.Property<string>("HostName")
-                        .HasColumnType("longtext CHARACTER SET utf8mb4");
+                        .HasColumnType("longtext");
 
                     b.Property<bool>("IsPasswordProtected")
                         .HasColumnType("tinyint(1)");
@@ -1029,7 +1063,7 @@ namespace Data.Migrations.MySql
 
                     b.HasKey("ServerId");
 
-                    b.ToTable("EFServers");
+                    b.ToTable("EFServers", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerSnapshot", b =>
@@ -1062,7 +1096,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFServerSnapshot");
+                    b.ToTable("EFServerSnapshot", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerStatistics", b =>
@@ -1087,7 +1121,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFServerStatistics");
+                    b.ToTable("EFServerStatistics", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Vector3", b =>
@@ -1107,7 +1141,7 @@ namespace Data.Migrations.MySql
 
                     b.HasKey("Vector3Id");
 
-                    b.ToTable("Vector3");
+                    b.ToTable("Vector3", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFACSnapshotVector3", b =>
@@ -1123,6 +1157,10 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("Vector3Id")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Snapshot");
+
+                    b.Navigation("Vector");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClient", b =>
@@ -1138,6 +1176,10 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("CurrentAliasId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("AliasLink");
+
+                    b.Navigation("CurrentAlias");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientConnectionHistory", b =>
@@ -1153,6 +1195,10 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientKill", b =>
@@ -1186,6 +1232,18 @@ namespace Data.Migrations.MySql
                     b.HasOne("Data.Models.Vector3", "ViewAngles")
                         .WithMany()
                         .HasForeignKey("ViewAnglesVector3Id");
+
+                    b.Navigation("Attacker");
+
+                    b.Navigation("DeathOrigin");
+
+                    b.Navigation("KillOrigin");
+
+                    b.Navigation("Server");
+
+                    b.Navigation("Victim");
+
+                    b.Navigation("ViewAngles");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientMessage", b =>
@@ -1201,6 +1259,10 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFACSnapshot", b =>
@@ -1238,6 +1300,18 @@ namespace Data.Migrations.MySql
                     b.HasOne("Data.Models.Server.EFServer", "Server")
                         .WithMany()
                         .HasForeignKey("ServerId");
+
+                    b.Navigation("Client");
+
+                    b.Navigation("CurrentViewAngle");
+
+                    b.Navigation("HitDestination");
+
+                    b.Navigation("HitOrigin");
+
+                    b.Navigation("LastStrainAngle");
+
+                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientHitStatistic", b =>
@@ -1267,6 +1341,18 @@ namespace Data.Migrations.MySql
                     b.HasOne("Data.Models.Client.Stats.Reference.EFWeapon", "Weapon")
                         .WithMany()
                         .HasForeignKey("WeaponId");
+
+                    b.Navigation("Client");
+
+                    b.Navigation("HitLocation");
+
+                    b.Navigation("MeansOfDeath");
+
+                    b.Navigation("Server");
+
+                    b.Navigation("Weapon");
+
+                    b.Navigation("WeaponAttachmentCombo");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientRankingHistory", b =>
@@ -1280,6 +1366,10 @@ namespace Data.Migrations.MySql
                     b.HasOne("Data.Models.Server.EFServer", "Server")
                         .WithMany()
                         .HasForeignKey("ServerId");
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientRatingHistory", b =>
@@ -1289,6 +1379,8 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("ClientId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Client");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientStatistics", b =>
@@ -1304,6 +1396,10 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFHitLocationCount", b =>
@@ -1325,6 +1421,10 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("EFClientStatisticsClientId", "EFClientStatisticsServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFRating", b =>
@@ -1338,6 +1438,10 @@ namespace Data.Migrations.MySql
                     b.HasOne("Data.Models.Server.EFServer", "Server")
                         .WithMany()
                         .HasForeignKey("ServerId");
+
+                    b.Navigation("RatingHistory");
+
+                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFWeaponAttachmentCombo", b =>
@@ -1355,6 +1459,12 @@ namespace Data.Migrations.MySql
                     b.HasOne("Data.Models.Client.Stats.Reference.EFWeaponAttachment", "Attachment3")
                         .WithMany()
                         .HasForeignKey("Attachment3Id");
+
+                    b.Navigation("Attachment1");
+
+                    b.Navigation("Attachment2");
+
+                    b.Navigation("Attachment3");
                 });
 
             modelBuilder.Entity("Data.Models.EFAlias", b =>
@@ -1364,6 +1474,8 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("LinkId")
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
+
+                    b.Navigation("Link");
                 });
 
             modelBuilder.Entity("Data.Models.EFMeta", b =>
@@ -1376,15 +1488,17 @@ namespace Data.Migrations.MySql
                         .WithMany()
                         .HasForeignKey("LinkedMetaId")
                         .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("Client");
+
+                    b.Navigation("LinkedMeta");
                 });
 
             modelBuilder.Entity("Data.Models.EFPenalty", b =>
                 {
                     b.HasOne("Data.Models.EFAliasLink", "Link")
                         .WithMany("ReceivedPenalties")
-                        .HasForeignKey("LinkId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
+                        .HasForeignKey("LinkId");
 
                     b.HasOne("Data.Models.Client.EFClient", "Offender")
                         .WithMany("ReceivedPenalties")
@@ -1397,6 +1511,23 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("PunisherId")
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
+
+                    b.Navigation("Link");
+
+                    b.Navigation("Offender");
+
+                    b.Navigation("Punisher");
+                });
+
+            modelBuilder.Entity("Data.Models.EFPenaltyIdentifier", b =>
+                {
+                    b.HasOne("Data.Models.EFPenalty", "Penalty")
+                        .WithMany()
+                        .HasForeignKey("PenaltyId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Penalty");
                 });
 
             modelBuilder.Entity("Data.Models.Misc.EFInboxMessage", b =>
@@ -1416,6 +1547,12 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("SourceClientId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("DestinationClient");
+
+                    b.Navigation("Server");
+
+                    b.Navigation("SourceClient");
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerSnapshot", b =>
@@ -1431,6 +1568,10 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Map");
+
+                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerStatistics", b =>
@@ -1440,6 +1581,39 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Data.Models.Client.EFClient", b =>
+                {
+                    b.Navigation("AdministeredPenalties");
+
+                    b.Navigation("Meta");
+
+                    b.Navigation("ReceivedPenalties");
+                });
+
+            modelBuilder.Entity("Data.Models.Client.Stats.EFACSnapshot", b =>
+                {
+                    b.Navigation("PredictedViewAngles");
+                });
+
+            modelBuilder.Entity("Data.Models.Client.Stats.EFClientRatingHistory", b =>
+                {
+                    b.Navigation("Ratings");
+                });
+
+            modelBuilder.Entity("Data.Models.Client.Stats.EFClientStatistics", b =>
+                {
+                    b.Navigation("HitLocations");
+                });
+
+            modelBuilder.Entity("Data.Models.EFAliasLink", b =>
+                {
+                    b.Navigation("Children");
+
+                    b.Navigation("ReceivedPenalties");
                 });
 #pragma warning restore 612, 618
         }

Data/Migrations/Postgresql/20220222222045_AddEFPenaltyIdentifier.cs

@@ -0,0 +1,56 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Data.Migrations.Postgresql
+{
+    public partial class AddEFPenaltyIdentifier : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "EFPenaltyIdentifiers",
+                columns: table => new
+                {
+                    PenaltyIdentifierId = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    IPv4Address = table.Column<int>(type: "integer", nullable: true),
+                    NetworkId = table.Column<long>(type: "bigint", nullable: false),
+                    PenaltyId = table.Column<int>(type: "integer", nullable: false),
+                    Active = table.Column<bool>(type: "boolean", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_EFPenaltyIdentifiers", x => x.PenaltyIdentifierId);
+                    table.ForeignKey(
+                        name: "FK_EFPenaltyIdentifiers_EFPenalties_PenaltyId",
+                        column: x => x.PenaltyId,
+                        principalTable: "EFPenalties",
+                        principalColumn: "PenaltyId",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFPenaltyIdentifiers_IPv4Address",
+                table: "EFPenaltyIdentifiers",
+                column: "IPv4Address");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFPenaltyIdentifiers_NetworkId",
+                table: "EFPenaltyIdentifiers",
+                column: "NetworkId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFPenaltyIdentifiers_PenaltyId",
+                table: "EFPenaltyIdentifiers",
+                column: "PenaltyId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "EFPenaltyIdentifiers");
+        }
+    }
+}

Data/Migrations/Postgresql/20220222230153_MakeEFPenaltyLinkIdNullable.cs

@@ -0,0 +1,56 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.Postgresql
+{
+    public partial class MakeEFPenaltyLinkIdNullable : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_EFPenalties_EFAliasLinks_LinkId",
+                table: "EFPenalties");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "LinkId",
+                table: "EFPenalties",
+                type: "integer",
+                nullable: true,
+                oldClrType: typeof(int),
+                oldType: "integer");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_EFPenalties_EFAliasLinks_LinkId",
+                table: "EFPenalties",
+                column: "LinkId",
+                principalTable: "EFAliasLinks",
+                principalColumn: "AliasLinkId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_EFPenalties_EFAliasLinks_LinkId",
+                table: "EFPenalties");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "LinkId",
+                table: "EFPenalties",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0,
+                oldClrType: typeof(int),
+                oldType: "integer",
+                oldNullable: true);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_EFPenalties_EFAliasLinks_LinkId",
+                table: "EFPenalties",
+                column: "LinkId",
+                principalTable: "EFAliasLinks",
+                principalColumn: "AliasLinkId",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

Data/Migrations/Postgresql/20220223150106_AddAuditFieldsToEFPenaltyIdentifier.cs

@@ -0,0 +1,48 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.Postgresql
+{
+    public partial class AddAuditFieldsToEFPenaltyIdentifier : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Active",
+                table: "EFPenaltyIdentifiers");
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "CreatedDateTime",
+                table: "EFPenaltyIdentifiers",
+                type: "timestamp without time zone",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "UpdatedDateTime",
+                table: "EFPenaltyIdentifiers",
+                type: "timestamp without time zone",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "CreatedDateTime",
+                table: "EFPenaltyIdentifiers");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedDateTime",
+                table: "EFPenaltyIdentifiers");
+
+            migrationBuilder.AddColumn<bool>(
+                name: "Active",
+                table: "EFPenaltyIdentifiers",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+        }
+    }
+}

Data/Migrations/Postgresql/PostgresqlDatabaseContextModelSnapshot.cs

@@ -6,6 +6,8 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
+#nullable disable
+
 namespace Data.Migrations.Postgresql
 {
     [DbContext(typeof(PostgresqlDatabaseContext))]
@@ -15,16 +17,18 @@ namespace Data.Migrations.Postgresql
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
-                .HasAnnotation("ProductVersion", "3.1.10")
+                .HasAnnotation("ProductVersion", "6.0.1")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
             modelBuilder.Entity("Data.Models.Client.EFACSnapshotVector3", b =>
                 {
                     b.Property<int>("ACSnapshotVector3Id")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ACSnapshotVector3Id"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
@@ -41,15 +45,16 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("Vector3Id");
 
-                    b.ToTable("EFACSnapshotVector3");
+                    b.ToTable("EFACSnapshotVector3", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClient", b =>
                 {
                     b.Property<int>("ClientId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
@@ -96,15 +101,16 @@ namespace Data.Migrations.Postgresql
                     b.HasIndex("NetworkId")
                         .IsUnique();
 
-                    b.ToTable("EFClients");
+                    b.ToTable("EFClients", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientConnectionHistory", b =>
                 {
                     b.Property<long>("ClientConnectionId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("ClientConnectionId"));
 
                     b.Property<int>("ClientId")
                         .HasColumnType("integer");
@@ -129,15 +135,16 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFClientConnectionHistory");
+                    b.ToTable("EFClientConnectionHistory", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientKill", b =>
                 {
                     b.Property<long>("KillId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("KillId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
@@ -204,15 +211,16 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("ViewAnglesVector3Id");
 
-                    b.ToTable("EFClientKills");
+                    b.ToTable("EFClientKills", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientMessage", b =>
                 {
                     b.Property<long>("MessageId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("MessageId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
@@ -240,15 +248,16 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("TimeSent");
 
-                    b.ToTable("EFClientMessages");
+                    b.ToTable("EFClientMessages", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFACSnapshot", b =>
                 {
                     b.Property<int>("SnapshotId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("SnapshotId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
@@ -348,15 +357,16 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFACSnapshot");
+                    b.ToTable("EFACSnapshot", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientHitStatistic", b =>
                 {
                     b.Property<int>("ClientHitStatisticId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientHitStatisticId"));
 
                     b.Property<int>("ClientId")
                         .HasColumnType("integer");
@@ -423,15 +433,16 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("WeaponId");
 
-                    b.ToTable("EFClientHitStatistics");
+                    b.ToTable("EFClientHitStatistics", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientRankingHistory", b =>
                 {
                     b.Property<long>("ClientRankingHistoryId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("ClientRankingHistoryId"));
 
                     b.Property<int>("ClientId")
                         .HasColumnType("integer");
@@ -469,15 +480,16 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("ZScore");
 
-                    b.ToTable("EFClientRankingHistory");
+                    b.ToTable("EFClientRankingHistory", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientRatingHistory", b =>
                 {
                     b.Property<int>("RatingHistoryId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("RatingHistoryId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
@@ -489,7 +501,7 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("ClientId");
 
-                    b.ToTable("EFClientRatingHistory");
+                    b.ToTable("EFClientRatingHistory", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientStatistics", b =>
@@ -547,26 +559,27 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("ClientId", "TimePlayed", "ZScore");
 
-                    b.ToTable("EFClientStatistics");
+                    b.ToTable("EFClientStatistics", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFHitLocationCount", b =>
                 {
                     b.Property<int>("HitLocationCountId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("HitLocationCountId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
 
                     b.Property<int>("EFClientStatisticsClientId")
-                        .HasColumnName("EFClientStatisticsClientId")
-                        .HasColumnType("integer");
+                        .HasColumnType("integer")
+                        .HasColumnName("EFClientStatisticsClientId");
 
                     b.Property<long>("EFClientStatisticsServerId")
-                        .HasColumnName("EFClientStatisticsServerId")
-                        .HasColumnType("bigint");
+                        .HasColumnType("bigint")
+                        .HasColumnName("EFClientStatisticsServerId");
 
                     b.Property<int>("HitCount")
                         .HasColumnType("integer");
@@ -586,15 +599,16 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("EFClientStatisticsClientId", "EFClientStatisticsServerId");
 
-                    b.ToTable("EFHitLocationCounts");
+                    b.ToTable("EFHitLocationCounts", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFRating", b =>
                 {
                     b.Property<int>("RatingId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("RatingId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
@@ -630,15 +644,16 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("When", "ServerId", "Performance", "ActivityAmount");
 
-                    b.ToTable("EFRating");
+                    b.ToTable("EFRating", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFHitLocation", b =>
                 {
                     b.Property<int>("HitLocationId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("HitLocationId"));
 
                     b.Property<DateTime>("CreatedDateTime")
                         .HasColumnType("timestamp without time zone");
@@ -657,15 +672,16 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("Name");
 
-                    b.ToTable("EFHitLocations");
+                    b.ToTable("EFHitLocations", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFMap", b =>
                 {
                     b.Property<int>("MapId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("MapId"));
 
                     b.Property<DateTime>("CreatedDateTime")
                         .HasColumnType("timestamp without time zone");
@@ -682,15 +698,16 @@ namespace Data.Migrations.Postgresql
 
                     b.HasKey("MapId");
 
-                    b.ToTable("EFMaps");
+                    b.ToTable("EFMaps", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFMeansOfDeath", b =>
                 {
                     b.Property<int>("MeansOfDeathId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("MeansOfDeathId"));
 
                     b.Property<DateTime>("CreatedDateTime")
                         .HasColumnType("timestamp without time zone");
@@ -707,15 +724,16 @@ namespace Data.Migrations.Postgresql
 
                     b.HasKey("MeansOfDeathId");
 
-                    b.ToTable("EFMeansOfDeath");
+                    b.ToTable("EFMeansOfDeath", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFWeapon", b =>
                 {
                     b.Property<int>("WeaponId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("WeaponId"));
 
                     b.Property<DateTime>("CreatedDateTime")
                         .HasColumnType("timestamp without time zone");
@@ -734,15 +752,16 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("Name");
 
-                    b.ToTable("EFWeapons");
+                    b.ToTable("EFWeapons", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFWeaponAttachment", b =>
                 {
                     b.Property<int>("WeaponAttachmentId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("WeaponAttachmentId"));
 
                     b.Property<DateTime>("CreatedDateTime")
                         .HasColumnType("timestamp without time zone");
@@ -759,15 +778,16 @@ namespace Data.Migrations.Postgresql
 
                     b.HasKey("WeaponAttachmentId");
 
-                    b.ToTable("EFWeaponAttachments");
+                    b.ToTable("EFWeaponAttachments", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFWeaponAttachmentCombo", b =>
                 {
                     b.Property<int>("WeaponAttachmentComboId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("WeaponAttachmentComboId"));
 
                     b.Property<int>("Attachment1Id")
                         .HasColumnType("integer");
@@ -795,15 +815,16 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("Attachment3Id");
 
-                    b.ToTable("EFWeaponAttachmentCombos");
+                    b.ToTable("EFWeaponAttachmentCombos", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.EFAlias", b =>
                 {
                     b.Property<int>("AliasId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("AliasId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
@@ -819,12 +840,12 @@ namespace Data.Migrations.Postgresql
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasColumnType("character varying(24)")
-                        .HasMaxLength(24);
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)");
 
                     b.Property<string>("SearchableName")
-                        .HasColumnType("character varying(24)")
-                        .HasMaxLength(24);
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)");
 
                     b.HasKey("AliasId");
 
@@ -838,37 +859,39 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("Name", "IPAddress");
 
-                    b.ToTable("EFAlias");
+                    b.ToTable("EFAlias", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.EFAliasLink", b =>
                 {
                     b.Property<int>("AliasLinkId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("AliasLinkId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
 
                     b.HasKey("AliasLinkId");
 
-                    b.ToTable("EFAliasLinks");
+                    b.ToTable("EFAliasLinks", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.EFChangeHistory", b =>
                 {
                     b.Property<int>("ChangeHistoryId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ChangeHistoryId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
 
                     b.Property<string>("Comment")
-                        .HasColumnType("character varying(128)")
-                        .HasMaxLength(128);
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
 
                     b.Property<string>("CurrentValue")
                         .HasColumnType("text");
@@ -900,8 +923,9 @@ namespace Data.Migrations.Postgresql
                 {
                     b.Property<int>("MetaId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("MetaId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
@@ -917,8 +941,8 @@ namespace Data.Migrations.Postgresql
 
                     b.Property<string>("Key")
                         .IsRequired()
-                        .HasColumnType("character varying(32)")
-                        .HasMaxLength(32);
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
 
                     b.Property<int?>("LinkedMetaId")
                         .HasColumnType("integer");
@@ -945,8 +969,9 @@ namespace Data.Migrations.Postgresql
                 {
                     b.Property<int>("PenaltyId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("PenaltyId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
@@ -960,7 +985,7 @@ namespace Data.Migrations.Postgresql
                     b.Property<bool>("IsEvadedOffense")
                         .HasColumnType("boolean");
 
-                    b.Property<int>("LinkId")
+                    b.Property<int?>("LinkId")
                         .HasColumnType("integer");
 
                     b.Property<int>("OffenderId")
@@ -987,15 +1012,50 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("PunisherId");
 
-                    b.ToTable("EFPenalties");
+                    b.ToTable("EFPenalties", (string)null);
+                });
+
+            modelBuilder.Entity("Data.Models.EFPenaltyIdentifier", b =>
+                {
+                    b.Property<int>("PenaltyIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("PenaltyIdentifierId"));
+
+                    b.Property<DateTime>("CreatedDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<int?>("IPv4Address")
+                        .HasColumnType("integer");
+
+                    b.Property<long>("NetworkId")
+                        .HasColumnType("bigint");
+
+                    b.Property<int>("PenaltyId")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("UpdatedDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.HasKey("PenaltyIdentifierId");
+
+                    b.HasIndex("IPv4Address");
+
+                    b.HasIndex("NetworkId");
+
+                    b.HasIndex("PenaltyId");
+
+                    b.ToTable("EFPenaltyIdentifiers", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Misc.EFInboxMessage", b =>
                 {
                     b.Property<int>("InboxMessageId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("InboxMessageId"));
 
                     b.Property<DateTime>("CreatedDateTime")
                         .HasColumnType("timestamp without time zone");
@@ -1054,15 +1114,16 @@ namespace Data.Migrations.Postgresql
 
                     b.HasKey("ServerId");
 
-                    b.ToTable("EFServers");
+                    b.ToTable("EFServers", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerSnapshot", b =>
                 {
                     b.Property<long>("ServerSnapshotId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("ServerSnapshotId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
@@ -1088,15 +1149,16 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFServerSnapshot");
+                    b.ToTable("EFServerSnapshot", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerStatistics", b =>
                 {
                     b.Property<int>("StatisticId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("StatisticId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
@@ -1114,15 +1176,16 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFServerStatistics");
+                    b.ToTable("EFServerStatistics", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Vector3", b =>
                 {
                     b.Property<int>("Vector3Id")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Vector3Id"));
 
                     b.Property<float>("X")
                         .HasColumnType("real");
@@ -1135,7 +1198,7 @@ namespace Data.Migrations.Postgresql
 
                     b.HasKey("Vector3Id");
 
-                    b.ToTable("Vector3");
+                    b.ToTable("Vector3", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFACSnapshotVector3", b =>
@@ -1151,6 +1214,10 @@ namespace Data.Migrations.Postgresql
                         .HasForeignKey("Vector3Id")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Snapshot");
+
+                    b.Navigation("Vector");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClient", b =>
@@ -1166,6 +1233,10 @@ namespace Data.Migrations.Postgresql
                         .HasForeignKey("CurrentAliasId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("AliasLink");
+
+                    b.Navigation("CurrentAlias");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientConnectionHistory", b =>
@@ -1181,6 +1252,10 @@ namespace Data.Migrations.Postgresql
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientKill", b =>
@@ -1214,6 +1289,18 @@ namespace Data.Migrations.Postgresql
                     b.HasOne("Data.Models.Vector3", "ViewAngles")
                         .WithMany()
                         .HasForeignKey("ViewAnglesVector3Id");
+
+                    b.Navigation("Attacker");
+
+                    b.Navigation("DeathOrigin");
+
+                    b.Navigation("KillOrigin");
+
+                    b.Navigation("Server");
+
+                    b.Navigation("Victim");
+
+                    b.Navigation("ViewAngles");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientMessage", b =>
@@ -1229,6 +1316,10 @@ namespace Data.Migrations.Postgresql
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFACSnapshot", b =>
@@ -1266,6 +1357,18 @@ namespace Data.Migrations.Postgresql
                     b.HasOne("Data.Models.Server.EFServer", "Server")
                         .WithMany()
                         .HasForeignKey("ServerId");
+
+                    b.Navigation("Client");
+
+                    b.Navigation("CurrentViewAngle");
+
+                    b.Navigation("HitDestination");
+
+                    b.Navigation("HitOrigin");
+
+                    b.Navigation("LastStrainAngle");
+
+                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientHitStatistic", b =>
@@ -1295,6 +1398,18 @@ namespace Data.Migrations.Postgresql
                     b.HasOne("Data.Models.Client.Stats.Reference.EFWeapon", "Weapon")
                         .WithMany()
                         .HasForeignKey("WeaponId");
+
+                    b.Navigation("Client");
+
+                    b.Navigation("HitLocation");
+
+                    b.Navigation("MeansOfDeath");
+
+                    b.Navigation("Server");
+
+                    b.Navigation("Weapon");
+
+                    b.Navigation("WeaponAttachmentCombo");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientRankingHistory", b =>
@@ -1308,6 +1423,10 @@ namespace Data.Migrations.Postgresql
                     b.HasOne("Data.Models.Server.EFServer", "Server")
                         .WithMany()
                         .HasForeignKey("ServerId");
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientRatingHistory", b =>
@@ -1317,6 +1436,8 @@ namespace Data.Migrations.Postgresql
                         .HasForeignKey("ClientId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Client");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientStatistics", b =>
@@ -1332,6 +1453,10 @@ namespace Data.Migrations.Postgresql
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFHitLocationCount", b =>
@@ -1353,6 +1478,10 @@ namespace Data.Migrations.Postgresql
                         .HasForeignKey("EFClientStatisticsClientId", "EFClientStatisticsServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFRating", b =>
@@ -1366,6 +1495,10 @@ namespace Data.Migrations.Postgresql
                     b.HasOne("Data.Models.Server.EFServer", "Server")
                         .WithMany()
                         .HasForeignKey("ServerId");
+
+                    b.Navigation("RatingHistory");
+
+                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFWeaponAttachmentCombo", b =>
@@ -1383,6 +1516,12 @@ namespace Data.Migrations.Postgresql
                     b.HasOne("Data.Models.Client.Stats.Reference.EFWeaponAttachment", "Attachment3")
                         .WithMany()
                         .HasForeignKey("Attachment3Id");
+
+                    b.Navigation("Attachment1");
+
+                    b.Navigation("Attachment2");
+
+                    b.Navigation("Attachment3");
                 });
 
             modelBuilder.Entity("Data.Models.EFAlias", b =>
@@ -1392,6 +1531,8 @@ namespace Data.Migrations.Postgresql
                         .HasForeignKey("LinkId")
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
+
+                    b.Navigation("Link");
                 });
 
             modelBuilder.Entity("Data.Models.EFMeta", b =>
@@ -1404,15 +1545,17 @@ namespace Data.Migrations.Postgresql
                         .WithMany()
                         .HasForeignKey("LinkedMetaId")
                         .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("Client");
+
+                    b.Navigation("LinkedMeta");
                 });
 
             modelBuilder.Entity("Data.Models.EFPenalty", b =>
                 {
                     b.HasOne("Data.Models.EFAliasLink", "Link")
                         .WithMany("ReceivedPenalties")
-                        .HasForeignKey("LinkId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
+                        .HasForeignKey("LinkId");
 
                     b.HasOne("Data.Models.Client.EFClient", "Offender")
                         .WithMany("ReceivedPenalties")
@@ -1425,6 +1568,23 @@ namespace Data.Migrations.Postgresql
                         .HasForeignKey("PunisherId")
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
+
+                    b.Navigation("Link");
+
+                    b.Navigation("Offender");
+
+                    b.Navigation("Punisher");
+                });
+
+            modelBuilder.Entity("Data.Models.EFPenaltyIdentifier", b =>
+                {
+                    b.HasOne("Data.Models.EFPenalty", "Penalty")
+                        .WithMany()
+                        .HasForeignKey("PenaltyId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Penalty");
                 });
 
             modelBuilder.Entity("Data.Models.Misc.EFInboxMessage", b =>
@@ -1444,6 +1604,12 @@ namespace Data.Migrations.Postgresql
                         .HasForeignKey("SourceClientId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("DestinationClient");
+
+                    b.Navigation("Server");
+
+                    b.Navigation("SourceClient");
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerSnapshot", b =>
@@ -1459,6 +1625,10 @@ namespace Data.Migrations.Postgresql
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Map");
+
+                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerStatistics", b =>
@@ -1468,6 +1638,39 @@ namespace Data.Migrations.Postgresql
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Data.Models.Client.EFClient", b =>
+                {
+                    b.Navigation("AdministeredPenalties");
+
+                    b.Navigation("Meta");
+
+                    b.Navigation("ReceivedPenalties");
+                });
+
+            modelBuilder.Entity("Data.Models.Client.Stats.EFACSnapshot", b =>
+                {
+                    b.Navigation("PredictedViewAngles");
+                });
+
+            modelBuilder.Entity("Data.Models.Client.Stats.EFClientRatingHistory", b =>
+                {
+                    b.Navigation("Ratings");
+                });
+
+            modelBuilder.Entity("Data.Models.Client.Stats.EFClientStatistics", b =>
+                {
+                    b.Navigation("HitLocations");
+                });
+
+            modelBuilder.Entity("Data.Models.EFAliasLink", b =>
+                {
+                    b.Navigation("Children");
+
+                    b.Navigation("ReceivedPenalties");
                 });
 #pragma warning restore 612, 618
         }

Data/Migrations/Sqlite/20220222161952_AddEFPenaltyIdentifier.cs

@@ -0,0 +1,55 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.Sqlite
+{
+    public partial class AddEFPenaltyIdentifier : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "EFPenaltyIdentifiers",
+                columns: table => new
+                {
+                    PenaltyIdentifierId = table.Column<int>(type: "INTEGER", nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    IPv4Address = table.Column<int>(type: "INTEGER", nullable: true),
+                    NetworkId = table.Column<long>(type: "INTEGER", nullable: false),
+                    PenaltyId = table.Column<int>(type: "INTEGER", nullable: false),
+                    Active = table.Column<bool>(type: "INTEGER", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_EFPenaltyIdentifiers", x => x.PenaltyIdentifierId);
+                    table.ForeignKey(
+                        name: "FK_EFPenaltyIdentifiers_EFPenalties_PenaltyId",
+                        column: x => x.PenaltyId,
+                        principalTable: "EFPenalties",
+                        principalColumn: "PenaltyId",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFPenaltyIdentifiers_IPv4Address",
+                table: "EFPenaltyIdentifiers",
+                column: "IPv4Address");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFPenaltyIdentifiers_NetworkId",
+                table: "EFPenaltyIdentifiers",
+                column: "NetworkId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFPenaltyIdentifiers_PenaltyId",
+                table: "EFPenaltyIdentifiers",
+                column: "PenaltyId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "EFPenaltyIdentifiers");
+        }
+    }
+}

Data/Migrations/Sqlite/20220222164454_MakeEFPenaltyLinkIdNullable.cs

@@ -0,0 +1,56 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.Sqlite
+{
+    public partial class MakeEFPenaltyLinkIdNullable : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_EFPenalties_EFAliasLinks_LinkId",
+                table: "EFPenalties");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "LinkId",
+                table: "EFPenalties",
+                type: "INTEGER",
+                nullable: true,
+                oldClrType: typeof(int),
+                oldType: "INTEGER");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_EFPenalties_EFAliasLinks_LinkId",
+                table: "EFPenalties",
+                column: "LinkId",
+                principalTable: "EFAliasLinks",
+                principalColumn: "AliasLinkId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_EFPenalties_EFAliasLinks_LinkId",
+                table: "EFPenalties");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "LinkId",
+                table: "EFPenalties",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: 0,
+                oldClrType: typeof(int),
+                oldType: "INTEGER",
+                oldNullable: true);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_EFPenalties_EFAliasLinks_LinkId",
+                table: "EFPenalties",
+                column: "LinkId",
+                principalTable: "EFAliasLinks",
+                principalColumn: "AliasLinkId",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

Data/Migrations/Sqlite/20220223144615_AddAuditFieldsToEFPenaltyIdentifier.cs

@@ -0,0 +1,48 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.Sqlite
+{
+    public partial class AddAuditFieldsToEFPenaltyIdentifier : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Active",
+                table: "EFPenaltyIdentifiers");
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "CreatedDateTime",
+                table: "EFPenaltyIdentifiers",
+                type: "TEXT",
+                nullable: false,
+                defaultValue: DateTime.UtcNow);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "UpdatedDateTime",
+                table: "EFPenaltyIdentifiers",
+                type: "TEXT",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "CreatedDateTime",
+                table: "EFPenaltyIdentifiers");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedDateTime",
+                table: "EFPenaltyIdentifiers");
+
+            migrationBuilder.AddColumn<bool>(
+                name: "Active",
+                table: "EFPenaltyIdentifiers",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: false);
+        }
+    }
+}

Data/Migrations/Sqlite/SqliteDatabaseContextModelSnapshot.cs

@@ -5,6 +5,8 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
+#nullable disable
+
 namespace Data.Migrations.Sqlite
 {
     [DbContext(typeof(SqliteDatabaseContext))]
@@ -13,8 +15,7 @@ namespace Data.Migrations.Sqlite
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "3.1.10");
+            modelBuilder.HasAnnotation("ProductVersion", "6.0.1");
 
             modelBuilder.Entity("Data.Models.Client.EFACSnapshotVector3", b =>
                 {
@@ -37,7 +38,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("Vector3Id");
 
-                    b.ToTable("EFACSnapshotVector3");
+                    b.ToTable("EFACSnapshotVector3", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClient", b =>
@@ -91,7 +92,7 @@ namespace Data.Migrations.Sqlite
                     b.HasIndex("NetworkId")
                         .IsUnique();
 
-                    b.ToTable("EFClients");
+                    b.ToTable("EFClients", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientConnectionHistory", b =>
@@ -123,7 +124,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFClientConnectionHistory");
+                    b.ToTable("EFClientConnectionHistory", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientKill", b =>
@@ -197,7 +198,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("ViewAnglesVector3Id");
 
-                    b.ToTable("EFClientKills");
+                    b.ToTable("EFClientKills", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientMessage", b =>
@@ -232,7 +233,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("TimeSent");
 
-                    b.ToTable("EFClientMessages");
+                    b.ToTable("EFClientMessages", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFACSnapshot", b =>
@@ -339,7 +340,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFACSnapshot");
+                    b.ToTable("EFACSnapshot", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientHitStatistic", b =>
@@ -413,7 +414,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("WeaponId");
 
-                    b.ToTable("EFClientHitStatistics");
+                    b.ToTable("EFClientHitStatistics", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientRankingHistory", b =>
@@ -458,7 +459,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("ZScore");
 
-                    b.ToTable("EFClientRankingHistory");
+                    b.ToTable("EFClientRankingHistory", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientRatingHistory", b =>
@@ -477,7 +478,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("ClientId");
 
-                    b.ToTable("EFClientRatingHistory");
+                    b.ToTable("EFClientRatingHistory", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientStatistics", b =>
@@ -535,7 +536,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("ClientId", "TimePlayed", "ZScore");
 
-                    b.ToTable("EFClientStatistics");
+                    b.ToTable("EFClientStatistics", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFHitLocationCount", b =>
@@ -548,12 +549,12 @@ namespace Data.Migrations.Sqlite
                         .HasColumnType("INTEGER");
 
                     b.Property<int>("EFClientStatisticsClientId")
-                        .HasColumnName("EFClientStatisticsClientId")
-                        .HasColumnType("INTEGER");
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("EFClientStatisticsClientId");
 
                     b.Property<long>("EFClientStatisticsServerId")
-                        .HasColumnName("EFClientStatisticsServerId")
-                        .HasColumnType("INTEGER");
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("EFClientStatisticsServerId");
 
                     b.Property<int>("HitCount")
                         .HasColumnType("INTEGER");
@@ -573,7 +574,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("EFClientStatisticsClientId", "EFClientStatisticsServerId");
 
-                    b.ToTable("EFHitLocationCounts");
+                    b.ToTable("EFHitLocationCounts", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFRating", b =>
@@ -616,7 +617,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("When", "ServerId", "Performance", "ActivityAmount");
 
-                    b.ToTable("EFRating");
+                    b.ToTable("EFRating", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFHitLocation", b =>
@@ -642,7 +643,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("Name");
 
-                    b.ToTable("EFHitLocations");
+                    b.ToTable("EFHitLocations", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFMap", b =>
@@ -666,7 +667,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasKey("MapId");
 
-                    b.ToTable("EFMaps");
+                    b.ToTable("EFMaps", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFMeansOfDeath", b =>
@@ -690,7 +691,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasKey("MeansOfDeathId");
 
-                    b.ToTable("EFMeansOfDeath");
+                    b.ToTable("EFMeansOfDeath", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFWeapon", b =>
@@ -716,7 +717,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("Name");
 
-                    b.ToTable("EFWeapons");
+                    b.ToTable("EFWeapons", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFWeaponAttachment", b =>
@@ -740,7 +741,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasKey("WeaponAttachmentId");
 
-                    b.ToTable("EFWeaponAttachments");
+                    b.ToTable("EFWeaponAttachments", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFWeaponAttachmentCombo", b =>
@@ -775,7 +776,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("Attachment3Id");
 
-                    b.ToTable("EFWeaponAttachmentCombos");
+                    b.ToTable("EFWeaponAttachmentCombos", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.EFAlias", b =>
@@ -798,12 +799,12 @@ namespace Data.Migrations.Sqlite
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(24);
+                        .HasMaxLength(24)
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("SearchableName")
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(24);
+                        .HasMaxLength(24)
+                        .HasColumnType("TEXT");
 
                     b.HasKey("AliasId");
 
@@ -817,7 +818,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("Name", "IPAddress");
 
-                    b.ToTable("EFAlias");
+                    b.ToTable("EFAlias", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.EFAliasLink", b =>
@@ -831,7 +832,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasKey("AliasLinkId");
 
-                    b.ToTable("EFAliasLinks");
+                    b.ToTable("EFAliasLinks", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.EFChangeHistory", b =>
@@ -844,8 +845,8 @@ namespace Data.Migrations.Sqlite
                         .HasColumnType("INTEGER");
 
                     b.Property<string>("Comment")
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(128);
+                        .HasMaxLength(128)
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("CurrentValue")
                         .HasColumnType("TEXT");
@@ -893,8 +894,8 @@ namespace Data.Migrations.Sqlite
 
                     b.Property<string>("Key")
                         .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(32);
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
 
                     b.Property<int?>("LinkedMetaId")
                         .HasColumnType("INTEGER");
@@ -935,7 +936,7 @@ namespace Data.Migrations.Sqlite
                     b.Property<bool>("IsEvadedOffense")
                         .HasColumnType("INTEGER");
 
-                    b.Property<int>("LinkId")
+                    b.Property<int?>("LinkId")
                         .HasColumnType("INTEGER");
 
                     b.Property<int>("OffenderId")
@@ -962,7 +963,39 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("PunisherId");
 
-                    b.ToTable("EFPenalties");
+                    b.ToTable("EFPenalties", (string)null);
+                });
+
+            modelBuilder.Entity("Data.Models.EFPenaltyIdentifier", b =>
+                {
+                    b.Property<int>("PenaltyIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("CreatedDateTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("IPv4Address")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("NetworkId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("PenaltyId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("UpdatedDateTime")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("PenaltyIdentifierId");
+
+                    b.HasIndex("IPv4Address");
+
+                    b.HasIndex("NetworkId");
+
+                    b.HasIndex("PenaltyId");
+
+                    b.ToTable("EFPenaltyIdentifiers", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Misc.EFInboxMessage", b =>
@@ -1028,7 +1061,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasKey("ServerId");
 
-                    b.ToTable("EFServers");
+                    b.ToTable("EFServers", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerSnapshot", b =>
@@ -1061,7 +1094,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFServerSnapshot");
+                    b.ToTable("EFServerSnapshot", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerStatistics", b =>
@@ -1086,7 +1119,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFServerStatistics");
+                    b.ToTable("EFServerStatistics", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Vector3", b =>
@@ -1106,7 +1139,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasKey("Vector3Id");
 
-                    b.ToTable("Vector3");
+                    b.ToTable("Vector3", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFACSnapshotVector3", b =>
@@ -1122,6 +1155,10 @@ namespace Data.Migrations.Sqlite
                         .HasForeignKey("Vector3Id")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Snapshot");
+
+                    b.Navigation("Vector");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClient", b =>
@@ -1137,6 +1174,10 @@ namespace Data.Migrations.Sqlite
                         .HasForeignKey("CurrentAliasId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("AliasLink");
+
+                    b.Navigation("CurrentAlias");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientConnectionHistory", b =>
@@ -1152,6 +1193,10 @@ namespace Data.Migrations.Sqlite
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientKill", b =>
@@ -1185,6 +1230,18 @@ namespace Data.Migrations.Sqlite
                     b.HasOne("Data.Models.Vector3", "ViewAngles")
                         .WithMany()
                         .HasForeignKey("ViewAnglesVector3Id");
+
+                    b.Navigation("Attacker");
+
+                    b.Navigation("DeathOrigin");
+
+                    b.Navigation("KillOrigin");
+
+                    b.Navigation("Server");
+
+                    b.Navigation("Victim");
+
+                    b.Navigation("ViewAngles");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientMessage", b =>
@@ -1200,6 +1257,10 @@ namespace Data.Migrations.Sqlite
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFACSnapshot", b =>
@@ -1237,6 +1298,18 @@ namespace Data.Migrations.Sqlite
                     b.HasOne("Data.Models.Server.EFServer", "Server")
                         .WithMany()
                         .HasForeignKey("ServerId");
+
+                    b.Navigation("Client");
+
+                    b.Navigation("CurrentViewAngle");
+
+                    b.Navigation("HitDestination");
+
+                    b.Navigation("HitOrigin");
+
+                    b.Navigation("LastStrainAngle");
+
+                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientHitStatistic", b =>
@@ -1266,6 +1339,18 @@ namespace Data.Migrations.Sqlite
                     b.HasOne("Data.Models.Client.Stats.Reference.EFWeapon", "Weapon")
                         .WithMany()
                         .HasForeignKey("WeaponId");
+
+                    b.Navigation("Client");
+
+                    b.Navigation("HitLocation");
+
+                    b.Navigation("MeansOfDeath");
+
+                    b.Navigation("Server");
+
+                    b.Navigation("Weapon");
+
+                    b.Navigation("WeaponAttachmentCombo");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientRankingHistory", b =>
@@ -1279,6 +1364,10 @@ namespace Data.Migrations.Sqlite
                     b.HasOne("Data.Models.Server.EFServer", "Server")
                         .WithMany()
                         .HasForeignKey("ServerId");
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientRatingHistory", b =>
@@ -1288,6 +1377,8 @@ namespace Data.Migrations.Sqlite
                         .HasForeignKey("ClientId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Client");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientStatistics", b =>
@@ -1303,6 +1394,10 @@ namespace Data.Migrations.Sqlite
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFHitLocationCount", b =>
@@ -1324,6 +1419,10 @@ namespace Data.Migrations.Sqlite
                         .HasForeignKey("EFClientStatisticsClientId", "EFClientStatisticsServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFRating", b =>
@@ -1337,6 +1436,10 @@ namespace Data.Migrations.Sqlite
                     b.HasOne("Data.Models.Server.EFServer", "Server")
                         .WithMany()
                         .HasForeignKey("ServerId");
+
+                    b.Navigation("RatingHistory");
+
+                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFWeaponAttachmentCombo", b =>
@@ -1354,6 +1457,12 @@ namespace Data.Migrations.Sqlite
                     b.HasOne("Data.Models.Client.Stats.Reference.EFWeaponAttachment", "Attachment3")
                         .WithMany()
                         .HasForeignKey("Attachment3Id");
+
+                    b.Navigation("Attachment1");
+
+                    b.Navigation("Attachment2");
+
+                    b.Navigation("Attachment3");
                 });
 
             modelBuilder.Entity("Data.Models.EFAlias", b =>
@@ -1363,6 +1472,8 @@ namespace Data.Migrations.Sqlite
                         .HasForeignKey("LinkId")
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
+
+                    b.Navigation("Link");
                 });
 
             modelBuilder.Entity("Data.Models.EFMeta", b =>
@@ -1375,15 +1486,17 @@ namespace Data.Migrations.Sqlite
                         .WithMany()
                         .HasForeignKey("LinkedMetaId")
                         .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("Client");
+
+                    b.Navigation("LinkedMeta");
                 });
 
             modelBuilder.Entity("Data.Models.EFPenalty", b =>
                 {
                     b.HasOne("Data.Models.EFAliasLink", "Link")
                         .WithMany("ReceivedPenalties")
-                        .HasForeignKey("LinkId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
+                        .HasForeignKey("LinkId");
 
                     b.HasOne("Data.Models.Client.EFClient", "Offender")
                         .WithMany("ReceivedPenalties")
@@ -1396,6 +1509,23 @@ namespace Data.Migrations.Sqlite
                         .HasForeignKey("PunisherId")
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
+
+                    b.Navigation("Link");
+
+                    b.Navigation("Offender");
+
+                    b.Navigation("Punisher");
+                });
+
+            modelBuilder.Entity("Data.Models.EFPenaltyIdentifier", b =>
+                {
+                    b.HasOne("Data.Models.EFPenalty", "Penalty")
+                        .WithMany()
+                        .HasForeignKey("PenaltyId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Penalty");
                 });
 
             modelBuilder.Entity("Data.Models.Misc.EFInboxMessage", b =>
@@ -1415,6 +1545,12 @@ namespace Data.Migrations.Sqlite
                         .HasForeignKey("SourceClientId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("DestinationClient");
+
+                    b.Navigation("Server");
+
+                    b.Navigation("SourceClient");
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerSnapshot", b =>
@@ -1430,6 +1566,10 @@ namespace Data.Migrations.Sqlite
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Map");
+
+                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerStatistics", b =>
@@ -1439,6 +1579,39 @@ namespace Data.Migrations.Sqlite
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Data.Models.Client.EFClient", b =>
+                {
+                    b.Navigation("AdministeredPenalties");
+
+                    b.Navigation("Meta");
+
+                    b.Navigation("ReceivedPenalties");
+                });
+
+            modelBuilder.Entity("Data.Models.Client.Stats.EFACSnapshot", b =>
+                {
+                    b.Navigation("PredictedViewAngles");
+                });
+
+            modelBuilder.Entity("Data.Models.Client.Stats.EFClientRatingHistory", b =>
+                {
+                    b.Navigation("Ratings");
+                });
+
+            modelBuilder.Entity("Data.Models.Client.Stats.EFClientStatistics", b =>
+                {
+                    b.Navigation("HitLocations");
+                });
+
+            modelBuilder.Entity("Data.Models.EFAliasLink", b =>
+                {
+                    b.Navigation("Children");
+
+                    b.Navigation("ReceivedPenalties");
                 });
 #pragma warning restore 612, 618
         }

Data/Models/EFPenalty.cs

@@ -23,8 +23,7 @@ namespace Data.Models
 
         [Key]
         public int PenaltyId { get; set; }
-        [Required]
-        public int LinkId { get; set; }
+        public int? LinkId { get; set; }
         [ForeignKey("LinkId")]
         public virtual EFAliasLink Link { get; set; }
         [Required]

Data/Models/EFPenaltyIdentifier.cs

@@ -0,0 +1,22 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Stats.Models;
+
+namespace Data.Models;
+
+public class EFPenaltyIdentifier : AuditFields
+{
+    [Key]
+    public int PenaltyIdentifierId { get; set; }
+    
+    public int? IPv4Address { get; set; }
+    
+    [Required]
+    public long NetworkId { get; set; }
+    
+    [Required]
+    public int PenaltyId { get; set; }
+    
+    [ForeignKey(nameof(PenaltyId))]
+    public EFPenalty Penalty { get; set; }
+}

GameFiles/IW4x/userraw/scripts/_commands.gsc

@@ -1,53 +0,0 @@
-#include common_scripts\utility;
-#include maps\mp\_utility;
-#include maps\mp\gametypes\_hud_util;
-#include maps\mp\gametypes\_playerlogic;
-
-init()
-{
-	SetDvarIfUninitialized( "sv_iw4madmin_command", "" );
-	level thread WaitForCommand();
-}
-
-WaitForCommand()
-{
-	level endon( "game_ended" );
-	
-	for(;;)
-	{
-		commandInfo = strtok( getDvar("sv_iw4madmin_command"), ";" );
-		command = commandInfo[0];
-		
-		switch( command )
-		{
-			case "alert":
-				//clientId        alertType       sound           message
-				SendAlert( commandInfo[1], commandInfo[2], commandInfo[3], commandInfo[4] );
-				break;
-			case "killplayer":
-				//          clientId
-				KillPlayer( commandInfo[1], commandInfo[2] );
-				break;
-		}
-
-		setDvar( "sv_iw4madmin_command", "" );
-		wait( 1 );
-	}
-}
-
-SendAlert( clientId, alertType, sound, message )
-{
-	client = getPlayerFromClientNum( int( clientId ) );
-	client thread playLeaderDialogOnPlayer( sound, client.team );
-	client playLocalSound( sound );
-	client iPrintLnBold( "^1" + alertType + ": ^3" + message );
-}
-
-KillPlayer( targetId, originId)
-{
-	target = getPlayerFromClientNum( int( targetId ) );
-	target suicide();
-	origin = getPlayerFromClientNum( int( originId ) );
-	
-	iPrintLnBold("^1" + origin.name + " ^7killed ^5" + target.name);
-}

GameFiles/IW4x/userraw/scripts/_integration.gsc

@@ -0,0 +1,730 @@
+#include common_scripts\utility;
+#include maps\mp\_utility;
+#include maps\mp\gametypes\_hud_util;
+#include maps\mp\gametypes\_playerlogic;
+
+init()
+{
+    // setup default vars
+    level.eventBus              = spawnstruct();
+    level.eventBus.inVar        = "sv_iw4madmin_in";
+    level.eventBus.outVar       = "sv_iw4madmin_out";
+    level.eventBus.failKey      = "fail";
+    level.eventBus.timeoutKey   = "timeout";
+    level.eventBus.timeout      = 30;
+    
+    level.clientDataKey = "clientData";
+
+    level.eventTypes                            = spawnstruct();
+    level.eventTypes.localClientEvent           = "client_event";
+    level.eventTypes.clientDataReceived         = "ClientDataReceived";
+    level.eventTypes.clientDataRequested        = "ClientDataRequested";
+    level.eventTypes.setClientDataRequested     = "SetClientDataRequested";
+    level.eventTypes.setClientDataCompleted     = "SetClientDataCompleted";
+    level.eventTypes.executeCommandRequested    = "ExecuteCommandRequested";
+                                                                             
+    SetDvarIfUninitialized( level.eventBus.inVar, "" );
+    SetDvarIfUninitialized( level.eventBus.outVar, "" );
+    SetDvarIfUninitialized( "sv_iw4madmin_integration_enabled", 1 );
+    SetDvarIfUninitialized( "sv_iw4madmin_integration_debug", 0 );
+    
+    // map the event type to the handler
+    level.eventCallbacks = [];
+    level.eventCallbacks[level.eventTypes.clientDataReceived]       = ::OnClientDataReceived;
+    level.eventCallbacks[level.eventTypes.executeCommandRequested]  = ::OnExecuteCommand; 
+    level.eventCallbacks[level.eventTypes.setClientDataCompleted]   = ::OnSetClientDataCompleted;
+    
+    if ( GetDvarInt( "sv_iw4madmin_integration_enabled" ) != 1 )
+    {
+        return;
+    }
+    
+    // start long running tasks
+    level thread MonitorClientEvents();
+    level thread MonitorBus();
+    level thread OnPlayerConnect();
+}
+
+//////////////////////////////////
+// Client Methods
+//////////////////////////////////
+
+OnPlayerConnect()
+{
+    level endon ( "disconnect" );
+    
+    for ( ;; )
+    {
+        level waittill( "connected", player );
+        
+        level.iw4adminIntegrationDebug = GetDvarInt( "sv_iw4madmin_integration_debug" );
+        
+        if ( !isDefined( player.pers[level.clientDataKey] ) )
+        {
+            player.pers[level.clientDataKey] = spawnstruct();
+        }
+        
+        player thread OnPlayerSpawned();
+        player thread PlayerTrackingOnInterval();
+        
+        // only toggle if it's enabled
+        if ( IsDefined( level.nightModeEnabled ) && level.nightModeEnabled )
+        {
+            player ToggleNightMode();
+        }
+    }
+}
+
+OnPlayerSpawned()
+{
+    self endon( "disconnect" );
+
+    for ( ;; )
+    {
+        self waittill( "spawned_player" );
+        self PlayerConnectEvents();
+    }
+}
+
+OnPlayerDisconnect()
+{
+    level endon ( "disconnect" );
+
+    for ( ;; )
+    {
+        self waittill( "disconnect" );
+        self SaveTrackingMetrics();
+    }
+}
+
+OnGameEnded() 
+{
+    level endon ( "disconnect" );
+    
+    for ( ;; )
+    {
+        level waittill( "game_ended" );
+        // note: you can run data code here but it's possible for 
+        // data to get truncated, so we will try a timer based approach for now
+    }
+}
+
+DisplayWelcomeData()
+{
+    self endon( "disconnect" );
+
+    clientData = self.pers[level.clientDataKey];
+    
+    if ( clientData.permissionLevel == "User" || clientData.permissionLevel == "Flagged" ) 
+    {
+        return;
+    } 
+    
+    self IPrintLnBold( "Welcome, your level is ^5" + clientData.permissionLevel );
+    wait( 2.0 );
+    self IPrintLnBold( "You were last seen ^5" + clientData.lastConnection );
+}
+
+PlayerConnectEvents() 
+{
+    self endon( "disconnect" );
+    
+    clientData = self.pers[level.clientDataKey];
+    
+    // this gives IW4MAdmin some time to register the player before making the request;
+    // although probably not necessary some users might have a slow database or poll rate
+    wait ( 2 );
+
+    if ( isDefined( clientData.state ) && clientData.state == "complete" ) 
+    {
+        return;
+    }
+    
+    self RequestClientBasicData();
+    // example of requesting meta from IW4MAdmin
+    // self RequestClientMeta( "LastServerPlayed" );
+}
+
+PlayerTrackingOnInterval() 
+{
+    self endon( "disconnect" );
+
+    for ( ;; )
+    {
+        wait ( 120 );
+        if ( IsAlive( self ) )
+        {
+            self SaveTrackingMetrics();
+        }
+    }
+}
+
+MonitorClientEvents()
+{
+    level endon( "disconnect" );
+    self endon( "disconnect" );
+    
+    for ( ;; ) 
+    {
+        level waittill( level.eventTypes.localClientEvent, client );
+ 
+        if ( level.iw4adminIntegrationDebug == 1 )
+        {
+            self IPrintLn( "Processing Event " + client.event.type + "-" + client.event.subtype );
+        }
+        
+        eventHandler = level.eventCallbacks[client.event.type];
+
+        if ( isDefined( eventHandler ) )
+        {
+            client [[eventHandler]]( client.event );
+        }
+        
+        client.eventData = [];
+    }
+}
+
+//////////////////////////////////
+// Helper Methods
+//////////////////////////////////
+
+RequestClientMeta( metaKey )
+{
+    getClientMetaEvent = BuildEventRequest( true, level.eventTypes.clientDataRequested, "Meta", self, metaKey );
+    level thread QueueEvent( getClientMetaEvent, level.eventTypes.clientDataRequested, self );
+}
+
+RequestClientBasicData()
+{
+    getClientDataEvent = BuildEventRequest( true, level.eventTypes.clientDataRequested, "None", self, "" );
+    level thread QueueEvent( getClientDataEvent, level.eventTypes.clientDataRequested, self );
+}
+
+IncrementClientMeta( metaKey, incrementValue, clientId )
+{
+    SetClientMeta( metaKey, incrementValue, clientId, "increment" );
+}
+
+DecrementClientMeta( metaKey, decrementValue, clientId )
+{
+    SetClientMeta( metaKey, decrementValue, clientId, "decrement" );
+}
+
+SetClientMeta( metaKey, metaValue, clientId, direction )
+{
+    data = "key=" + metaKey + "|value=" + metaValue;
+    clientNumber = -1;
+
+    if ( IsDefined ( clientId ) )
+    {
+        data = data + "|clientId=" + clientId;
+        clientNumber = -1;
+    }
+
+    if ( IsDefined( direction ) )
+    {
+        data = data + "|direction=" + direction;
+    }
+
+    if ( IsPlayer( self ) )
+    {
+        clientNumber = self getEntityNumber();
+    }
+
+    setClientMetaEvent = BuildEventRequest( true, level.eventTypes.setClientDataRequested, "Meta", clientNumber, data );
+    level thread QueueEvent( setClientMetaEvent, level.eventTypes.setClientDataRequested, self );
+}
+
+SaveTrackingMetrics()
+{
+    if ( level.iw4adminIntegrationDebug == 1 )
+    {
+        IPrintLn( "Saving tracking metrics for " + self.persistentClientId );
+    }
+    
+    if ( !IsDefined( self.lastShotCount ) )
+    {
+        self.lastShotCount = 0;
+    }
+
+    currentShotCount = self getPlayerStat( "mostshotsfired" );
+    change = currentShotCount - self.lastShotCount;
+    self.lastShotCount = currentShotCount;
+
+    if ( level.iw4adminIntegrationDebug == 1 )
+    {
+        IPrintLn( "Total Shots Fired increased by " + change );
+    }
+
+    if ( !IsDefined( change ) )
+    {
+        change = 0;
+    }
+    
+    if ( change == 0 )
+    {
+        return;
+    }
+
+    IncrementClientMeta( "TotalShotsFired", change, self.persistentClientId );
+
+}
+
+BuildEventRequest( responseExpected, eventType, eventSubtype, entOrId, data ) 
+{
+    if ( !isDefined( data ) )
+    {
+        data = "";
+    }
+    
+    if ( !isDefined( eventSubtype ) )
+    {
+        eventSubtype = "None";
+    }
+
+    if ( IsPlayer( entOrId ) )
+    {
+        entOrId = entOrId getEntityNumber();
+    }
+    
+    request = "0";
+    
+    if ( responseExpected ) 
+    {
+        request = "1";
+    }
+  
+    request = request + ";" + eventType + ";" + eventSubtype + ";" + entOrId + ";" + data;
+    return request;
+}
+
+MonitorBus()
+{
+    level endon( "game_ended" );
+    
+    for( ;; )
+    {
+        wait ( 0.1 );
+        
+        // check to see if IW4MAdmin is ready to receive more data
+        if ( getDvar( level.eventBus.inVar ) == "" ) 
+        {
+            level notify( "bus_ready" );
+        }
+        
+        eventString = getDvar( level.eventBus.outVar );
+        
+        if ( eventString == "" ) 
+        {
+            continue;
+        }
+        if ( level.iw4adminIntegrationDebug == 1 )
+        {
+            IPrintLn( "-> " + eventString );
+        }
+        
+        NotifyClientEvent( strtok( eventString, ";" ) );
+        
+        SetDvar( level.eventBus.outVar, "" );
+    }
+}
+
+QueueEvent( request, eventType, notifyEntity ) 
+{
+    level endon( "disconnect" );
+
+    start = GetTime();
+    maxWait = level.eventBus.timeout * 1000; // 30 seconds
+    timedOut = "";
+   
+    while ( GetDvar( level.eventBus.inVar ) != "" && ( GetTime() - start ) < maxWait )
+    {
+        level waittill_notify_or_timeout( "bus_ready", 1 );
+        
+        if ( GetDvar( level.eventBus.inVar ) != "" )
+        {
+            if ( level.iw4adminIntegrationDebug == 1 )
+            {
+                IPrintLn( "A request is already in progress..." );
+            }
+            timedOut = "set";
+            continue;
+        }
+        
+        timedOut = "unset";
+    }
+   
+    if ( timedOut == "set")
+    {
+        if ( level.iw4adminIntegrationDebug == 1 )
+        {
+            IPrintLn( "Timed out waiting for response..." );
+        }
+        
+        if ( IsDefined( notifyEntity) )
+        {
+            notifyEntity NotifyClientEventTimeout( eventType );
+        }
+
+        return;
+    }
+    
+    if ( level.iw4adminIntegrationDebug == 1 )
+    {
+        IPrintLn("<- " + request);
+    }
+    
+    SetDvar( level.eventBus.inVar, request );
+}
+
+ParseDataString( data ) 
+{
+    dataParts = strtok( data, "|" );
+    dict = [];
+    
+    counter = 0;
+    foreach ( part in dataParts )
+    {
+        splitPart = strtok( part, "=" );
+        key = splitPart[0];
+        value = splitPart[1];
+        dict[key] = value;
+        dict[counter] = key;
+        counter++;
+    }
+    
+    return dict;
+}
+
+NotifyClientEventTimeout( eventType ) 
+{
+    // todo: make this actual eventing
+    if ( eventType == level.eventTypes.clientDataRequested )
+    {
+        self.pers["clientData"].state = level.eventBus.timeoutKey;
+    }
+}
+
+NotifyClientEvent( eventInfo )
+{
+    origin = getPlayerFromClientNum( int( eventInfo[3] ) );
+    target = getPlayerFromClientNum( int( eventInfo[4] ) );
+    
+    event = spawnstruct();
+    event.type = eventInfo[1];
+    event.subtype = eventInfo[2];
+    event.data = eventInfo[5];
+    event.origin = origin;
+    event.target = target;
+    
+    if ( level.iw4adminIntegrationDebug == 1 )
+    {
+        IPrintLn( "NotifyClientEvent->" + event.data );
+    }
+
+    client = event.origin;
+    client.event = event;
+
+    level notify( level.eventTypes.localClientEvent, client );
+}
+
+//////////////////////////////////
+// Event Handlers
+/////////////////////////////////
+
+OnClientDataReceived( event )
+{
+    event.data = ParseDataString( event.data );
+    clientData = self.pers[level.clientDataKey];
+
+    if ( event.subtype == "Fail" ) 
+    {
+        if ( level.iw4adminIntegrationDebug == 1 )
+        {
+            IPrintLn( "Received fail response" );
+        }
+        clientData.state = level.eventBus.failKey;
+        return;
+    }
+
+    if ( event.subtype == "Meta" )
+    {
+        if ( !isDefined( clientData.meta ) )
+        {
+            clientData.meta = [];
+        }
+        
+        metaKey = event.data[0];
+        clientData.meta[metaKey] = event.data[metaKey];
+        
+        return;
+    }
+    
+    clientData.permissionLevel = event.data["level"];
+    clientData.clientId = event.data["clientId"];
+    clientData.lastConnection = event.data["lastConnection"];
+    clientData.state = "complete";
+    self.persistentClientId = event.data["clientId"];
+
+    self thread DisplayWelcomeData();
+}
+
+OnExecuteCommand( event ) 
+{
+    data = ParseDataString( event.data );
+    response = "";
+
+    switch ( event.subtype ) 
+    {
+        case "GiveWeapon":
+            response = event.target GiveWeaponImpl( data );
+            break;
+        case "TakeWeapons":
+            response = event.target TakeWeaponsImpl();
+            break;
+        case "SwitchTeams":
+            response = event.target TeamSwitchImpl();
+            break;
+        case "Hide":
+            response = self HideImpl();
+            break;
+        case "Unhide":
+            response = self UnhideImpl();
+            break;
+        case "Alert":
+            response = event.target AlertImpl( data );
+            break;
+        case "Goto":
+            if ( IsDefined( event.target ) )
+            {
+                response = self GotoPlayerImpl( event.target );
+            }
+            else
+            {
+                response = self GotoImpl( data );
+            }
+            break;
+        case "Kill":
+            response = event.target KillImpl();
+            break;
+        case "NightMode":
+            NightModeImpl();
+            break;
+        case "SetSpectator":
+            response = event.target SetSpectatorImpl();
+            break;
+    }
+    
+    // send back the response to the origin, but only if they're not the target
+    if ( response != "" && IsPlayer( event.origin ) && event.origin != event.target ) 
+    {
+        event.origin IPrintLnBold( response );
+    }
+}
+
+OnSetClientDataCompleted( event )
+{
+    // IW4MAdmin let us know it persisted (success or fail)
+    if ( level.iw4adminIntegrationDebug == 1 )
+    {
+        IPrintLn( "Set Client Data -> subtype = " + event.subType + " status = " + event.data["status"] );
+    }
+}
+
+//////////////////////////////////
+// Command Implementations
+/////////////////////////////////
+
+GiveWeaponImpl( data )
+{
+    if ( !IsAlive( self ) )
+    {
+        return self.name + "^7 is not alive";
+    }
+    
+    self IPrintLnBold( "You have been given a new weapon" );
+    self GiveWeapon( data["weaponName"] );
+    self SwitchToWeapon( data["weaponName"] );
+    
+    return self.name + "^7 has been given ^5" + data["weaponName"]; 
+}
+
+TakeWeaponsImpl()
+{
+    if ( !IsAlive( self ) )
+    {
+        return self.name + "^7 is not alive";
+    }
+    
+    self TakeAllWeapons();
+    self IPrintLnBold( "All your weapons have been taken" );
+    
+    return "Took weapons from " + self.name;
+}
+
+TeamSwitchImpl()
+{
+    if ( !IsAlive( self ) )
+    {
+        return self.name + "^7 is not alive";
+    }
+    
+    team = level.allies;
+    
+    if ( self.team == "allies" ) 
+    {
+        team = level.axis;
+    }
+    
+    self IPrintLnBold( "You are being team switched" );
+    wait( 2 );
+    self [[team]]();
+
+    return self.name + "^7 switched to " + self.team;
+}
+
+HideImpl()
+{
+    if ( !IsAlive( self ) )
+    {
+        self IPrintLnBold( "You are not alive" );
+        return;
+    }
+
+    if ( IsDefined( self.isHidden ) && self.isHidden )
+    {
+        self IPrintLnBold( "You are already hidden" );
+        return;
+    }
+
+    self SetClientDvar( "sv_cheats", 1 );
+    self SetClientDvar( "cg_thirdperson", 1 );
+    self SetClientDvar( "sv_cheats", 0 );
+
+    self.savedHealth = self.health;
+    self.health = 9999;
+    self.isHidden = true;
+    
+    self Hide();
+
+    self IPrintLnBold( "You are now ^5hidden ^7from other players" );
+}
+
+UnhideImpl()
+{
+    if ( !IsAlive( self ) )
+    {
+        self IPrintLnBold( "You are not alive" );
+        return;
+    }
+
+    self SetClientDvar( "sv_cheats", 1 );
+    self SetClientDvar( "cg_thirdperson", 0 );
+    self SetClientDvar( "sv_cheats", 0 );
+
+    self.health = self.savedHealth;
+    self.isHidden = false;
+
+    self Show();
+    self IPrintLnBold( "You are now ^5visible ^7to other players" );
+}
+
+AlertImpl( data )
+{
+    self thread maps\mp\gametypes\_hud_message::oldNotifyMessage( data["alertType"], data["message"], "compass_waypoint_target", ( 1, 0, 0 ), "ui_mp_nukebomb_timer", 7.5 );
+    return "Sent alert to " + self.name; 
+}
+
+GotoImpl( data )
+{
+    if ( !IsAlive( self ) )
+    {
+        self IPrintLnBold( "You are not alive" );
+        return;
+    }
+
+    position = ( int(data["x"]), int(data["y"]), int(data["z"]) );
+    self SetOrigin( position );
+    self IPrintLnBold( "Moved to " + "("+ position[0] + "," + position[1] + "," + position[2] + ")" );
+}
+
+GotoPlayerImpl( target )
+{
+    if ( !IsAlive( target ) )
+    {
+        self IPrintLnBold( target.name + " is not alive" );
+        return;
+    }
+
+    self SetOrigin( target GetOrigin() );
+    self IPrintLnBold( "Moved to " + target.name );
+}
+
+KillImpl()
+{
+    if ( !IsAlive( self ) )
+    {
+        return self.name + " is not alive";
+    }
+
+    self Suicide();
+    self IPrintLnBold( "You were killed by " + self.name );
+
+    return "You killed " + self.name;
+}
+
+NightModeImpl()
+{
+    if ( !IsDefined ( level.nightModeEnabled ) )
+    {
+        level.nightModeEnabled = true;
+    }
+    else
+    {
+       level.nightModeEnabled = !level.nightModeEnabled;
+    }
+
+    message = "^5NightMode ^7is disabled";
+
+    if ( level.nightModeEnabled )
+    {
+        message = "^5NightMode ^7is enabled";
+    }
+
+    IPrintLnBold( message );
+
+    foreach( player in level.players )
+    {
+        player ToggleNightMode();
+    }
+}
+
+ToggleNightMode()
+{
+    colorMap = 1;
+    fxDraw = 1;
+
+    if ( IsDefined( level.nightModeEnabled ) && level.nightModeEnabled )
+    {
+        colorMap = 0;
+        fxDraw = 0;
+    }
+
+    self SetClientDvar( "sv_cheats", 1 );
+    self SetClientDvar( "r_colorMap", colorMap );
+    self SetClientDvar( "fx_draw", fxDraw );
+    self SetClientDvar( "sv_cheats", 0 );
+}
+
+SetSpectatorImpl()
+{
+    if ( self.pers["team"] == "spectator" ) 
+    {
+        return self.name + " is already spectating";
+    }
+    
+    self [[level.spectator]]();
+    self IPrintLnBold( "You have been moved to spectator" );
+    
+    return self.name + " has been moved to spectator";
+}

IW4MAdmin.sln

@@ -6,7 +6,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{26E8
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8C8F3945-0AEF-4949-A1F7-B18E952E50BC}"
 	ProjectSection(SolutionItems) = preProject
-		GameFiles\IW4x\userraw\scripts\_commands.gsc = GameFiles\IW4x\userraw\scripts\_commands.gsc
 		GameFiles\IW4x\userraw\scripts\_customcallbacks.gsc = GameFiles\IW4x\userraw\scripts\_customcallbacks.gsc
 		DeploymentFiles\deployment-pipeline.yml = DeploymentFiles\deployment-pipeline.yml
 		DeploymentFiles\PostPublish.ps1 = DeploymentFiles\PostPublish.ps1
@@ -14,6 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		version.txt = version.txt
 		DeploymentFiles\UpdateIW4MAdmin.ps1 = DeploymentFiles\UpdateIW4MAdmin.ps1
 		DeploymentFiles\UpdateIW4MAdmin.sh = DeploymentFiles\UpdateIW4MAdmin.sh
+		GameFiles\IW4x\userraw\scripts\_integration.gsc = GameFiles\IW4x\userraw\scripts\_integration.gsc
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharedLibraryCore", "SharedLibraryCore\SharedLibraryCore.csproj", "{AA0541A2-8D51-4AD9-B0AC-3D1F5B162481}"
@@ -30,8 +30,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProfanityDeterment", "Plugi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Login", "Plugins\Login\Login.csproj", "{D9F2ED28-6FA5-40CA-9912-E7A849147AB1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IW4ScriptCommands", "Plugins\IW4ScriptCommands\IW4ScriptCommands.csproj", "{6C706CE5-A206-4E46-8712-F8C48D526091}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ScriptPlugins", "ScriptPlugins", "{3F9ACC27-26DB-49FA-BCD2-50C54A49C9FA}"
 	ProjectSection(SolutionItems) = preProject
 		Plugins\ScriptPlugins\ActionOnReport.js = Plugins\ScriptPlugins\ActionOnReport.js
@@ -253,30 +251,6 @@ Global
 		{D9F2ED28-6FA5-40CA-9912-E7A849147AB1}.Release|x64.Build.0 = Release|Any CPU
 		{D9F2ED28-6FA5-40CA-9912-E7A849147AB1}.Release|x86.ActiveCfg = Release|Any CPU
 		{D9F2ED28-6FA5-40CA-9912-E7A849147AB1}.Release|x86.Build.0 = Release|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|x64.Build.0 = Debug|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|x86.Build.0 = Debug|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|Any CPU.Build.0 = Prerelease|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|x64.ActiveCfg = Debug|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|x64.Build.0 = Debug|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|x86.ActiveCfg = Debug|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|x86.Build.0 = Debug|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|x64.ActiveCfg = Release|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|x64.Build.0 = Release|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|x86.ActiveCfg = Release|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|x86.Build.0 = Release|Any CPU
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -406,7 +380,6 @@ Global
 		{179140D3-97AA-4CB4-8BF6-A0C73CA75701} = {26E8B310-269E-46D4-A612-24601F16065F}
 		{958FF7EC-0226-4E85-A85B-B84EC768197D} = {26E8B310-269E-46D4-A612-24601F16065F}
 		{D9F2ED28-6FA5-40CA-9912-E7A849147AB1} = {26E8B310-269E-46D4-A612-24601F16065F}
-		{6C706CE5-A206-4E46-8712-F8C48D526091} = {26E8B310-269E-46D4-A612-24601F16065F}
 		{3F9ACC27-26DB-49FA-BCD2-50C54A49C9FA} = {26E8B310-269E-46D4-A612-24601F16065F}
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836} = {26E8B310-269E-46D4-A612-24601F16065F}
 		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD} = {26E8B310-269E-46D4-A612-24601F16065F}

Integrations/Cod/CodRConConnection.cs

@@ -23,7 +23,7 @@ namespace Integrations.Cod
     /// </summary>
     public class CodRConConnection : IRConConnection
     {
-        static readonly ConcurrentDictionary<EndPoint, ConnectionState> ActiveQueries = new ConcurrentDictionary<EndPoint, ConnectionState>();
+        private static readonly ConcurrentDictionary<EndPoint, ConnectionState> ActiveQueries = new();
         public IPEndPoint Endpoint { get; }
         public string RConPassword { get; }
 
@@ -48,7 +48,40 @@ namespace Integrations.Cod
             config = parser.Configuration;
         }
 
-        public async Task<string[]> SendQueryAsync(StaticHelpers.QueryType type, string parameters = "")
+        public async Task<string[]> SendQueryAsync(StaticHelpers.QueryType type, string parameters = "",
+            CancellationToken token = default)
+        {
+            try
+            {
+                return await SendQueryAsyncInternal(type, parameters, token);
+            }
+            catch (OperationCanceledException)
+            {
+                _log.LogWarning("Timed out waiting for RCon response");
+                throw new RConException("Did not received RCon response in allocated time frame");
+            }
+
+            finally
+            {
+                var state = ActiveQueries[Endpoint];
+                if (state.OnComplete.CurrentCount == 0)
+                {
+                    state.OnComplete.Release(1);
+                    state.ConnectionAttempts = 0;
+                }
+
+                if (state.OnReceivedData.CurrentCount == 0)
+                {
+                    state.OnReceivedData.Release(1);
+                }
+
+                if (state.OnSentData.CurrentCount == 0)
+                {
+                    state.OnSentData.Release(1);
+                }
+            }
+        }
+        private async Task<string[]> SendQueryAsyncInternal(StaticHelpers.QueryType type, string parameters = "", CancellationToken token = default)
         {
             if (!ActiveQueries.ContainsKey(this.Endpoint))
             {
@@ -57,36 +90,36 @@ namespace Integrations.Cod
 
             var connectionState = ActiveQueries[this.Endpoint];
 
-            _log.LogDebug("Waiting for semaphore to be released [{endpoint}]", Endpoint);
+            _log.LogDebug("Waiting for semaphore to be released [{Endpoint}]", Endpoint);
 
             // enter the semaphore so only one query is sent at a time per server.
-            await connectionState.OnComplete.WaitAsync();
+            await connectionState.OnComplete.WaitAsync(token);
 
             var timeSinceLastQuery = (DateTime.Now - connectionState.LastQuery).TotalMilliseconds;
 
-            if (timeSinceLastQuery < StaticHelpers.FloodProtectionInterval)
+            if (timeSinceLastQuery < config.FloodProtectInterval)
             {
-                await Task.Delay(StaticHelpers.FloodProtectionInterval - (int)timeSinceLastQuery);
+                await Task.Delay(config.FloodProtectInterval - (int)timeSinceLastQuery, token);
             }
 
             connectionState.LastQuery = DateTime.Now;
 
-            _log.LogDebug("Semaphore has been released [{endpoint}]", Endpoint);
-            _log.LogDebug("Query {@queryInfo}", new { endpoint=Endpoint.ToString(), type, parameters });
+            _log.LogDebug("Semaphore has been released [{Endpoint}]", Endpoint);
+            _log.LogDebug("Query {@QueryInfo}", new { endpoint=Endpoint.ToString(), type, parameters });
 
             byte[] payload = null;
-            bool waitForResponse = config.WaitForResponse;
+            var waitForResponse = config.WaitForResponse;
 
-            string convertEncoding(string text)
+            string ConvertEncoding(string text)
             {
-                byte[] convertedBytes = Utilities.EncodingType.GetBytes(text);
+                var convertedBytes = Utilities.EncodingType.GetBytes(text);
                 return _gameEncoding.GetString(convertedBytes);
             }
 
             try
             {
-                string convertedRConPassword = convertEncoding(RConPassword);
-                string convertedParameters = convertEncoding(parameters);
+                var convertedRConPassword = ConvertEncoding(RConPassword);
+                var convertedParameters = ConvertEncoding(parameters);
 
                 switch (type)
                 {
@@ -137,7 +170,7 @@ namespace Integrations.Cod
                 using (LogContext.PushProperty("Server", Endpoint.ToString()))
                 {
                     _log.LogInformation(
-                        "Retrying RCon message ({connectionAttempts}/{allowedConnectionFailures} attempts) with parameters {payload}", 
+                        "Retrying RCon message ({ConnectionAttempts}/{AllowedConnectionFailures} attempts) with parameters {payload}", 
                         connectionState.ConnectionAttempts, 
                         _retryAttempts, parameters);
                 }
@@ -151,20 +184,27 @@ namespace Integrations.Cod
             {
                 connectionState.SendEventArgs.UserToken = socket;
                 connectionState.ConnectionAttempts++;
-                await connectionState.OnSentData.WaitAsync();
-                await connectionState.OnReceivedData.WaitAsync();
+                await connectionState.OnSentData.WaitAsync(token);
+                await connectionState.OnReceivedData.WaitAsync(token);
                 connectionState.BytesReadPerSegment.Clear();
-                bool exceptionCaught = false;
+                var exceptionCaught = false;
 
-                _log.LogDebug("Sending {payloadLength} bytes to [{endpoint}] ({connectionAttempts}/{allowedConnectionFailures})",
+                _log.LogDebug("Sending {PayloadLength} bytes to [{Endpoint}] ({ConnectionAttempts}/{AllowedConnectionFailures})",
                 payload.Length, Endpoint, connectionState.ConnectionAttempts, _retryAttempts);
 
                 try
                 {
+                    try
+                    {
+                        response = await SendPayloadAsync(payload, waitForResponse,
+                            parser.OverrideTimeoutForCommand(parameters), token);
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        // ignored
+                    }
          
-                    response = await SendPayloadAsync(payload, waitForResponse, parser.OverrideTimeoutForCommand(parameters));
-
-                    if ((response.Length == 0 || response[0].Length == 0) && waitForResponse)
+                    if ((response?.Length == 0 || response[0].Length == 0) && waitForResponse)
                     {
                         throw new RConException("Expected response but got 0 bytes back");
                     }
@@ -178,14 +218,14 @@ namespace Integrations.Cod
                     if (connectionState.ConnectionAttempts < _retryAttempts)
                     {
                         exceptionCaught = true;
-                        await Task.Delay(StaticHelpers.SocketTimeout(connectionState.ConnectionAttempts));
+                        await Task.Delay(StaticHelpers.SocketTimeout(connectionState.ConnectionAttempts), token);
                         goto retrySend;
                     }
 
                     using (LogContext.PushProperty("Server", Endpoint.ToString()))
                     {
                         _log.LogWarning(
-                            "Made {connectionAttempts} attempts to send RCon data to server, but received no response",
+                            "Made {ConnectionAttempts} attempts to send RCon data to server, but received no response",
                             connectionState.ConnectionAttempts);
                     }
                     connectionState.ConnectionAttempts = 0;
@@ -214,14 +254,15 @@ namespace Integrations.Cod
 
             if (response.Length == 0)
             {
-                _log.LogDebug("Received empty response for RCon request {@query}", new { endpoint=Endpoint.ToString(), type, parameters });
-                return new string[0];
+                _log.LogDebug("Received empty response for RCon request {@Query}",
+                    new { endpoint = Endpoint.ToString(), type, parameters });
+                return Array.Empty<string>();
             }
 
-            string responseString = type == StaticHelpers.QueryType.COMMAND_STATUS ?
+            var responseString = type == StaticHelpers.QueryType.COMMAND_STATUS ?
                ReassembleSegmentedStatus(response) : RecombineMessages(response);
 
-            // note: not all games respond if the pasword is wrong or not set
+            // note: not all games respond if the password is wrong or not set
             if (responseString.Contains("Invalid password") || responseString.Contains("rconpassword"))
             {
                 throw new RConException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_RCON_INVALID"]);
@@ -237,21 +278,21 @@ namespace Integrations.Cod
                 throw new ServerException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_NOT_RUNNING"].FormatExt(Endpoint.ToString()));
             }
 
-            string responseHeaderMatch = Regex.Match(responseString, config.CommandPrefixes.RConResponse).Value;
-            string[] headerSplit = responseString.Split(type == StaticHelpers.QueryType.GET_INFO ? config.CommandPrefixes.RconGetInfoResponseHeader : responseHeaderMatch);
+            var responseHeaderMatch = Regex.Match(responseString, config.CommandPrefixes.RConResponse).Value;
+            var headerSplit = responseString.Split(type == StaticHelpers.QueryType.GET_INFO ? config.CommandPrefixes.RconGetInfoResponseHeader : responseHeaderMatch);
 
             if (headerSplit.Length != 2)
             {
                 using (LogContext.PushProperty("Server", Endpoint.ToString()))
                 {
-                    _log.LogWarning("Invalid response header from server. Expected {expected}, but got {response}",
+                    _log.LogWarning("Invalid response header from server. Expected {Expected}, but got {Response}",
                         config.CommandPrefixes.RConResponse, headerSplit.FirstOrDefault());
                 }
 
                 throw new RConException("Unexpected response header from server");
             }
 
-            string[] splitResponse = headerSplit.Last().Split(new char[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
+            var splitResponse = headerSplit.Last().Split(new char[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
             return splitResponse;
         }
 
@@ -312,7 +353,7 @@ namespace Integrations.Cod
             }
         }
 
-        private async Task<byte[][]> SendPayloadAsync(byte[] payload, bool waitForResponse, TimeSpan overrideTimeout)
+        private async Task<byte[][]> SendPayloadAsync(byte[] payload, bool waitForResponse, TimeSpan overrideTimeout, CancellationToken token = default)
         {
             var connectionState = ActiveQueries[this.Endpoint];
             var rconSocket = (Socket)connectionState.SendEventArgs.UserToken;
@@ -332,18 +373,27 @@ namespace Integrations.Cod
             connectionState.SendEventArgs.SetBuffer(payload);
 
             // send the data to the server
-            bool sendDataPending = rconSocket.SendToAsync(connectionState.SendEventArgs);
+            var sendDataPending = rconSocket.SendToAsync(connectionState.SendEventArgs);
 
             if (sendDataPending)
             {
                 // the send has not been completed asynchronously
                 // this really shouldn't ever happen because it's UDP
+                var complete = false;
+                try
+                {
+                    complete = await connectionState.OnSentData.WaitAsync(StaticHelpers.SocketTimeout(1), token);
+                }
+                catch (OperationCanceledException)
+                {
+                    // ignored
+                }
                 
-                if(!await connectionState.OnSentData.WaitAsync(StaticHelpers.SocketTimeout(1)))
+                if(!complete)
                 {
                     using(LogContext.PushProperty("Server", Endpoint.ToString()))
                     {
-                        _log.LogWarning("Socket timed out while sending RCon data on attempt {attempt}",
+                        _log.LogWarning("Socket timed out while sending RCon data on attempt {Attempt}",
                             connectionState.ConnectionAttempts);
                     }
                     rconSocket.Close();
@@ -359,17 +409,29 @@ namespace Integrations.Cod
             connectionState.ReceiveEventArgs.SetBuffer(connectionState.ReceiveBuffer);
 
             // get our response back
-            bool receiveDataPending = rconSocket.ReceiveFromAsync(connectionState.ReceiveEventArgs);
+            var receiveDataPending = rconSocket.ReceiveFromAsync(connectionState.ReceiveEventArgs);
 
             if (receiveDataPending)
             {
-                _log.LogDebug("Waiting to asynchronously receive data on attempt #{connectionAttempts}", connectionState.ConnectionAttempts);
-                if (!await connectionState.OnReceivedData.WaitAsync(
-                    new[]
-                    {
-                        StaticHelpers.SocketTimeout(connectionState.ConnectionAttempts), 
-                        overrideTimeout
-                    }.Max()))
+                _log.LogDebug("Waiting to asynchronously receive data on attempt #{ConnectionAttempts}", connectionState.ConnectionAttempts);
+
+                var completed = false;
+
+                try
+                {
+                    completed = await connectionState.OnReceivedData.WaitAsync(
+                        new[]
+                        {
+                            StaticHelpers.SocketTimeout(connectionState.ConnectionAttempts),
+                            overrideTimeout
+                        }.Max(), token);
+                }
+                catch (OperationCanceledException)
+                {
+                    // ignored
+                }
+                
+                if (!completed)
                 {
                     if (connectionState.ConnectionAttempts > 1) // this reduces some spam for unstable connections
                     {
@@ -388,16 +450,15 @@ namespace Integrations.Cod
             }
 
             rconSocket.Close();
-
             return GetResponseData(connectionState);
         }
 
         private byte[][] GetResponseData(ConnectionState connectionState)
         {
             var responseList = new List<byte[]>();
-            int totalBytesRead = 0;
+            var totalBytesRead = 0;
 
-            foreach (int bytesRead in connectionState.BytesReadPerSegment)
+            foreach (var bytesRead in connectionState.BytesReadPerSegment)
             {
                 responseList.Add(connectionState.ReceiveBuffer
                     .Skip(totalBytesRead)

Integrations/Source/SourceRConConnection.cs

@@ -48,12 +48,12 @@ namespace Integrations.Source
             _activeQuery.Dispose();
         }
 
-        public async Task<string[]> SendQueryAsync(StaticHelpers.QueryType type, string parameters = "")
+        public async Task<string[]> SendQueryAsync(StaticHelpers.QueryType type, string parameters = "",  CancellationToken token = default)
         {
             try
             {
-                await _activeQuery.WaitAsync();
-                await WaitForAvailable();
+                await _activeQuery.WaitAsync(token);
+                await WaitForAvailable(token);
 
                 if (_needNewSocket)
                 {
@@ -66,7 +66,7 @@ namespace Integrations.Source
                         // ignored
                     }
 
-                    await Task.Delay(ConnectionTimeout);
+                    await Task.Delay(ConnectionTimeout, token);
                     _rconClient = _rconClientFactory.CreateClient(_ipEndPoint);
                     _authenticated = false;
                     _needNewSocket = false;
@@ -147,12 +147,12 @@ namespace Integrations.Source
             }
         }
 
-        private async Task WaitForAvailable()
+        private async Task WaitForAvailable(CancellationToken token)
         {
             var diff = DateTime.Now - _lastQuery;
             if (diff < FloodDelay)
             {
-                await Task.Delay(FloodDelay - diff);
+                await Task.Delay(FloodDelay - diff, token);
             }
         }
 

Plugins/AutomessageFeed/AutomessageFeed.csproj

@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SyndicationFeed.ReaderWriter" Version="1.0.2" />
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.28.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.2.28.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/IW4ScriptCommands/Commands/KillPlayerCommand.cs

@@ -1,44 +0,0 @@
-using SharedLibraryCore;
-using SharedLibraryCore.Commands;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Interfaces;
-using System.Threading.Tasks;
-
-namespace IW4ScriptCommands.Commands
-{
-    /// <summary>
-    /// Example script command
-    /// </summary>
-    public class KillPlayerCommand : Command
-    {
-        public KillPlayerCommand(CommandConfiguration config, ITranslationLookup lookup) : base(config, lookup)
-        {
-            Name = "killplayer";
-            Description = "kill a player";
-            Alias = "kp";
-            Permission = EFClient.Permission.Administrator;
-            RequiresTarget = true;
-            Arguments = new[]
-            {
-                new CommandArgument()
-                {
-                    Name = "player",
-                    Required = true
-                }
-            };
-        }
-
-        public override async Task ExecuteAsync(GameEvent E)
-        {
-            var cmd = new ScriptCommand()
-            {
-                CommandName = "killplayer",
-                ClientNumber = E.Target.ClientNumber,
-                CommandArguments = new[] { E.Origin.ClientNumber.ToString() }
-            };
-
-            await cmd.Execute(E.Owner);
-        }
-    }
-}

Plugins/IW4ScriptCommands/GscApiController.cs

@@ -1,44 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using SharedLibraryCore;
-using SharedLibraryCore.Interfaces;
-using System.Linq;
-using System.Text;
-
-namespace WebfrontCore.Controllers.API
-{
-    [Route("api/gsc/[action]")]
-    public class GscApiController : BaseController
-    {
-        public GscApiController(IManager manager) : base(manager)
-        {
-
-        }
-
-        /// <summary>
-        /// grabs basic info about the client from IW4MAdmin
-        /// </summary>
-        /// <param name="networkId"></param>
-        /// <returns></returns>
-        [HttpGet("{networkId}")]
-        public IActionResult ClientInfo(string networkId)
-        {
-            long decimalNetworkId = networkId.ConvertGuidToLong(System.Globalization.NumberStyles.HexNumber);
-            var clientInfo = Manager.GetActiveClients()
-                .FirstOrDefault(c => c.NetworkId == decimalNetworkId);
-
-            if (clientInfo != null)
-            {
-                var sb = new StringBuilder();
-                sb.AppendLine($"admin={clientInfo.IsPrivileged()}");
-                sb.AppendLine($"level={(int)clientInfo.Level}");
-                sb.AppendLine($"levelstring={clientInfo.Level.ToLocalizedLevelName()}");
-                sb.AppendLine($"connections={clientInfo.Connections}");
-                sb.AppendLine($"authenticated={clientInfo.GetAdditionalProperty<bool>("IsLoggedIn") == true}");
-
-                return Content(sb.ToString());
-            }
-
-            return Content("");
-        }
-    }
-}

Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj

@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <ApplicationIcon />
-    <StartupObject />
-    <Configurations>Debug;Release;Prerelease</Configurations>
-    <LangVersion>Latest</LangVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.28.1" PrivateAssets="All" />
-  </ItemGroup>
-
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="dotnet publish $(ProjectPath) -c $(ConfigurationName) -o $(ProjectDir)..\..\Build\Plugins --no-build --no-restore --no-dependencies" />
-  </Target>
-  
-</Project>

Plugins/IW4ScriptCommands/Plugin.cs

@@ -1,46 +0,0 @@
-using SharedLibraryCore;
-using SharedLibraryCore.Interfaces;
-using System.Threading.Tasks;
-
-namespace IW4ScriptCommands
-{
-    public class Plugin : IPlugin
-    {
-        public string Name => "IW4 Script Commands";
-
-        public float Version => 1.0f;
-
-        public string Author => "RaidMax";
-
-        public async Task OnEventAsync(GameEvent E, Server S)
-        {
-            if (E.Type == GameEvent.EventType.Start)
-            {
-                await S.SetDvarAsync("sv_iw4madmin_serverid", S.EndPoint);
-            }
-
-            if (E.Type == GameEvent.EventType.Warn)
-            {
-                var cmd = new ScriptCommand()
-                {
-                    ClientNumber = E.Target.ClientNumber,
-                    CommandName = "alert",
-                    CommandArguments = new[]
-                    {
-                        "Warning",
-                        "ui_mp_nukebomb_timer",
-                        E.Data
-                    }
-                };
-                // notifies the player ingame of the warning
-                await cmd.Execute(S);
-            }
-        }
-
-        public Task OnLoadAsync(IManager manager) => Task.CompletedTask;
-
-        public Task OnTickAsync(Server S) => Task.CompletedTask;
-
-        public Task OnUnloadAsync() => Task.CompletedTask;
-    }
-}

Plugins/IW4ScriptCommands/ScriptCommand.cs

@@ -1,36 +0,0 @@
-using SharedLibraryCore;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace IW4ScriptCommands
-{
-    /// <summary>
-    /// Contains basic properties for command information read by gsc
-    /// </summary>
-    class ScriptCommand
-    {
-        /// <summary>
-        /// Name of the command to execute
-        /// </summary>
-        public string CommandName { get; set; }
-
-        /// <summary>
-        /// Target client number
-        /// </summary>
-        public int ClientNumber { get; set; }
-
-        /// <summary>
-        /// Arguments for the script function itself
-        /// </summary>
-        public string[] CommandArguments { get; set; } = new string[0];
-
-        public override string ToString() => string.Join(";", new[] { CommandName, ClientNumber.ToString() }.Concat(CommandArguments).Select(_arg => _arg.Replace(";", "")));
-
-        /// <summary>
-        /// Executes the command 
-        /// </summary>
-        /// <param name="server">server to execute the command on</param>
-        /// <returns></returns>
-        public async Task Execute(Server server) => await server.SetDvarAsync("sv_iw4madmin_command", ToString());
-    }
-}

Plugins/LiveRadar/LiveRadar.csproj

@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.28.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.2.28.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/Login/Login.csproj

@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.28.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.2.28.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/ProfanityDeterment/ProfanityDeterment.csproj

@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.28.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.2.28.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/ScriptPlugins/GameInterface.js

@@ -8,7 +8,7 @@
 const servers = {};
 const inDvar = 'sv_iw4madmin_in';
 const outDvar = 'sv_iw4madmin_out';
-const pollRate = 1000;
+const pollRate = 750;
 let logger = {};
 
 let plugin = {
@@ -17,9 +17,13 @@ let plugin = {
     name: 'Game Interface',
 
     onEventAsync: (gameEvent, server) => {
+        if (servers[server.EndPoint] != null && !servers[server.EndPoint].enabled) {
+            return;
+        }
+
         const eventType = eventTypes[gameEvent.Type];
 
-        if (servers[server.EndPoint] != null && !servers[server.EndPoint].enabled) {
+        if (eventType === undefined) {
             return;
         }
 
@@ -33,7 +37,7 @@ let plugin = {
                 break;
             case 'preconnect':
                 // when the plugin is reloaded after the servers are started
-                if (servers[server.EndPoint] == null) {
+                if (servers[server.EndPoint] === undefined || servers[server.EndPoint] == null) {
                     const enabled = initialize(server);
 
                     if (!enabled) {
@@ -45,11 +49,6 @@ let plugin = {
                     timer.Start(0, pollRate);
                 }
                 break;
-            case 'disconnect':
-                if (server.ClientNum === 0 && servers[server.EndPoint] != null) {
-                    servers[server.EndPoint].timer.Stop();
-                }
-                break;
             case 'warn':
                 const warningTitle = _localization.LocalizationIndex['GLOBAL_WARNING'];
                 sendScriptCommand(server, 'Alert', gameEvent.Target, {
@@ -67,7 +66,9 @@ let plugin = {
 
     onUnloadAsync: () => {
         for (let i = 0; i < servers.length; i++) {
-            servers[i].timer.Stop();
+            if (servers[i].enabled) {
+                servers[i].timer.Stop();
+            }
         }
     },
 
@@ -76,146 +77,244 @@ let plugin = {
 };
 
 let commands = [{
-    // required
     name: 'giveweapon',
-    // required
     description: 'gives specified weapon',
-    // required
     alias: 'gw',
-    // required
     permission: 'SeniorAdmin',
-    // optional (defaults to false)
-    targetRequired: false,
-    // optional
+    targetRequired: true,
     arguments: [{
+        name: 'player',
+        required: true
+    },
+    {
         name: 'weapon name',
         required: true
     }],
     supportedGames: ['IW4'],
-    // required
     execute: (gameEvent) => {
-        sendScriptCommand(gameEvent.Owner, 'GiveWeapon', gameEvent.Origin, {weaponName: gameEvent.Data});
+        if (!validateEnabled(gameEvent.Owner, gameEvent.Origin)) {
+            return;
+        }
+        sendScriptCommand(gameEvent.Owner, 'GiveWeapon', gameEvent.Origin, gameEvent.Target, {weaponName: gameEvent.Data});
     }
 },
-    {
-        // required
-        name: 'takeweapons',
-        // required
-        description: 'take all weapons from specifies player',
-        // required
-        alias: 'tw',
-        // required
-        permission: 'SeniorAdmin',
-        // optional (defaults to false)
-        targetRequired: true,
-        // optional
-        arguments: [],
-        supportedGames: ['IW4'],
-        // required
-        execute: (gameEvent) => {
-            sendScriptCommand(gameEvent.Owner, 'TakeWeapons', gameEvent.Target, undefined);
+{
+    name: 'takeweapons',
+    description: 'take all weapons from specified player',
+    alias: 'tw',
+    permission: 'SeniorAdmin',
+    targetRequired: true,
+    arguments: [{
+        name: 'player',
+        required: true
+    }],
+    supportedGames: ['IW4'],
+    execute: (gameEvent) => {
+        if (!validateEnabled(gameEvent.Owner, gameEvent.Origin)) {
+            return;
         }
-    },
-    {
-        // required
-        name: 'switchteam',
-        // required
-        description: 'switches specified player to the opposite team',
-        // required
-        alias: 'st',
-        // required
-        permission: 'Administrator',
-        // optional (defaults to false)
-        targetRequired: true,
-        // optional
-        arguments: [{
-            name: 'player',
-            required: true
-        }],
-        supportedGames: ['IW4'],
-        // required
-        execute: (gameEvent) => {
-            sendScriptCommand(gameEvent.Owner, 'SwitchTeams', gameEvent.Target, undefined);
-        }
-    },
-    {
-        // required
-        name: 'hide',
-        // required
-        description: 'hide yourself',
-        // required
-        alias: 'hi',
-        // required
-        permission: 'SeniorAdmin',
-        // optional (defaults to false)
-        targetRequired: false,
-        // optional
-        arguments: [],
-        supportedGames: ['IW4'],
-        // required
-        execute: (gameEvent) => {
-            sendScriptCommand(gameEvent.Owner, 'Hide', gameEvent.Origin, undefined);
-        }
-    },
-    {
-        // required
-        name: 'unhide',
-        // required
-        description: 'unhide yourself',
-        // required
-        alias: 'unh',
-        // required
-        permission: 'SeniorAdmin',
-        // optional (defaults to false)
-        targetRequired: false,
-        // optional
-        arguments: [],
-        supportedGames: ['IW4'],
-        // required
-        execute: (gameEvent) => {
-            sendScriptCommand(gameEvent.Owner, 'Unhide', gameEvent.Origin, undefined);
-        }
-    },
-    {
-        // required
-        name: 'alert',
-        // required
-        description: 'alert a player',
-        // required
-        alias: 'alr',
-        // required
-        permission: 'SeniorAdmin',
-        // optional (defaults to false)
-        targetRequired: true,
-        // optional
-        arguments: [{
-            name: 'alert message',
-            required: true
-        }],
-        supportedGames: ['IW4'],
-        // required
-        execute: (gameEvent) => {
-            sendScriptCommand(gameEvent.Owner, 'Alert', gameEvent.Target, {
-                alertType: 'Alert',
-                message: gameEvent.Data
-            });
-        }
-    }];
-
-const sendScriptCommand = (server, command, target, data) => {
-    if (plugin.enabled) {
-        sendEvent(server, false, 'ExecuteCommandRequested', command, target, data);
+        sendScriptCommand(gameEvent.Owner, 'TakeWeapons', gameEvent.Origin, gameEvent.Target, undefined);
     }
+},
+{
+    name: 'switchteam',
+    description: 'switches specified player to the opposite team',
+    alias: 'st',
+    permission: 'Administrator',
+    targetRequired: true,
+    arguments: [{
+        name: 'player',
+        required: true
+    }],
+    supportedGames: ['IW4'],
+    execute: (gameEvent) => {
+        if (!validateEnabled(gameEvent.Owner, gameEvent.Origin)) {
+            return;
+        }
+        sendScriptCommand(gameEvent.Owner, 'SwitchTeams', gameEvent.Origin, gameEvent.Target, undefined);
+    }
+},
+{
+    name: 'hide',
+    description: 'hide yourself ingame',
+    alias: 'hi',
+    permission: 'SeniorAdmin',
+    targetRequired: false,
+    arguments: [],
+    supportedGames: ['IW4'],
+    execute: (gameEvent) => {
+        if (!validateEnabled(gameEvent.Owner, gameEvent.Origin)) {
+            return;
+        }
+        sendScriptCommand(gameEvent.Owner, 'Hide', gameEvent.Origin, gameEvent.Origin, undefined);
+    }
+},
+{
+    name: 'unhide',
+    description: 'unhide yourself ingame',
+    alias: 'unh',
+    permission: 'SeniorAdmin',
+    targetRequired: false,
+    arguments: [],
+    supportedGames: ['IW4'],
+    execute: (gameEvent) => {
+        if (!validateEnabled(gameEvent.Owner, gameEvent.Origin)) {
+            return;
+        }
+        sendScriptCommand(gameEvent.Owner, 'Unhide', gameEvent.Origin, gameEvent.Origin, undefined);
+    }
+},
+{
+    name: 'alert',
+    description: 'alert a player',
+    alias: 'alr',
+    permission: 'SeniorAdmin',
+    targetRequired: true,
+    arguments: [{
+        name: 'player',
+        required: true
+    },
+        {
+            name: 'message',
+            required: true
+        }],
+    supportedGames: ['IW4'],
+    execute: (gameEvent) => {
+        if (!validateEnabled(gameEvent.Owner, gameEvent.Origin)) {
+            return;
+        }
+        sendScriptCommand(gameEvent.Owner, 'Alert', gameEvent.Origin, gameEvent.Target, {
+            alertType: 'Alert',
+            message: gameEvent.Data
+        });
+    }
+},
+{
+    name: 'gotoplayer',
+    description: 'teleport to a player',
+    alias: 'g2p',
+    permission: 'SeniorAdmin',
+    targetRequired: true,
+    arguments: [{
+        name: 'player',
+        required: true
+    }],
+    supportedGames: ['IW4'],
+    execute: (gameEvent) => {
+        if (!validateEnabled(gameEvent.Owner, gameEvent.Origin)) {
+            return;
+        }
+        sendScriptCommand(gameEvent.Owner, 'Goto', gameEvent.Origin, gameEvent.Target, undefined);
+    }
+},
+{
+    name: 'goto',
+    description: 'teleport to a position',
+    alias: 'g2',
+    permission: 'SeniorAdmin',
+    targetRequired: false,
+    arguments: [{
+        name: 'x',
+        required: true
+    },
+    {
+        name: 'y',
+        required: true
+    },
+    {
+        name: 'z',
+        required: true
+    }],
+    supportedGames: ['IW4'],
+    execute: (gameEvent) => {
+        if (!validateEnabled(gameEvent.Owner, gameEvent.Origin)) {
+            return;
+        }
+        
+        const args = String(gameEvent.Data).split(' ');
+        sendScriptCommand(gameEvent.Owner, 'Goto', gameEvent.Origin, gameEvent.Target, {
+            x: args[0],
+            y: args[1],
+            z: args[2]
+        });
+    }
+},
+{
+    name: 'kill',
+    description: 'kill a player',
+    alias: 'kpl',
+    permission: 'SeniorAdmin',
+    targetRequired: true,
+    arguments: [{
+        name: 'player',
+        required: true
+    }],
+    supportedGames: ['IW4'],
+    execute: (gameEvent) => {
+        if (!validateEnabled(gameEvent.Owner, gameEvent.Origin)) {
+            return;
+        }
+        sendScriptCommand(gameEvent.Owner, 'Kill', gameEvent.Origin, gameEvent.Target, undefined);
+    }
+},
+{
+    name: 'nightmode',
+    description: 'sets server into nightmode',
+    alias: 'nitem',
+    permission: 'SeniorAdmin',
+    targetRequired: false,
+    arguments: [],
+    supportedGames: ['IW4'],
+    execute: (gameEvent) => {
+        if (!validateEnabled(gameEvent.Owner, gameEvent.Origin)) {
+            return;
+        }
+        sendScriptCommand(gameEvent.Owner, 'NightMode', gameEvent.Origin, undefined, undefined);
+    }
+},
+{
+    name: 'setspectator',
+    description: 'sets a player as spectator',
+    alias: 'spec',
+    permission: 'Administrator',
+    targetRequired: true,
+    arguments: [{
+        name: 'player',
+        required: true
+    }],
+    supportedGames: ['IW4'],
+    execute: (gameEvent) => {
+        if (!validateEnabled(gameEvent.Owner, gameEvent.Origin)) {
+            return;
+        }
+        sendScriptCommand(gameEvent.Owner, 'SetSpectator', gameEvent.Origin, gameEvent.Target, undefined);
+    }
+}];
+
+const sendScriptCommand = (server, command, origin, target, data) => {
+    const state = servers[server.EndPoint];
+    if (state === undefined || !state.enabled) {
+        return;
+    }
+    sendEvent(server, false, 'ExecuteCommandRequested', command, origin, target, data);
 }
 
-const sendEvent = (server, responseExpected, event, subtype, client, data) => {
+const sendEvent = (server, responseExpected, event, subtype, origin, target, data) => {
     const logger = _serviceResolver.ResolveService('ILogger');
 
     let pendingOut = true;
     let pendingCheckCount = 0;
-    while (pendingOut === true && pendingCheckCount <= 10) {
+    const start = new Date();
+
+    while (pendingOut && pendingCheckCount <= 10) {
+        if (server.Throttled) {
+            logger.WriteWarning('Server is throttled, so we are not attempting to send data');
+            return;
+        }
+        
         try {
-            pendingOut = server.GetServerDvar(outDvar) !== null;
+            const out = server.GetServerDvar(outDvar);
+            pendingOut = !(out == null || out === '' || out === 'null');
         } catch (error) {
             logger.WriteError(`Could not check server output dvar for IO status ${error}`);
         }
@@ -224,25 +323,25 @@ const sendEvent = (server, responseExpected, event, subtype, client, data) => {
             logger.WriteDebug('Waiting for event bus to be cleared');
             System.Threading.Tasks.Task.Delay(1000).Wait();
         }
+        
         pendingCheckCount++;
     }
 
-    if (pendingCheckCount === true) {
+    if (pendingOut) {
         logger.WriteWarning(`Reached maximum attempts waiting for output to be available for ${server.EndPoint}`)
     }
 
-    let clientNumber = '';
-    if (client !== undefined) {
-        clientNumber = client.ClientNumber;
+    let targetClientNumber = -1;
+    if (target != null) {
+        targetClientNumber = target.ClientNumber;
     }
-    if (responseExpected === undefined) {
-        responseExpected = 0;
-    }
-    const output = `${responseExpected ? '1' : '0'};${event};${subtype};${clientNumber};${buildDataString(data)}`;
+
+    const output = `${responseExpected ? '1' : '0'};${event};${subtype};${origin.ClientNumber};${targetClientNumber};${buildDataString(data)}`;
     logger.WriteDebug(`Sending output to server ${output}`);
 
     try {
         server.SetServerDvar(outDvar, output);
+        logger.WriteDebug(`SendEvent took ${(new Date() - start) / 1000}ms`);
     } catch (error) {
         logger.WriteError(`Could not set server output dvar ${error}`);
     }
@@ -259,12 +358,17 @@ const parseEvent = (input) => {
         eventType: eventInfo[1],
         subType: eventInfo[2],
         clientNumber: eventInfo[3],
-        data: eventInfo.length > 4 ? eventInfo [4] : undefined
+        data: eventInfo.length > 4 ? parseDataString(eventInfo[4]) : undefined
     }
 }
 
 const initialize = (server) => {
     const logger = _serviceResolver.ResolveService('ILogger');
+
+    servers[server.EndPoint] = {
+        enabled: false
+    }
+
     let enabled = false;
     try {
         enabled = server.GetServerDvar('sv_iw4madmin_integration_enabled') === '1';
@@ -272,24 +376,21 @@ const initialize = (server) => {
         logger.WriteError(`Could not get integration status of ${server.EndPoint} - ${error}`);
     }
 
-    logger.WriteDebug(`GSC Integration enabledGSC Integration enabled = ${enabled}`);
+    logger.WriteInfo(`GSC Integration enabled = ${enabled}`);
 
     if (!enabled) {
-        servers[server.EndPoint] = {
-            enabled: false
-        }
         return false;
     }
 
     logger.WriteDebug(`Setting up bus timer for ${server.EndPoint}`);
 
-    let timer = _timerHelper;
-    timer.OnTick(() => pollForEvents(server), `GameEventPoller ${server.ToString()}`)
+    let timer = _serviceResolver.ResolveService('IScriptPluginTimerHelper');
+    timer.OnTick(() => pollForEvents(server), `GameEventPoller ${server.ToString()}`);
+    // necessary to prevent multi-threaded access to the JS context
+    timer.SetDependency(_lock);
 
-    servers[server.EndPoint] = {
-        timer: timer,
-        enabled: true
-    }
+    servers[server.EndPoint].timer = timer;
+    servers[server.EndPoint].enabled = true;
 
     try {
         server.SetServerDvar(inDvar, '');
@@ -302,6 +403,10 @@ const initialize = (server) => {
 };
 
 const pollForEvents = server => {
+    if (server.Throttled) {
+        return;
+    }
+    
     const logger = _serviceResolver.ResolveService('ILogger');
 
     let input;
@@ -317,34 +422,71 @@ const pollForEvents = server => {
     }
 
     if (input.length > 0) {
-
         const event = parseEvent(input)
 
-        logger.WriteInfo(`Processing input... ${event.eventType}`);
+        logger.WriteDebug(`Processing input... ${event.eventType} ${event.subType} ${event.data} ${event.clientNumber}`);
 
+        // todo: refactor to mapping if possible
         if (event.eventType === 'ClientDataRequested') {
             const client = server.GetClientByNumber(event.clientNumber);
 
             if (client != null) {
-                logger.WriteInfo(`Found client ${client.Name}`);
+                logger.WriteDebug(`Found client ${client.Name}`);
 
                 let data = [];
 
                 if (event.subType === 'Meta') {
                     const metaService = _serviceResolver.ResolveService('IMetaService');
-                    const meta = metaService.GetPersistentMeta(event.data, client).Result;
+                    const meta = metaService.GetPersistentMeta(event.data, client).GetAwaiter().GetResult();
                     data[event.data] = meta === null ? '' : meta.Value;
                 } else {
                     data = {
                         level: client.Level,
+                        clientId: client.ClientId,
                         lastConnection: client.LastConnection
                     };
                 }
 
-                sendEvent(server, false, 'ClientDataReceived', event.subType, client, data);
+                sendEvent(server, false, 'ClientDataReceived', event.subType, client, undefined, data);
+            } else {
+                logger.WriteWarning(`Could not find client slot ${event.clientNumber} when processing ${event.eventType}`);
+                sendEvent(server, false, 'ClientDataReceived', 'Fail', event.clientNumber, undefined, {ClientNumber: event.clientNumber});
+            }
+        }
+
+        if (event.eventType === 'SetClientDataRequested') {
+            let client = server.GetClientByNumber(event.clientNumber);
+            let clientId;
+
+            if (client != null) {
+                clientId = client.ClientId;
+            } else {
+                clientId = parseInt(event.data.clientId);
             }
 
-            logger.WriteWarning(`Could not find client slot ${event.clientNumber} when processing ${event.eventType}`);
+            logger.WriteDebug(`ClientId=${clientId}`);
+
+            if (clientId == null) {
+                logger.WriteWarning(`Could not find client slot ${event.clientNumber} when processing ${event.eventType}`);
+                sendEvent(server, false, 'SetClientDataCompleted', 'Meta', {ClientNumber: event.clientNumber}, undefined, {status: 'Fail'});
+            } else {
+                if (event.subType === 'Meta') {
+                    const metaService = _serviceResolver.ResolveService('IMetaService');
+                    try {
+                        logger.WriteDebug(`Key=${event.data['key']}, Value=${event.data['value']}`);
+                        if (event.data['direction'] != null) {
+                            event.data['direction'] = 'up'
+                                ? metaService.IncrementPersistentMeta(event.data['key'], event.data['value'], clientId).GetAwaiter().GetResult()
+                                : metaService.DecrementPersistentMeta(event.data['key'], event.data['value'], clientId).GetAwaiter().GetResult();
+                        } else {
+                            metaService.SetPersistentMeta(event.data['key'], event.data['value'], clientId).GetAwaiter().GetResult();
+                        }
+                        sendEvent(server, false, 'SetClientDataCompleted', 'Meta', {ClientNumber: event.clientNumber}, undefined,{status: 'Complete'});
+                    } catch (error) {
+                        sendEvent(server, false, 'SetClientDataCompleted', 'Meta', {ClientNumber: event.clientNumber}, undefined,{status: 'Fail'});
+                    }
+                }
+            }
         }
 
         try {
@@ -352,6 +494,8 @@ const pollForEvents = server => {
         } catch (error) {
             logger.WriteError(`Could not reset in bus value for ${server.EndPoint} - ${error}`);
         }
+    } else if (server.ClientNum === 0) {
+        servers[server.EndPoint].timer.Stop();
     }
 }
 
@@ -368,3 +512,29 @@ const buildDataString = data => {
 
     return formattedData.substring(0, Math.max(0, formattedData.length - 1));
 }
+
+const parseDataString = data => {
+    if (data === undefined) {
+        return '';
+    }
+
+    const dict = {}
+
+    for (const segment of data.split('|')) {
+        const keyValue = segment.split('=');
+        if (keyValue.length !== 2) {
+            continue;
+        }
+        dict[keyValue[0]] = keyValue[1];
+    }
+
+    return dict.length === 0 ? data : dict;
+}
+
+const validateEnabled = (server, origin) => {
+    const enabled = servers[server.EndPoint] != null && servers[server.EndPoint].enabled;
+    if (!enabled) {
+        origin.Tell("Game interface is not enabled on this server");
+    }
+    return enabled;
+}

Plugins/ScriptPlugins/ParserIW4x.js

@@ -3,7 +3,7 @@ var eventParser;
 
 var plugin = {
     author: 'RaidMax',
-    version: 0.5,
+    version: 0.6,
     name: 'IW4x Parser',
     isParser: true,
 
@@ -20,10 +20,11 @@ var plugin = {
         rconParser.Configuration.CommandPrefixes.Ban     = 'clientkick {0} "{1}"';
         rconParser.Configuration.CommandPrefixes.TempBan = 'tempbanclient {0} "{1}"';
         
-        rconParser.Configuration.DefaultRConPort                = 28960;
-        rconParser.Configuration.DefaultInstallationDirectoryHint   = 'HKEY_CURRENT_USER\\Software\\Classes\\iw4x\\shell\\open\\command';
+        rconParser.Configuration.DefaultRConPort = 28960;
+        rconParser.Configuration.DefaultInstallationDirectoryHint = 'HKEY_CURRENT_USER\\Software\\Classes\\iw4x\\shell\\open\\command';
+        rconParser.Configuration.FloodProtectInterval = 150;
 
-        eventParser.Configuration.GameDirectory          = 'userraw';
+        eventParser.Configuration.GameDirectory = 'userraw';
 
         rconParser.Version = 'IW4x (v0.6.0)';
         rconParser.GameName = 2; // IW4x

Plugins/Stats/Stats.csproj

@@ -17,7 +17,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.28.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.2.28.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/Welcome/Welcome.csproj

@@ -20,7 +20,7 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.28.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.2.28.1" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>

README.md

@@ -14,7 +14,7 @@ Latest binary builds are always available at:
 **IW4MAdmin** requires minimal effort to get up and running.
 ### Prerequisites
 * [.NET Core 6.0.x Runtime](https://www.microsoft.com/net/download)
-    * [Direct Download (Windows)](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-aspnetcore-6.0.1-windows-x64-installer)
+    * [Direct Download (Windows)](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-aspnetcore-6.0.1-windows-hosting-bundle-installer)
     * [Package Installation Instructions (Linux)](https://docs.microsoft.com/en-us/dotnet/core/install/linux)
 ### Installation
 1. Install .NET Core Runtime

SharedLibraryCore/Commands/NativeCommands.cs

@@ -378,29 +378,31 @@ namespace SharedLibraryCore.Commands
             };
         }
 
-        public override async Task ExecuteAsync(GameEvent E)
+        public override async Task ExecuteAsync(GameEvent gameEvent)
         {
             // todo: don't do the lookup here
-            var penalties = await E.Owner.Manager.GetPenaltyService().GetActivePenaltiesAsync(E.Target.AliasLinkId, E.Target.CurrentAliasId);
+            var penalties = await gameEvent.Owner.Manager.GetPenaltyService().GetActivePenaltiesAsync(gameEvent.Target.AliasLinkId,
+                gameEvent.Target.CurrentAliasId, gameEvent.Target.NetworkId, gameEvent.Target.CurrentAlias.IPAddress);
+            
             if (penalties
                     .FirstOrDefault(p =>
                         p.Type == EFPenalty.PenaltyType.Ban || p.Type == EFPenalty.PenaltyType.TempBan) != null)
             {
-                switch ((await E.Target.Unban(E.Data, E.Origin)
-                            .WaitAsync(Utilities.DefaultCommandTimeout, E.Owner.Manager.CancellationToken)).FailReason)
+                switch ((await gameEvent.Target.Unban(gameEvent.Data, gameEvent.Origin)
+                            .WaitAsync(Utilities.DefaultCommandTimeout, gameEvent.Owner.Manager.CancellationToken)).FailReason)
                 {
                     case GameEvent.EventFailReason.None:
-                        E.Origin.Tell(_translationLookup["COMMANDS_UNBAN_SUCCESS"].FormatExt(E.Target));
+                        gameEvent.Origin.Tell(_translationLookup["COMMANDS_UNBAN_SUCCESS"].FormatExt(gameEvent.Target));
                         break;
                     default:
-                        E.Origin.Tell(_translationLookup["SERVER_ERROR_COMMAND_INGAME"]);
+                        gameEvent.Origin.Tell(_translationLookup["SERVER_ERROR_COMMAND_INGAME"]);
                         break;
                 }
             }
 
             else
             {
-                E.Origin.Tell(_translationLookup["COMMANDS_UNBAN_FAIL"].FormatExt(E.Target));
+                gameEvent.Origin.Tell(_translationLookup["COMMANDS_UNBAN_FAIL"].FormatExt(gameEvent.Target));
             }
         }
     }
@@ -850,7 +852,7 @@ namespace SharedLibraryCore.Commands
         {
             Name = "mask";
             Description = _translationLookup["COMMANDS_MASK_DESC"];
-            Alias = "hide";
+            Alias = "ma";
             Permission = Permission.Moderator;
             RequiresTarget = false;
         }
@@ -898,7 +900,7 @@ namespace SharedLibraryCore.Commands
         public override async Task ExecuteAsync(GameEvent E)
         {
             var existingPenalties = await E.Owner.Manager.GetPenaltyService()
-                .GetActivePenaltiesAsync(E.Target.AliasLinkId, E.Target.CurrentAliasId, E.Target.IPAddress);
+                .GetActivePenaltiesAsync(E.Target.AliasLinkId, E.Target.CurrentAliasId, E.Target.NetworkId, E.Target.IPAddress);
             var penalty = existingPenalties.FirstOrDefault(b => b.Type > EFPenalty.PenaltyType.Kick);
 
             if (penalty == null)
@@ -1188,7 +1190,7 @@ namespace SharedLibraryCore.Commands
 
         public static async Task<string> GetNextMap(Server s, ITranslationLookup lookup)
         {
-            var mapRotation = (await s.GetDvarAsync<string>("sv_mapRotation")).Value?.ToLower() ?? "";
+            var mapRotation = (await s.GetDvarAsync<string>("sv_mapRotation", token: s.Manager.CancellationToken)).Value?.ToLower() ?? "";
             var regexMatches = Regex.Matches(mapRotation,
                     @"((?:gametype|exec) +(?:([a-z]{1,4})(?:.cfg)?))? *map ([a-z|_|\d]+)", RegexOptions.IgnoreCase)
                 .ToList();

SharedLibraryCore/Dtos/Meta/Responses/PermissionLevelChangedResponse.cs

@@ -0,0 +1,20 @@
+using System;
+using Data.Models.Client;
+
+namespace SharedLibraryCore.Dtos.Meta.Responses;
+
+public class PermissionLevelChangedResponse : BaseMetaResponse
+{
+    public EFClient.Permission PreviousPermissionLevel =>
+        (EFClient.Permission)Enum.Parse(typeof(EFClient.Permission),
+            PreviousPermissionLevelValue ?? EFClient.Permission.User.ToString());
+
+    public string PreviousPermissionLevelValue { get; set; }
+
+    public EFClient.Permission CurrentPermissionLevel => (EFClient.Permission)Enum.Parse(typeof(EFClient.Permission),
+        CurrentPermissionLevelValue ?? EFClient.Permission.User.ToString());
+
+    public string CurrentPermissionLevelValue { get; set; }
+    public int ChangedById { get; set; }
+    public string ChangedByName { get; set; }
+}

SharedLibraryCore/Interfaces/IClientMeta.cs

@@ -20,6 +20,7 @@ namespace SharedLibraryCore.Interfaces
 
     public enum MetaType
     {
+        All = -1,
         Other,
         Information,
         AliasUpdate,
@@ -27,6 +28,7 @@ namespace SharedLibraryCore.Interfaces
         Penalized,
         ReceivedPenalty,
         QuickMessage,
-        ConnectionHistory
+        ConnectionHistory,
+        PermissionLevel,
     }
 }

SharedLibraryCore/Interfaces/IGameLogReader.cs

@@ -23,7 +23,8 @@ namespace SharedLibraryCore.Interfaces
         /// </summary>
         /// <param name="fileSizeDiff"></param>
         /// <param name="startPosition"></param>
+        /// <param name="server"></param>
         /// <returns></returns>
-        Task<IEnumerable<GameEvent>> ReadEventsFromLog(long fileSizeDiff, long startPosition);
+        Task<IEnumerable<GameEvent>> ReadEventsFromLog(long fileSizeDiff, long startPosition, Server server);
     }
 }

SharedLibraryCore/Interfaces/IMetaService.cs

@@ -19,6 +19,35 @@ namespace SharedLibraryCore.Interfaces
         /// <returns></returns>
         Task AddPersistentMeta(string metaKey, string metaValue, EFClient client, EFMeta linkedMeta = null);
 
+        /// <summary>
+        /// adds or updates meta key and value to the database
+        /// </summary>
+        /// <param name="metaKey">key of meta data</param>
+        /// <param name="metaValue">value of the meta data</param>
+        /// <param name="clientId">id of the client to save the meta for</param>
+        /// <returns></returns>
+        Task SetPersistentMeta(string metaKey, string metaValue, int clientId);
+
+        /// <summary>
+        /// increments meta value and persists to the database
+        /// <remarks>if the meta value does not already exist it will be set to the increment amount</remarks>
+        /// </summary>
+        /// <param name="metaKey">key of meta data</param>
+        /// <param name="incrementAmount">value to increment by</param>
+        /// <param name="clientId">id of the client to save the meta for</param>
+        /// <returns></returns>
+        Task IncrementPersistentMeta(string metaKey, int incrementAmount, int clientId);
+        
+        /// <summary>
+        /// decrements meta value and persists to the database
+        /// <remarks>if the meta value does not already exist it will be set to the decrement amount</remarks>
+        /// </summary>
+        /// <param name="metaKey">key of meta data</param>
+        /// <param name="decrementAmount">value to increment by</param>
+        /// <param name="clientId">id of the client to save the meta for</param>
+        /// <returns></returns>
+        Task DecrementPersistentMeta(string metaKey, int decrementAmount, int clientId);
+
         /// <summary>
         ///     adds or updates meta key and value to the database
         /// </summary>

SharedLibraryCore/Interfaces/IPluginImporter.cs

@@ -18,6 +18,6 @@ namespace SharedLibraryCore.Interfaces
         ///     discovers the script plugins
         /// </summary>
         /// <returns>initialized script plugin collection</returns>
-        IEnumerable<Func<IServiceProvider, IPlugin>> DiscoverScriptPlugins();
+        IEnumerable<IPlugin> DiscoverScriptPlugins();
     }
 }

SharedLibraryCore/Interfaces/IRConConnection.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Threading;
+using System.Threading.Tasks;
 using SharedLibraryCore.RCon;
 
 namespace SharedLibraryCore.Interfaces
@@ -14,7 +15,7 @@ namespace SharedLibraryCore.Interfaces
         /// <param name="type">type of RCon query to perform</param>
         /// <param name="parameters">optional parameter list</param>
         /// <returns></returns>
-        Task<string[]> SendQueryAsync(StaticHelpers.QueryType type, string parameters = "");
+        Task<string[]> SendQueryAsync(StaticHelpers.QueryType type, string parameters = "", CancellationToken token = default);
 
         /// <summary>
         ///     sets the rcon parser

SharedLibraryCore/Interfaces/IRConParser.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using static SharedLibraryCore.Server;
 
@@ -52,7 +53,7 @@ namespace SharedLibraryCore.Interfaces
         /// <param name="dvarName">name of DVAR</param>
         /// <param name="fallbackValue">default value to return if dvar retrieval fails</param>
         /// <returns></returns>
-        Task<Dvar<T>> GetDvarAsync<T>(IRConConnection connection, string dvarName, T fallbackValue = default);
+        Task<Dvar<T>> GetDvarAsync<T>(IRConConnection connection, string dvarName, T fallbackValue = default, CancellationToken token = default);
 
         /// <summary>
         ///     set value of DVAR by name
@@ -61,7 +62,7 @@ namespace SharedLibraryCore.Interfaces
         /// <param name="dvarName">name of DVAR to set</param>
         /// <param name="dvarValue">value to set DVAR to</param>
         /// <returns></returns>
-        Task<bool> SetDvarAsync(IRConConnection connection, string dvarName, object dvarValue);
+        Task<bool> SetDvarAsync(IRConConnection connection, string dvarName, object dvarValue, CancellationToken token = default);
 
         /// <summary>
         ///     executes a console command on the server
@@ -69,7 +70,7 @@ namespace SharedLibraryCore.Interfaces
         /// <param name="connection">RCon connection to use</param>
         /// <param name="command">console command to execute</param>
         /// <returns></returns>
-        Task<string[]> ExecuteCommandAsync(IRConConnection connection, string command);
+        Task<string[]> ExecuteCommandAsync(IRConConnection connection, string command, CancellationToken token = default);
         
         /// <summary>
         ///     get the list of connected clients from status response
@@ -78,7 +79,7 @@ namespace SharedLibraryCore.Interfaces
         /// <returns>
         ///     <see cref="IStatusResponse" />
         /// </returns>
-        Task<IStatusResponse> GetStatusAsync(IRConConnection connection);
+        Task<IStatusResponse> GetStatusAsync(IRConConnection connection, CancellationToken token = default);
 
         /// <summary>
         ///     retrieves the value of given dvar key if it exists in the override dict

SharedLibraryCore/Interfaces/IRConParserConfiguration.cs

@@ -100,5 +100,7 @@ namespace SharedLibraryCore.Interfaces
         string DefaultInstallationDirectoryHint { get; }
 
         ColorCodeMapping ColorCodeMapping { get; }
+        
+        short FloodProtectInterval { get; }
     }
 }

SharedLibraryCore/PartialEntities/EFClient.cs

@@ -653,7 +653,7 @@ namespace SharedLibraryCore.Database.Models
 
                 // we want to get any penalties that are tied to their IP or AliasLink (but not necessarily their GUID)
                 var activePenalties = await CurrentServer.Manager.GetPenaltyService()
-                    .GetActivePenaltiesAsync(AliasLinkId, CurrentAliasId, ipAddress);
+                    .GetActivePenaltiesAsync(AliasLinkId, CurrentAliasId, NetworkId, ipAddress);
                 var banPenalty = activePenalties.FirstOrDefault(_penalty => _penalty.Type == EFPenalty.PenaltyType.Ban);
                 var tempbanPenalty =
                     activePenalties.FirstOrDefault(_penalty => _penalty.Type == EFPenalty.PenaltyType.TempBan);

SharedLibraryCore/Server.cs

@@ -377,7 +377,7 @@ namespace SharedLibraryCore
         {
             try
             {
-                return (await this.GetDvarAsync("sv_customcallbacks", "0")).Value == "1";
+                return (await this.GetDvarAsync("sv_customcallbacks", "0", Manager.CancellationToken)).Value == "1";
             }
 
             catch (DvarException)
@@ -390,17 +390,46 @@ namespace SharedLibraryCore
 
         public string[] ExecuteServerCommand(string command)
         {
-            return this.ExecuteCommandAsync(command).GetAwaiter().GetResult();
+            var tokenSource = new CancellationTokenSource();
+            tokenSource.CancelAfter(TimeSpan.FromSeconds(0.5));
+
+            try
+            {
+                return this.ExecuteCommandAsync(command, tokenSource.Token).GetAwaiter().GetResult();
+            }
+            catch
+            {
+                return null;
+            }
         }
 
         public string GetServerDvar(string dvarName)
         {
-            return this.GetDvarAsync<string>(dvarName).GetAwaiter().GetResult()?.Value;
+            var tokenSource = new CancellationTokenSource();
+            tokenSource.CancelAfter(TimeSpan.FromSeconds(0.5));
+            try
+            {
+                return this.GetDvarAsync<string>(dvarName, token: tokenSource.Token).GetAwaiter().GetResult().Value;
+            }
+            catch
+            {
+                return null;
+            }
         }
 
-        public void SetServerDvar(string dvarName, string dvarValue)
+        public bool SetServerDvar(string dvarName, string dvarValue)
         {
-            this.SetDvarAsync(dvarName, dvarValue).GetAwaiter().GetResult();
+            var tokenSource = new CancellationTokenSource();
+            tokenSource.CancelAfter(TimeSpan.FromSeconds(0.5));
+            try
+            {
+                this.SetDvarAsync(dvarName, dvarValue, tokenSource.Token).GetAwaiter().GetResult();
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
         }
 
         public EFClient GetClientByNumber(int clientNumber) =>

SharedLibraryCore/Services/ClientService.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using Data.Abstractions;
@@ -464,7 +465,7 @@ namespace SharedLibraryCore.Services
                     // link2 is deleted
                     // link2 penalties are orphaned
                     await context.Penalties
-                        .Where(_penalty => completeAliasLinkIds.Contains(_penalty.LinkId))
+                        .Where(_penalty => completeAliasLinkIds.Contains(_penalty.LinkId ?? -1))
                         .ForEachAsync(_penalty => _penalty.LinkId = newAliasLink.AliasLinkId);
 
                     entity.AliasLink = newAliasLink;
@@ -596,51 +597,16 @@ namespace SharedLibraryCore.Services
         /// <returns></returns>
         public virtual async Task UpdateLevel(Permission newPermission, EFClient temporalClient, EFClient origin)
         {
-            await using var ctx = _contextFactory.CreateContext();
-            var entity = await ctx.Clients
-                .Where(_client => _client.ClientId == temporalClient.ClientId)
+            await using var context = _contextFactory.CreateContext();
+            var entity = await context.Clients
+                .Where(client => client.ClientId == temporalClient.ClientId)
                 .FirstAsync();
 
-            var oldPermission = entity.Level;
+            _logger.LogInformation("Updating {ClientId} from {OldPermission} to {NewPermission} ",
+                temporalClient.ClientId, entity.Level, newPermission);
 
             entity.Level = newPermission;
-            await ctx.SaveChangesAsync();
-
-            using (LogContext.PushProperty("Server", temporalClient?.CurrentServer?.ToString()))
-            {
-                _logger.LogInformation("Updated {clientId} to {newPermission}", temporalClient.ClientId, newPermission);
-
-                var linkedPermissionSet = new[] { Permission.Banned, Permission.Flagged };
-                // if their permission level has been changed to level that needs to be updated on all accounts
-                if (linkedPermissionSet.Contains(newPermission) || linkedPermissionSet.Contains(oldPermission))
-                {
-                    //get all clients that have the same linkId
-                    var iqMatchingClients = ctx.Clients
-                        .Where(_client => _client.AliasLinkId == entity.AliasLinkId);
-
-                    var iqLinkClients = new List<Data.Models.Client.EFClient>().AsQueryable();
-                    if (!_appConfig.EnableImplicitAccountLinking)
-                    {
-                        var linkIds = await ctx.Aliases.Where(alias =>
-                                alias.IPAddress != null && alias.IPAddress == temporalClient.IPAddress)
-                            .Select(alias => alias.LinkId)
-                            .ToListAsync();
-                        iqLinkClients = ctx.Clients.Where(client => linkIds.Contains(client.AliasLinkId));
-                    }
-
-                    // this updates the level for all the clients with the same LinkId
-                    // only if their new level is flagged or banned
-                    await iqMatchingClients.Union(iqLinkClients).ForEachAsync(_client =>
-                    {
-                        _client.Level = newPermission;
-                        _logger.LogInformation("Updated linked {clientId} to {newPermission}", _client.ClientId,
-                            newPermission);
-                    });
-
-                    await ctx.SaveChangesAsync();
-                }
-            }
-
+            await context.SaveChangesAsync();
             temporalClient.Level = newPermission;
         }
 
@@ -839,13 +805,14 @@ namespace SharedLibraryCore.Services
             }
             catch
             {
+                // ignored
             }
 
             var ipAddress = trimmedIdentifier.ConvertToIP();
 
             var iqLinkIds = context.Aliases.Where(_alias => _alias.Active);
 
-            // we want to query for the IP ADdress
+            // we want to query for the IP Address
             if (ipAddress != null)
             {
                 iqLinkIds = iqLinkIds.Where(_alias => _alias.IPAddress == ipAddress);
@@ -866,12 +833,22 @@ namespace SharedLibraryCore.Services
             var iqClients = context.Clients
                 .Where(_client => _client.Active);
 
+            var match = Regex.Match(trimmedIdentifier ?? "", "\"(.+)\"");
 
-            iqClients = iqClients.Where(_client => networkId == _client.NetworkId ||
-                                                   linkIds.Contains(_client.AliasLinkId)
-                                                   || !_appConfig.EnableImplicitAccountLinking &&
-                                                   _client.CurrentAlias.IPAddress != null &&
-                                                   _client.CurrentAlias.IPAddress == ipAddress);
+            if (match.Success)
+            {
+                iqClients = iqClients.Where(client =>
+                    client.CurrentAlias.SearchableName.ToLower().Equals(match.Groups[1].ToString().ToLower()));
+            }
+
+            else
+            {
+                iqClients = iqClients.Where(_client => networkId == _client.NetworkId ||
+                                                       linkIds.Contains(_client.AliasLinkId)
+                                                       || !_appConfig.EnableImplicitAccountLinking &&
+                                                       _client.CurrentAlias.IPAddress != null &&
+                                                       _client.CurrentAlias.IPAddress == ipAddress);
+            }
 
             // we want to project our results 
             var iqClientProjection = iqClients.OrderByDescending(_client => _client.LastConnection)

SharedLibraryCore/Services/PenaltyService.cs

@@ -31,7 +31,7 @@ namespace SharedLibraryCore.Services
                 Active = true,
                 OffenderId = newEntity.Offender.ClientId,
                 PunisherId = newEntity.Punisher.ClientId,
-                LinkId = newEntity.Link.AliasLinkId,
+                LinkId = newEntity.Link?.AliasLinkId,
                 Type = newEntity.Type,
                 Expires = newEntity.Expires,
                 Offense = newEntity.Offense,
@@ -41,6 +41,18 @@ namespace SharedLibraryCore.Services
                 IsEvadedOffense = newEntity.IsEvadedOffense
             };
             
+            if (LinkedPenalties.Contains(newEntity.Type))
+            {
+                var penaltyIdentifiers = new EFPenaltyIdentifier
+                {
+                    Penalty = penalty,
+                    NetworkId = newEntity.Offender.NetworkId,
+                    IPv4Address = newEntity.Offender.CurrentAlias.IPAddress
+                };
+
+                context.PenaltyIdentifiers.Add(penaltyIdentifiers);
+            }
+
             context.Penalties.Add(penalty);
             await context.SaveChangesAsync();
 
@@ -103,64 +115,25 @@ namespace SharedLibraryCore.Services
             return await iqPenalties.ToListAsync();
         }
 
-        /// <summary>
-        ///     retrieves penalty information for meta service
-        /// </summary>
-        /// <param name="clientId">database id of the client</param>
-        /// <param name="count">how many items to retrieve</param>
-        /// <param name="offset">not used</param>
-        /// <param name="startAt">retreive penalties older than this</param>
-        /// <returns></returns>
-        public async Task<IList<PenaltyInfo>> GetClientPenaltyForMetaAsync(int clientId, int count, int offset,
-            DateTime? startAt)
+        private static readonly EFPenalty.PenaltyType[] LinkedPenalties =
+            { EFPenalty.PenaltyType.Ban, EFPenalty.PenaltyType.Flag, EFPenalty.PenaltyType.TempBan };
+
+        private static readonly Expression<Func<EFPenalty, bool>> Filter = p =>
+            LinkedPenalties.Contains(p.Type) && p.Active && (p.Expires == null || p.Expires > DateTime.UtcNow);
+
+        private static readonly Expression<Func<EFPenaltyIdentifier, bool>> FilterById = pi =>
+            LinkedPenalties.Contains(pi.Penalty.Type) && pi.Penalty.Active &&
+            (pi.Penalty.Expires == null || pi.Penalty.Expires > DateTime.UtcNow);
+
+        public async Task<List<EFPenalty>> GetActivePenaltiesAsync(int linkId, int currentAliasId, long networkId,
+            int? ip = null)
         {
-            var linkedPenaltyType = Utilities.LinkedPenaltyTypes();
+            var penaltiesByIdentifier = await GetActivePenaltiesByIdentifier(ip, networkId);
 
-            await using var context = _contextFactory.CreateContext(false);
-            var linkId = await context.Clients.AsNoTracking()
-                .Where(_penalty => _penalty.ClientId == clientId)
-                .Select(_penalty => _penalty.AliasLinkId)
-                .FirstOrDefaultAsync();
-
-            var iqPenalties = context.Penalties.AsNoTracking()
-                .Where(_penalty => _penalty.OffenderId == clientId || _penalty.PunisherId == clientId ||
-                                   linkedPenaltyType.Contains(_penalty.Type) && _penalty.LinkId == linkId)
-                .Where(_penalty => _penalty.When <= startAt)
-                .OrderByDescending(_penalty => _penalty.When)
-                .Skip(offset)
-                .Take(count)
-                .Select(_penalty => new PenaltyInfo
-                {
-                    Id = _penalty.PenaltyId,
-                    Offense = _penalty.Offense,
-                    AutomatedOffense = _penalty.AutomatedOffense,
-                    OffenderId = _penalty.OffenderId,
-                    OffenderName = _penalty.Offender.CurrentAlias.Name,
-                    PunisherId = _penalty.PunisherId,
-                    PunisherName = _penalty.Punisher.CurrentAlias.Name,
-                    PunisherLevel = _penalty.Punisher.Level,
-                    PenaltyType = _penalty.Type,
-                    Expires = _penalty.Expires,
-                    TimePunished = _penalty.When,
-                    IsEvade = _penalty.IsEvadedOffense
-                });
-
-            return await iqPenalties.Distinct().ToListAsync();
-        }
-
-        public async Task<List<EFPenalty>> GetActivePenaltiesAsync(int linkId, int currentAliasId, int? ip = null,
-            bool includePunisherName = false)
-        {
-            var now = DateTime.UtcNow;
-
-            Expression<Func<EFPenalty, bool>> filter = p => new[]
-                                                            {
-                                                                EFPenalty.PenaltyType.TempBan,
-                                                                EFPenalty.PenaltyType.Ban,
-                                                                EFPenalty.PenaltyType.Flag
-                                                            }.Contains(p.Type) &&
-                                                            p.Active &&
-                                                            (p.Expires == null || p.Expires > now);
+            if (penaltiesByIdentifier.Any())
+            {
+                return penaltiesByIdentifier;
+            }
 
             await using var context = _contextFactory.CreateContext(false);
 
@@ -171,12 +144,13 @@ namespace SharedLibraryCore.Services
                 iqIpPenalties = context.Aliases
                     .Where(a => a.IPAddress != null && a.IPAddress == ip)
                     .SelectMany(a => a.Link.ReceivedPenalties)
-                    .Where(filter);
+                    .Where(Filter);
             }
             else
             {
                 var usedIps = await context.Aliases.AsNoTracking()
-                    .Where(alias => (alias.LinkId == linkId || alias.AliasId == currentAliasId) && alias.IPAddress != null)
+                    .Where(alias =>
+                        (alias.LinkId == linkId || alias.AliasId == currentAliasId) && alias.IPAddress != null)
                     .Select(alias => alias.IPAddress).ToListAsync();
 
                 var aliasedIds = await context.Aliases.AsNoTracking().Where(alias => usedIps.Contains(alias.IPAddress))
@@ -184,8 +158,8 @@ namespace SharedLibraryCore.Services
                     .ToListAsync();
 
                 iqIpPenalties = context.Penalties.AsNoTracking()
-                    .Where(penalty => aliasedIds.Contains(penalty.LinkId) || penalty.LinkId == linkId)
-                    .Where(filter);
+                    .Where(penalty => aliasedIds.Contains(penalty.LinkId ?? -1) || penalty.LinkId == linkId)
+                    .Where(Filter);
             }
 
             var activeIpPenalties = await iqIpPenalties.ToListAsync();
@@ -195,11 +169,35 @@ namespace SharedLibraryCore.Services
             return activePenalties.OrderByDescending(p => p.When).ToList();
         }
 
-        public virtual async Task RemoveActivePenalties(int aliasLinkId, int? ipAddress = null)
+        public async Task<List<EFPenalty>> GetActivePenaltiesByIdentifier(int? ip, long networkId)
+        {
+            await using var context = _contextFactory.CreateContext(false);
+            var activePenaltiesIds = context.PenaltyIdentifiers.Where(identifier =>
+                    identifier.IPv4Address != null && identifier.IPv4Address == ip || identifier.NetworkId == networkId)
+                .Where(FilterById);
+            return await activePenaltiesIds.Select(ids => ids.Penalty).ToListAsync();
+        }
+
+        public virtual async Task RemoveActivePenalties(int aliasLinkId, long networkId, int? ipAddress = null)
         {
             await using var context = _contextFactory.CreateContext();
-
             var now = DateTime.UtcNow;
+
+            var activePenalties = await GetActivePenaltiesByIdentifier(ipAddress, networkId);
+
+            if (activePenalties.Any())
+            {
+                var ids = activePenalties.Select(penalty => penalty.PenaltyId);
+                await context.Penalties.Where(penalty => ids.Contains(penalty.PenaltyId))
+                    .ForEachAsync(penalty =>
+                    {
+                        penalty.Active = false;
+                        penalty.Expires = now;
+                    });
+                await context.SaveChangesAsync();
+                return;
+            }
+
             var penaltiesByLink = context.Penalties
                 .Where(p => p.LinkId == aliasLinkId)
                 .Where(p => p.Expires > now || p.Expires == null);

SharedLibraryCore/SharedLibraryCore.csproj

@@ -4,7 +4,7 @@
         <OutputType>Library</OutputType>
         <TargetFramework>net6.0</TargetFramework>
         <PackageId>RaidMax.IW4MAdmin.SharedLibraryCore</PackageId>
-        <Version>2022.01.28.1</Version>
+        <Version>2022.2.28.1</Version>
         <Authors>RaidMax</Authors>
         <Company>Forever None</Company>
         <Configurations>Debug;Release;Prerelease</Configurations>
@@ -19,7 +19,7 @@
         <IsPackable>true</IsPackable>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <Description>Shared Library for IW4MAdmin</Description>
-        <PackageVersion>2022.01.28.1</PackageVersion>
+        <PackageVersion>2022.2.28.1</PackageVersion>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Prerelease|AnyCPU'">

SharedLibraryCore/Utilities.cs

@@ -723,14 +723,21 @@ namespace SharedLibraryCore
                 .Replace('/', '_');
         }
 
-        public static Task<Dvar<T>> GetDvarAsync<T>(this Server server, string dvarName, T fallbackValue = default)
+        public static async Task<Dvar<T>> GetDvarAsync<T>(this Server server, string dvarName,
+            T fallbackValue = default, CancellationToken token = default)
         {
-            return server.RconParser.GetDvarAsync(server.RemoteConnection, dvarName, fallbackValue);
+            return await server.RconParser.GetDvarAsync(server.RemoteConnection, dvarName, fallbackValue, token);
+        }
+        
+        public static async Task<Dvar<T>> GetDvarAsync<T>(this Server server, string dvarName,
+            T fallbackValue = default)
+        {
+            return await GetDvarAsync(server, dvarName, fallbackValue, default);
         }
 
         public static async Task<Dvar<T>> GetMappedDvarValueOrDefaultAsync<T>(this Server server, string dvarName,
             string infoResponseName = null, IDictionary<string, string> infoResponse = null,
-            T overrideDefault = default)
+            T overrideDefault = default, CancellationToken token = default)
         {
             // todo: unit test this
             var mappedKey = server.RconParser.GetOverrideDvarName(dvarName);
@@ -749,22 +756,32 @@ namespace SharedLibraryCore
                 };
             }
 
-            return await server.GetDvarAsync(mappedKey, defaultValue);
+            return await server.GetDvarAsync(mappedKey, defaultValue, token: token);
         }
 
-        public static Task SetDvarAsync(this Server server, string dvarName, object dvarValue)
+        public static async Task SetDvarAsync(this Server server, string dvarName, object dvarValue, CancellationToken token = default)
         {
-            return server.RconParser.SetDvarAsync(server.RemoteConnection, dvarName, dvarValue);
+            await server.RconParser.SetDvarAsync(server.RemoteConnection, dvarName, dvarValue, token);
+        }
+        
+        public static async Task SetDvarAsync(this Server server, string dvarName, object dvarValue)
+        {
+            await SetDvarAsync(server, dvarName, dvarValue, default);
+        }
+
+        public static async Task<string[]> ExecuteCommandAsync(this Server server, string commandName, CancellationToken token = default)
+        {
+            return await server.RconParser.ExecuteCommandAsync(server.RemoteConnection, commandName, token);
         }
         
         public static async Task<string[]> ExecuteCommandAsync(this Server server, string commandName)
         {
-            return await server.RconParser.ExecuteCommandAsync(server.RemoteConnection, commandName);
+            return await ExecuteCommandAsync(server, commandName, default);
         }
 
-        public static Task<IStatusResponse> GetStatusAsync(this Server server)
+        public static Task<IStatusResponse> GetStatusAsync(this Server server, CancellationToken token)
         {
-            return server.RconParser.GetStatusAsync(server.RemoteConnection);
+            return server.RconParser.GetStatusAsync(server.RemoteConnection, token);
         }
 
         /// <summary>
@@ -956,6 +973,19 @@ namespace SharedLibraryCore
             }
         }
 
+        public static async Task<T> WithWaitCancellation<T>(this Task<T> task,
+            CancellationToken cancellationToken)
+        {
+            var completedTask = await Task.WhenAny(task, Task.Delay(Timeout.Infinite, cancellationToken));
+            if (completedTask == task)
+            {
+                return await task;
+            }
+
+            cancellationToken.ThrowIfCancellationRequested();
+            throw new InvalidOperationException("Infinite delay task completed.");
+        }
+
         public static async Task<T> WithTimeout<T>(this Task<T> task, TimeSpan timeout)
         {
             await Task.WhenAny(task, Task.Delay(timeout));

WebfrontCore/Controllers/Client/ClientController.cs

@@ -35,7 +35,8 @@ namespace WebfrontCore.Controllers
                 return NotFound();
             }
 
-            var activePenalties = await Manager.GetPenaltyService().GetActivePenaltiesAsync(client.AliasLinkId, client.CurrentAliasId, client.IPAddress);
+            var activePenalties = await Manager.GetPenaltyService().GetActivePenaltiesAsync(client.AliasLinkId,
+                client.CurrentAliasId, client.NetworkId, client.IPAddress);
 
             var persistentMetaTask = new[]
             {
@@ -52,6 +53,14 @@ namespace WebfrontCore.Controllers
                 client.SetAdditionalProperty(EFMeta.ClientTag, tag.LinkedMeta.Value);
             }
 
+            // even though we haven't set their level to "banned" yet
+            // (ie they haven't reconnected with the infringing player identifier)
+            // we want to show them as banned as to not confuse people.
+            if (activePenalties.Any(penalty => penalty.Type == EFPenalty.PenaltyType.Ban))
+            {
+                client.Level = Data.Models.Client.EFClient.Permission.Banned;
+            }
+
             var displayLevelInt = (int)client.Level;
             var displayLevel = client.Level.ToLocalizedLevelName();
 

WebfrontCore/ViewComponents/ProfileMetaListViewComponent.cs

@@ -38,11 +38,12 @@ namespace WebfrontCore.ViewComponents
             return View("_List", meta);
         }
 
-        public static async Task<IEnumerable<IClientMeta>> GetClientMeta(IMetaService metaService, MetaType? metaType, EFClient.Permission level, ClientPaginationRequest request)
+        public static async Task<IEnumerable<IClientMeta>> GetClientMeta(IMetaService metaService, MetaType? metaType,
+            EFClient.Permission level, ClientPaginationRequest request)
         {
             IEnumerable<IClientMeta> meta = null;
 
-            if (metaType == null) // all types
+            if (metaType is null or MetaType.All)
             {
                 meta = await metaService.GetRuntimeMeta(request);
             }
@@ -69,6 +70,10 @@ namespace WebfrontCore.ViewComponents
                     case MetaType.ConnectionHistory:
                         meta = await metaService.GetRuntimeMeta<ConnectionHistoryResponse>(request, metaType.Value);
                         break;
+                    case MetaType.PermissionLevel:
+                        meta = await metaService.GetRuntimeMeta<PermissionLevelChangedResponse>(request,
+                            metaType.Value);
+                        break;
                 }
             }
 

WebfrontCore/Views/Client/Profile/Index.cshtml

@@ -6,11 +6,11 @@
     var match = System.Text.RegularExpressions.Regex.Match(Model.Name.ToUpper(), "[A-Z]").Value;
     var shortCode = match == string.Empty ? "?" : match;
     var gravatarUrl = Model.Meta.FirstOrDefault(m => m.Key == "GravatarEmail")?.Value;
-    var isFlagged = Model.LevelInt == (int) EFClient.Permission.Flagged;
-    var isPermBanned = Model.LevelInt == (int) EFClient.Permission.Banned;
+    var isFlagged = Model.LevelInt == (int)EFClient.Permission.Flagged;
+    var isPermBanned = Model.LevelInt == (int)EFClient.Permission.Banned;
     var isTempBanned = Model.ActivePenalty?.Type == EFPenalty.PenaltyType.TempBan;
     var translationKey = $"WEBFRONT_PROFILE_{Model.ActivePenalty?.Type.ToString().ToUpper()}_INFO";
-    var ignoredMetaTypes = new[] {MetaType.Information, MetaType.Other, MetaType.QuickMessage};
+    var ignoredMetaTypes = new[] { MetaType.Information, MetaType.Other, MetaType.QuickMessage };
 }
 
 <div id="profile_wrapper" class="pb-3 row d-flex flex-column flex-lg-row">
@@ -44,7 +44,7 @@
                 @foreach (var linked in Model.LinkedAccounts)
                 {
                     <div>
-                        @Html.ActionLink(linked.Value.ToString("X"), "ProfileAsync", "Client", new {id = linked.Key}, new {@class = "link-inverse"})
+                        @Html.ActionLink(linked.Value.ToString("X"), "ProfileAsync", "Client", new { id = linked.Key }, new { @class = "link-inverse" })
                     </div>
                 }
                 @foreach (var alias in Model.Aliases)
@@ -58,6 +58,7 @@
                 {
                     <div>
                         <a class="ip-locate-link" href="#" data-ip="@ip">@ip</a>
+                        <a href="/Client/FindAsync?clientName=@ip" class="oi oi-magnifying-glass text-muted"></a>
                     </div>
                 }
             </div>
@@ -110,12 +111,12 @@
                 <div class="profile-action oi oi-flag h3 ml-2 @(isFlagged ? "text-secondary" : "text-success")" data-action="@(isFlagged ? "unflag" : "flag")" aria-hidden="true"></div>
             }
 
-            @if (Model.LevelInt < (int) ViewBag.User.Level && !Model.HasActivePenalty)
+            @if (Model.LevelInt < (int)ViewBag.User.Level && !Model.HasActivePenalty)
             {
                 <div id="profile_action_ban_btn" class="profile-action oi oi-lock-unlocked text-success h3 ml-2" title="Ban Client" data-action="ban" aria-hidden="true"></div>
             }
 
-            @if (Model.LevelInt < (int) ViewBag.User.Level && Model.HasActivePenalty)
+            @if (Model.LevelInt < (int)ViewBag.User.Level && Model.HasActivePenalty)
             {
                 @if (isTempBanned)
                 {
@@ -146,30 +147,44 @@
 </div>
 
 <div class="row border-bottom">
-    <div class="text-center bg-dark p-2 pl-3 pr-4 text-muted col-12 col-md-auto" id="filter_meta_container_button">
-        <span class="oi oi-sort-ascending"></span>
-        <a>@ViewBag.Localization["WEBFRONT_CLIENT_META_FILTER"]</a>
-    </div>
-    <div class="d-none d-md-flex flex-fill" id="filter_meta_container">
-        <a asp-action="ProfileAsync" asp-controller="Client"
-           class="nav-link p-2 pl-3 pr-3 text-center col-12 col-md-auto text-md-left @(!Model.MetaFilterType.HasValue ? "btn-primary text-white" : "text-muted")"
-           asp-route-id="@Model.ClientId">
-            @ViewBag.Localization["META_TYPE_ALL_NAME"]
-        </a>
-
-        @foreach (MetaType type in Enum.GetValues(typeof(MetaType)))
-        {
-            if (!ignoredMetaTypes.Contains(type))
+    <div class="d-md-flex flex-fill">
+        <div class="bg-dark p-2 pl-3 pr-3 text-center text-muted border-0 align-self-stretch align-middle" id="filter_meta_container_button">
+            <span class="text-primary" id="meta_filter_dropdown_icon">▼</span>
+            <a>@ViewBag.Localization["WEBFRONT_CLIENT_META_FILTER"]</a>
+        </div>
+        <div id="filter_meta_container" class="d-none d-md-flex flex-md-fill flex-md-wrap">
+            @{
+                const int defaultTabCount = 5;
+                var metaTypes = Enum.GetValues(typeof(MetaType))
+                   .Cast<MetaType>()
+                   .Where(type => !ignoredMetaTypes.Contains(type))
+                   .OrderByDescending(type => type == MetaType.All)
+                   .ToList();
+                var selectedMeta = metaTypes.FirstOrDefault(meta => metaTypes.IndexOf(Model.MetaFilterType ?? MetaType.All) >= defaultTabCount && meta != MetaType.All && meta == Model.MetaFilterType);
+            }
+            @foreach (var type in metaTypes.Take(defaultTabCount - 1).Append(selectedMeta == MetaType.Other ? metaTypes[defaultTabCount - 1] : selectedMeta))
             {
                 <a asp-action="ProfileAsync" asp-controller="Client"
-                   class="nav-link p-2 pl-3 pr-3 text-center col-12 col-md-auto text-md-left @(Model.MetaFilterType.HasValue && Model.MetaFilterType.Value.ToString() == type.ToString() ? "btn-primary text-white" : "text-muted")"
+                   class="meta-filter nav-link p-2 pl-3 pr-3 text-center @(Model.MetaFilterType.HasValue && Model.MetaFilterType.Value.ToString() == type.ToString() ? "btn-primary text-white" : "text-muted")"
                    asp-route-id="@Model.ClientId"
                    asp-route-metaFilterType="@type"
                    data-meta-type="@type">
                     @type.ToTranslatedName()
                 </a>
             }
-        }
+            <div class="d-md-none" id="additional_meta_filter">
+                @foreach (var type in (selectedMeta == MetaType.Other ? metaTypes.Skip(defaultTabCount) : metaTypes.Skip(defaultTabCount).Append(metaTypes[defaultTabCount - 1])).Where(meta => selectedMeta == MetaType.Other || meta != selectedMeta))
+                {
+                    <a asp-action="ProfileAsync" asp-controller="Client"
+                       class="meta-filter nav-link p-2 pl-3 pr-3 text-center @(Model.MetaFilterType.HasValue && Model.MetaFilterType.Value.ToString() == type.ToString() ? "btn-primary text-white" : "text-muted")"
+                       asp-route-id="@Model.ClientId"
+                       asp-route-metaFilterType="@type"
+                       data-meta-type="@type">
+                        @type.ToTranslatedName()
+                    </a>
+                }
+            </div>
+        </div>
     </div>
 </div>
 
@@ -177,7 +192,7 @@
 {
     <div class="row d-md-flex pt-2">
         <div id="profile_events" class="text-muted text-left pl-4 pr-4 pl-md-0 pr-md-0">
-            @await Component.InvokeAsync("ProfileMetaList", new {clientId = Model.ClientId, count = 30, offset = 0, startAt = DateTime.UtcNow, metaType = Model.MetaFilterType})
+            @await Component.InvokeAsync("ProfileMetaList", new { clientId = Model.ClientId, count = 30, offset = 0, startAt = DateTime.UtcNow, metaType = Model.MetaFilterType })
         </div>
     </div>
 }

WebfrontCore/Views/Client/Profile/Meta/_PermissionLevelChangedResponse.cshtml

@@ -0,0 +1,29 @@
+@model SharedLibraryCore.Dtos.Meta.Responses.PermissionLevelChangedResponse
+
+@foreach (var token in Utilities.SplitTranslationTokens("WEBFRONT_CLIENT_META_PERMISSION_CHANGED"))
+{
+    if (token.IsInterpolation)
+    {
+        switch (token.MatchValue)
+        {
+            case "permission":
+                <span class="level-color-@((int)Model.CurrentPermissionLevel)">@Model.CurrentPermissionLevel.ToLocalizedLevelName()</span>
+                break;
+            case "originClient":
+                <span class="text-highlight">
+                    <a class="link-inverse" href="@Model.ChangedById">
+                        <color-code value="@Model.ChangedByName"></color-code>
+                    </a>
+                </span>
+                break;
+            case "type":
+                <span class="text-white-50">@token.TranslationValue</span>
+                break;
+        }
+    }
+    
+    else
+    {
+        <span class="text-muted">@token.MatchValue</span>
+    }
+}

WebfrontCore/wwwroot/js/profile.js

@@ -35,10 +35,8 @@
     startAt = $('.loader-data-time').last().data('time');
 
     $('#filter_meta_container_button').click(function () {
-        $('#filter_meta_container').hide();
-        $('#filter_meta_container').removeClass('d-none');
-        $('#filter_meta_container').addClass('d-block');
-        $('#filter_meta_container').slideDown();
+        $('#filter_meta_container').removeClass('d-none').addClass('flex-md-column');
+        $('#additional_meta_filter').removeClass('d-md-none');
     });
 
     /*

WebfrontCore/wwwroot/js/scoreboard.js

@@ -15,6 +15,8 @@ $(document).ready(() => {
         return 0;
     }
     
+    setInterval(refreshScoreboard, 5000);
+    
     $(window.location.hash).tab('show');
     $(`${window.location.hash}_nav`).addClass('active');
 
@@ -32,5 +34,3 @@ function setupDataSorting() {
         refreshScoreboard();
     })
 }
-
-setInterval(refreshScoreboard, 5000);