ok for real this time

clean up some doc warnings

Application/Application.csproj

@@ -25,6 +25,7 @@
 
   <ItemGroup>
     <PackageReference Include="Jint" Version="3.0.0-beta-2037" />
+    <PackageReference Include="MaxMind.GeoIP2" Version="5.1.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -63,6 +64,9 @@
     <None Update="Configuration\LoggingConfiguration.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="Resources\GeoLite2-Country.mmdb">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">

Application/ApplicationManager.cs

@@ -59,7 +59,6 @@ namespace IW4MAdmin.Application
         readonly PenaltyService PenaltySvc;
         public IConfigurationHandler<ApplicationConfiguration> ConfigHandler;
         readonly IPageList PageList;
-        private readonly IMetaService _metaService;
         private readonly TimeSpan _throttleTimeout = new TimeSpan(0, 1, 0);
         private readonly CancellationTokenSource _tokenSource;
         private readonly Dictionary<string, Task<IList>> _operationLookup = new Dictionary<string, Task<IList>>();
@@ -81,7 +80,7 @@ namespace IW4MAdmin.Application
             ITranslationLookup translationLookup, IConfigurationHandler<CommandConfiguration> commandConfiguration,
             IConfigurationHandler<ApplicationConfiguration> appConfigHandler, IGameServerInstanceFactory serverInstanceFactory,
             IEnumerable<IPlugin> plugins, IParserRegexFactory parserRegexFactory, IEnumerable<IRegisterEvent> customParserEvents,
-            IEventHandler eventHandler, IScriptCommandFactory scriptCommandFactory, IDatabaseContextFactory contextFactory, IMetaService metaService,
+            IEventHandler eventHandler, IScriptCommandFactory scriptCommandFactory, IDatabaseContextFactory contextFactory,
             IMetaRegistration metaRegistration, IScriptPluginServiceResolver scriptPluginServiceResolver, ClientService clientService, IServiceProvider serviceProvider,
             ChangeHistoryService changeHistoryService, ApplicationConfiguration appConfig, PenaltyService penaltyService)
         {
@@ -97,7 +96,6 @@ namespace IW4MAdmin.Application
             AdditionalRConParsers = new List<IRConParser>() { new BaseRConParser(serviceProvider.GetRequiredService<ILogger<BaseRConParser>>(), parserRegexFactory) };
             TokenAuthenticator = new TokenAuthentication();
             _logger = logger;
-            _metaService = metaService;
             _tokenSource = new CancellationTokenSource();
             _commands = commands.ToList();
             _translationLookup = translationLookup;
@@ -412,7 +410,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
@@ -589,16 +587,29 @@ namespace IW4MAdmin.Application
 
         public async Task Start() => await UpdateServerStates();
 
-        public void Stop()
+        public async Task Stop()
         {
+            foreach (var plugin in Plugins)
+            {
+                try
+                {
+                    await plugin.OnUnloadAsync().WithTimeout(Utilities.DefaultCommandTimeout);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Could not cleanly unload plugin {PluginName}", plugin.Name);
+                }
+            }   
+            
             _tokenSource.Cancel();
+            
             IsRunning = false;
         }
 
         public void Restart()
         {
             IsRestartRequested = true;
-            Stop();
+            Stop().GetAwaiter().GetResult();
         }
 
         [Obsolete]

Application/Commands/ClientTags/AddClientTagCommand.cs

@@ -0,0 +1,64 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Data.Models;
+using Data.Models.Client;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Commands.ClientTags
+{
+    public class AddClientTagCommand : Command
+    {
+        private readonly IMetaServiceV2 _metaService;
+
+        public AddClientTagCommand(ILogger<AddClientTagCommand> commandLogger, CommandConfiguration config,
+            ITranslationLookup layout, IMetaServiceV2 metaService) :
+            base(config, layout)
+        {
+            Name = "addclienttag";
+            Description = layout["COMMANDS_ADD_CLIENT_TAG_DESC"];
+            Alias = "act";
+            Permission = EFClient.Permission.Owner;
+            RequiresTarget = false;
+            Arguments = new[]
+            {
+                new CommandArgument
+                {
+                    Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
+                    Required = true
+                }
+            };
+
+            _metaService = metaService;
+            logger = commandLogger;
+        }
+
+        public override async Task ExecuteAsync(GameEvent gameEvent)
+        {
+            var existingTags = await _metaService.GetPersistentMetaValue<List<TagMeta>>(EFMeta.ClientTagNameV2) ??
+                               new List<TagMeta>();
+
+            var tagName = gameEvent.Data.Trim();
+
+            if (existingTags.Any(tag => tag.TagName == tagName))
+            {
+                logger.LogWarning("Tag with name {TagName} already exists", tagName);
+                return;
+            }
+
+            existingTags.Add(new TagMeta
+            {
+                Id = (existingTags.LastOrDefault()?.TagId ?? 0) + 1,
+                Value = tagName
+            });
+
+            await _metaService.SetPersistentMetaValue(EFMeta.ClientTagNameV2, existingTags,
+                gameEvent.Owner.Manager.CancellationToken);
+            gameEvent.Origin.Tell(_translationLookup["COMMANDS_ADD_CLIENT_TAG_SUCCESS"].FormatExt(gameEvent.Data));
+        }
+    }
+}

Application/Commands/ClientTags/ListClientTags.cs

@@ -1,17 +1,19 @@
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Data.Models;
 using Data.Models.Client;
+using SharedLibraryCore;
 using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Interfaces;
 
-namespace SharedLibraryCore.Commands
+namespace IW4MAdmin.Application.Commands.ClientTags
 {
     public class ListClientTags : Command
     {
-        private readonly IMetaService _metaService;
+        private readonly IMetaServiceV2 _metaService;
 
-        public ListClientTags(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(
+        public ListClientTags(CommandConfiguration config, ITranslationLookup layout, IMetaServiceV2 metaService) : base(
             config, layout)
         {
             Name = "listclienttags";
@@ -19,14 +21,18 @@ namespace SharedLibraryCore.Commands
             Alias = "lct";
             Permission = EFClient.Permission.Owner;
             RequiresTarget = false;
-
             _metaService = metaService;
         }
 
         public override async Task ExecuteAsync(GameEvent gameEvent)
         {
-            var tags = await _metaService.GetPersistentMeta(EFMeta.ClientTagName);
-            gameEvent.Origin.Tell(tags.Select(tag => tag.Value));
+            var tags = await _metaService.GetPersistentMetaValue<List<TagMeta>>(EFMeta.ClientTagNameV2);
+            
+            if (tags is not null)
+            {
+                await gameEvent.Origin.TellAsync(tags.Select(tag => tag.TagName),
+                    gameEvent.Owner.Manager.CancellationToken);
+            }
         }
     }
-}
+}

Application/Commands/ClientTags/RemoveClientTagCommand.cs

@@ -1,16 +1,20 @@
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using System.Linq;
 using Data.Models;
 using Data.Models.Client;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
 using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Interfaces;
 
-namespace SharedLibraryCore.Commands
+namespace IW4MAdmin.Application.Commands.ClientTags
 {
     public class RemoveClientTag : Command
     {
-        private readonly IMetaService _metaService;
+        private readonly IMetaServiceV2 _metaService;
 
-        public RemoveClientTag(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(
+        public RemoveClientTag(CommandConfiguration config, ITranslationLookup layout, IMetaServiceV2 metaService) : base(
             config, layout)
         {
             Name = "removeclienttag";
@@ -32,8 +36,13 @@ namespace SharedLibraryCore.Commands
 
         public override async Task ExecuteAsync(GameEvent gameEvent)
         {
-            await _metaService.RemovePersistentMeta(EFMeta.ClientTagName, gameEvent.Data);
+            var existingMeta = await _metaService.GetPersistentMetaValue<List<TagMeta>>(EFMeta.ClientTagNameV2,
+                gameEvent.Owner.Manager.CancellationToken);
+            existingMeta = existingMeta.Where(meta => meta.TagName != gameEvent.Data.Trim()).ToList();
+            await _metaService.SetPersistentMetaValue(EFMeta.ClientTagNameV2, existingMeta,
+                gameEvent.Owner.Manager.CancellationToken);
+            
             gameEvent.Origin.Tell(_translationLookup["COMMANDS_REMOVE_CLIENT_TAG_SUCCESS"].FormatExt(gameEvent.Data));
         }
     }
-}
+}

Application/Commands/ClientTags/SetClientTagCommand.cs

@@ -1,18 +1,22 @@
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Data.Models;
 using Data.Models.Client;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
 using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Dtos;
 using SharedLibraryCore.Interfaces;
 
-namespace SharedLibraryCore.Commands
+namespace IW4MAdmin.Application.Commands.ClientTags
 {
     public class SetClientTagCommand : Command
     {
-        private readonly IMetaService _metaService;
+        private readonly IMetaServiceV2 _metaService;
 
 
-        public SetClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) :
+        public SetClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaServiceV2 metaService) :
             base(config, layout)
         {
             Name = "setclienttag";
@@ -34,8 +38,10 @@ namespace SharedLibraryCore.Commands
 
         public override async Task ExecuteAsync(GameEvent gameEvent)
         {
-            var availableTags = await _metaService.GetPersistentMeta(EFMeta.ClientTagName);
-            var matchingTag = availableTags.FirstOrDefault(tag => tag.Value == gameEvent.Data);
+            var token = gameEvent.Owner.Manager.CancellationToken;
+            
+            var availableTags = await _metaService.GetPersistentMetaValue<List<LookupValue<string>>>(EFMeta.ClientTagNameV2, token);
+            var matchingTag = availableTags.FirstOrDefault(tag => tag.Value == gameEvent.Data.Trim());
 
             if (matchingTag == null)
             {
@@ -44,8 +50,9 @@ namespace SharedLibraryCore.Commands
             }
 
             gameEvent.Target.Tag = matchingTag.Value;
-            await _metaService.AddPersistentMeta(EFMeta.ClientTag, string.Empty, gameEvent.Target, matchingTag);
+            await _metaService.SetPersistentMetaForLookupKey(EFMeta.ClientTagV2, EFMeta.ClientTagNameV2, matchingTag.Id,
+                gameEvent.Target.ClientId, token);
             gameEvent.Origin.Tell(_translationLookup["COMMANDS_SET_CLIENT_TAG_SUCCESS"].FormatExt(matchingTag.Value));
         }
     }
-}
+}

Application/Commands/ClientTags/TagMeta.cs

@@ -0,0 +1,13 @@
+using System.Text.Json.Serialization;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Commands.ClientTags;
+
+public class TagMeta : ILookupValue<string>
+{
+    [JsonIgnore] public int TagId => Id;
+    [JsonIgnore] public string TagName => Value;
+
+    public int Id { get; set; }
+    public string Value { get; set; }
+}

Application/Commands/ClientTags/UnsetClientTagCommand.cs

@@ -1,17 +1,18 @@
 using System.Threading.Tasks;
 using Data.Models;
 using Data.Models.Client;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
 using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Interfaces;
 
-namespace SharedLibraryCore.Commands
+namespace IW4MAdmin.Application.Commands.ClientTags
 {
     public class UnsetClientTagCommand : Command
     {
-        private readonly IMetaService _metaService;
+        private readonly IMetaServiceV2 _metaService;
 
-
-        public UnsetClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) :
+        public UnsetClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaServiceV2 metaService) :
             base(config, layout)
         {
             Name = "unsetclienttag";
@@ -34,8 +35,9 @@ namespace SharedLibraryCore.Commands
         public override async Task ExecuteAsync(GameEvent gameEvent)
         {
             gameEvent.Target.Tag = null;
-            await _metaService.RemovePersistentMeta(EFMeta.ClientTag, gameEvent.Target);
+            await _metaService.RemovePersistentMeta(EFMeta.ClientTagV2, gameEvent.Target.ClientId,
+                gameEvent.Owner.Manager.CancellationToken);
             gameEvent.Origin.Tell(_translationLookup["COMMANDS_UNSET_CLIENT_TAG_SUCCESS"]);
         }
     }
-}
+}

Application/Commands/ListClientsCommand.cs

@@ -29,9 +29,9 @@ namespace IW4MAdmin.Application.Commands
                     $"[(Color::Accent){client.ClientPermission.Name}(Color::White){(string.IsNullOrEmpty(client.Tag) ? "" : $" {client.Tag}")}(Color::White)][(Color::Yellow)#{client.ClientNumber}(Color::White)] {client.Name}")
                 .ToArray();
 
-            gameEvent.Origin.Tell(clientList);
+            gameEvent.Origin.TellAsync(clientList, gameEvent.Owner.Manager.CancellationToken);
 
             return Task.CompletedTask;
         }
     }
-}
+}

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/DefaultSettings.json

@@ -2021,7 +2021,7 @@
       "barrett": "Barrett .50cal",
       "mp44": "MP44",
       "remington700": "R700",
-      "rpd": "RDP",
+      "rpd": "RPD",
       "saw": " M249 SAW",
       "usp": "USP .45",
       "winchester1200": "W1200",
@@ -2083,6 +2083,126 @@
       "type99rifle": "Arisaka",
       "mosinrifle": "Mosin-Nagant",
       "ptrs41": "PTRS-41"
+    },
+	
+	"T6" : {
+        
+        "mp7": "MP7",
+        "pdw57": "PDW-57",
+        "vector": "Vector K10",
+        "insas": "MSMC",
+        "qcw05": "Chicom CQB",
+        "evoskorpion": "Skorpion EVO",
+        "peacekeeper": "Peacekeeper",
+        
+        "tar21": "MTAR",
+        "type95": "Type 25",
+        "sig556": "SWAT-556",
+        "sa58": "FAL-OSW",
+        "hk416": "M27",
+        "scar": "SCAR-H",
+        "saritch": "SMR",
+        "xm8": "M8A1",
+        "an94": "AN-94",
+        
+        "870mcs": "Remington-870 MCS",
+        "saiga12": "S12",
+        "ksg": "KSG",
+        "srm1216": "M1216",
+        
+        "mk48": "MK 48",
+        "qbb95": "QBB LSW",
+        "lsat": "LSAT",
+        "hamr": "HAMR",
+        
+        "svu": "SVU-AS",
+        "dsr50": "DSR 50",
+        "ballista": "Ballista",
+        "as50": "XPR-50",
+        
+        "fiveseven": "Five-Seven",
+        "fnp45": "TAC-45",
+        "beretta93r": "B23R",
+        "judge": "Executioner",
+        "kard": "KAP-40",
+        
+        "smaw": "SMAW",
+        "fhj18": "FHJ-18 AA",
+        "usrpg": "RPG",
+        
+        "riotshield": "Assault Shield",
+        "crossbow": "Crossbow",
+        "knife_ballistic": "Ballistic Knife",
+        "knife_held": "Knife",
+        "knife": "Knife",
+        
+        "frag_grenade": "Grenade",
+        "hatchet": "Combat Axe",
+        "sticky_grenade": "Semtex",
+        "satchel_charge": "C4",
+        "bouncingbetty": "Bouncing Betty",
+        "claymore": "Claymore",
+        
+        "smoke_center": "Smoke Grenade",
+        "concussion_grenade": "Concussion",
+        "emp_grenade": "EMP Grenade",
+        "sensor_grenade": "Sensor Grenade",
+        "flash_grenade": "Flashbang",
+        "proximity_grenade": "Shock Charge",
+        "pda_hack": "Black Hat",
+        "trophy_system": "Trophy System",
+        "tactical_insertion": "Tactical Insertion",
+        
+        "acog": "ACOG",
+        "stalker": "Stock",
+        "swayreduc": "Ballistics CPU",
+        "ir": "Dual Band",
+        "dw": "Dual Wield",
+        "extclip": "Extended Clip",
+        "halo": "EOTech",
+        "dualclip": "Fast Mag",
+        "fmj": "FMJ",
+        "grip": "Fore Grip",
+        "gl": "Grenade Launcher",
+        "dualoptic": "Hybrid Optic",
+        "is": "Iron Sights",
+        "steadyaim": "Laser Sight",
+        "extbarrel": "Long Barrel",
+        "mms": "MMS",
+        "fastads": "Quickdraw",
+        "rf": "Rapid Fire",
+        "reflex": "Reflex Sight",
+        "sf": "Select Fire",
+        "silencer": "Suppressor",
+        "tacknife": "Tactical Knife",
+        "stackfire": "Tri-Bolt",
+        "rangefinder": "Target Finder",
+        "vzoom": "Variable Zoom",
+        
+        "spyplane": "UAV",
+        "rcbomb": "RC-XD",
+        "missile_drone": "Hunter Killer",
+        "supplydrop": "Care Package",
+        "counteruav": "Counter-UAV",
+        "microwave_turret": "Guardian",
+        "remote_missile": "Hellstorm Missile",
+        "planemortar": "Lightning Strike",
+        "auto_turret": "Sentry Gun",
+        "minigun": "Death Machine",
+        "m32": "War Machine",
+        "qrdrone": "Dragonfire",
+        "ai_tank_drop": "AGR",
+        "comlink": "Stealth Chopper",
+        "spyplane_direction": "Orbital VSAT",
+        "helicopter_guard": "Escort Drone",
+        "emp": "EMP",
+        "straferun": "Warthog",
+        "remote_mortar": "Lodestar",
+        "player_gunner": "VTOL Warship",
+        "dogs": "K9 Unit",
+        "missile_swarm": "Swarm"
+        
     }
+	
   }
 }

Application/EventParsers/BaseEventParser.cs

@@ -49,6 +49,13 @@ namespace IW4MAdmin.Application.EventParsers
             Configuration.Join.AddMapping(ParserRegex.GroupType.OriginNetworkId, 2);
             Configuration.Join.AddMapping(ParserRegex.GroupType.OriginClientNumber, 3);
             Configuration.Join.AddMapping(ParserRegex.GroupType.OriginName, 4);
+            
+            Configuration.JoinTeam.Pattern = @"^(JT);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);([0-9]+);(\w+);(.+)$";
+            Configuration.JoinTeam.AddMapping(ParserRegex.GroupType.EventType, 1);
+            Configuration.JoinTeam.AddMapping(ParserRegex.GroupType.OriginNetworkId, 2);
+            Configuration.JoinTeam.AddMapping(ParserRegex.GroupType.OriginClientNumber, 3);
+            Configuration.JoinTeam.AddMapping(ParserRegex.GroupType.OriginTeam, 4);
+            Configuration.JoinTeam.AddMapping(ParserRegex.GroupType.OriginName, 5);
 
             Configuration.Damage.Pattern = @"^(D);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,32});(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0)?;(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,32})?;((?:[0-9]+|[a-z]+|_|\+)+);([0-9]+);((?:[A-Z]|_)+);((?:[a-z]|_)+)$";
             Configuration.Damage.AddMapping(ParserRegex.GroupType.EventType, 1);
@@ -90,7 +97,8 @@ namespace IW4MAdmin.Application.EventParsers
                 {Configuration.Say, GameEvent.EventType.Say},
                 {Configuration.Kill, GameEvent.EventType.Kill},
                 {Configuration.MapChange, GameEvent.EventType.MapChange},
-                {Configuration.MapEnd, GameEvent.EventType.MapEnd}
+                {Configuration.MapEnd, GameEvent.EventType.MapEnd},
+                {Configuration.JoinTeam, GameEvent.EventType.JoinTeam}
             };
             
             _eventTypeMap = new Dictionary<string, GameEvent.EventType>
@@ -100,7 +108,8 @@ namespace IW4MAdmin.Application.EventParsers
                 {"K", GameEvent.EventType.Kill},
                 {"D", GameEvent.EventType.Damage},
                 {"J", GameEvent.EventType.PreConnect},
-                {"Q", GameEvent.EventType.PreDisconnect},
+                {"JT", GameEvent.EventType.JoinTeam},
+                {"Q", GameEvent.EventType.PreDisconnect}
             };
         }
 
@@ -322,6 +331,47 @@ namespace IW4MAdmin.Application.EventParsers
                 }
             }
 
+            if (eventType == GameEvent.EventType.JoinTeam)
+            {
+                var match = Configuration.JoinTeam.PatternMatcher.Match(logLine);
+
+                if (match.Success)
+                {
+                    var originIdString = match.Values[Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginNetworkId]];
+                    var originName = match.Values[Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginName]];
+                    var team = match.Values[Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginTeam]];
+
+                    if (Configuration.TeamMapping.ContainsKey(team))
+                    {
+                        team = Configuration.TeamMapping[team].ToString();
+                    }
+
+                    var networkId = originIdString.IsBotGuid() ?
+                        originName.GenerateGuidFromString() :
+                        originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle);
+                    
+                    return new GameEvent
+                    {
+                        Type = GameEvent.EventType.JoinTeam,
+                        Data = logLine,
+                        Origin = new EFClient
+                        {
+                            CurrentAlias = new EFAlias
+                            {
+                                Name = match.Values[Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginName]].TrimNewLine(),
+                            },
+                            NetworkId = networkId,
+                            ClientNumber = Convert.ToInt32(match.Values[Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]),
+                            State = EFClient.ClientState.Connected,
+                        },
+                        Extra = team,
+                        RequiredEntity = GameEvent.EventRequiredEntity.Origin,
+                        GameTime = gameTime,
+                        Source = GameEvent.EventSource.Log
+                    };
+                }
+            }
+
             if (eventType == GameEvent.EventType.PreDisconnect)
             {
                 var match = Configuration.Quit.PatternMatcher.Match(logLine);

Application/EventParsers/DynamicEventParserConfiguration.cs

@@ -1,6 +1,8 @@
-using SharedLibraryCore.Interfaces;
+using System.Collections.Generic;
+using SharedLibraryCore.Interfaces;
 using System.Globalization;
 using SharedLibraryCore;
+using SharedLibraryCore.Database.Models;
 
 namespace IW4MAdmin.Application.EventParsers
 {
@@ -8,11 +10,12 @@ namespace IW4MAdmin.Application.EventParsers
     /// generic implementation of the IEventParserConfiguration
     /// allows script plugins to generate dynamic configurations
     /// </summary>
-    sealed internal class DynamicEventParserConfiguration : IEventParserConfiguration
+    internal sealed class DynamicEventParserConfiguration : IEventParserConfiguration
     {
         public string GameDirectory { get; set; }
         public ParserRegex Say { get; set; }
         public ParserRegex Join { get; set; }
+        public ParserRegex JoinTeam { get; set; }
         public ParserRegex Quit { get; set; }
         public ParserRegex Kill { get; set; }
         public ParserRegex Damage { get; set; }
@@ -22,10 +25,13 @@ namespace IW4MAdmin.Application.EventParsers
         public ParserRegex MapEnd { get; set; }
         public NumberStyles GuidNumberStyle { get; set; } = NumberStyles.HexNumber;
 
+        public Dictionary<string, EFClient.TeamType> TeamMapping { get; set; } = new();
+
         public DynamicEventParserConfiguration(IParserRegexFactory parserRegexFactory)
         {
             Say = parserRegexFactory.CreateParserRegex();
             Join = parserRegexFactory.CreateParserRegex();
+            JoinTeam = parserRegexFactory.CreateParserRegex();
             Quit = parserRegexFactory.CreateParserRegex();
             Kill = parserRegexFactory.CreateParserRegex();
             Damage = parserRegexFactory.CreateParserRegex();

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/Factories/GameServerInstanceFactory.cs

@@ -14,7 +14,7 @@ namespace IW4MAdmin.Application.Factories
     internal class GameServerInstanceFactory : IGameServerInstanceFactory
     {
         private readonly ITranslationLookup _translationLookup;
-        private readonly IMetaService _metaService;
+        private readonly IMetaServiceV2 _metaService;
         private readonly IServiceProvider _serviceProvider;
 
         /// <summary>
@@ -23,7 +23,7 @@ namespace IW4MAdmin.Application.Factories
         /// <param name="translationLookup"></param>
         /// <param name="rconConnectionFactory"></param>
         public GameServerInstanceFactory(ITranslationLookup translationLookup,
-            IMetaService metaService,
+            IMetaServiceV2 metaService,
             IServiceProvider serviceProvider)
         {
             _translationLookup = translationLookup;
@@ -45,4 +45,4 @@ namespace IW4MAdmin.Application.Factories
                 _serviceProvider.GetRequiredService<ILookupCache<EFServer>>());
         }
     }
-}
+}

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 && !line.Contains('ÿ'));
+
+                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

@@ -35,7 +35,7 @@ namespace IW4MAdmin
         private static readonly SharedLibraryCore.Localization.TranslationLookup loc = Utilities.CurrentLocalization.LocalizationIndex;
         public GameLogEventDetection LogEvent;
         private readonly ITranslationLookup _translationLookup;
-        private readonly IMetaService _metaService;
+        private readonly IMetaServiceV2 _metaService;
         private const int REPORT_FLAG_COUNT = 4;
         private long lastGameTime = 0;
 
@@ -49,7 +49,7 @@ namespace IW4MAdmin
             ServerConfiguration serverConfiguration,
             CommandConfiguration commandConfiguration,
             ITranslationLookup lookup,
-            IMetaService metaService, 
+            IMetaServiceV2 metaService, 
             IServiceProvider serviceProvider,
             IClientNoticeMessageFormatter messageFormatter,
             ILookupCache<EFServer> serverCache) : base(serviceProvider.GetRequiredService<ILogger<Server>>(), 
@@ -96,6 +96,8 @@ namespace IW4MAdmin
             client.ClientNumber = clientFromLog.ClientNumber;
             client.Score = clientFromLog.Score;
             client.Ping = clientFromLog.Ping;
+            client.Team = clientFromLog.Team;
+            client.TeamName = clientFromLog.TeamName;
             client.CurrentServer = this;
             client.State = ClientState.Connecting;
 
@@ -236,7 +238,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 +250,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 +297,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 +311,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 +323,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}",
@@ -345,7 +352,8 @@ namespace IW4MAdmin
                             Time = DateTime.UtcNow
                         });
 
-                        var clientTag = await _metaService.GetPersistentMeta(EFMeta.ClientTag, E.Origin);
+                        var clientTag = await _metaService.GetPersistentMetaByLookup(EFMeta.ClientTagV2,
+                            EFMeta.ClientTagNameV2, E.Origin.ClientId, Manager.CancellationToken);
 
                         if (clientTag?.LinkedMeta != null)
                         {
@@ -477,7 +485,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 +497,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);
                 }
 
@@ -499,7 +508,8 @@ namespace IW4MAdmin
                     {
                         Origin = E.Origin,
                         Target = E.Target,
-                        Reason = E.Data
+                        Reason = E.Data,
+                        ReportedOn = DateTime.UtcNow
                     });
 
                     var newReport = new EFPenalty()
@@ -562,8 +572,10 @@ namespace IW4MAdmin
                         Time = DateTime.UtcNow
                     });
 
-                    await _metaService.AddPersistentMeta("LastMapPlayed", CurrentMap.Alias, E.Origin);
-                    await _metaService.AddPersistentMeta("LastServerPlayed", E.Owner.Hostname, E.Origin);
+                    await _metaService.SetPersistentMeta("LastMapPlayed", CurrentMap.Alias, E.Origin.ClientId,
+                        Manager.CancellationToken);
+                    await _metaService.SetPersistentMeta("LastServerPlayed", E.Owner.Hostname, E.Origin.ClientId,
+                        Manager.CancellationToken);
                 }
 
                 else if (E.Type == GameEvent.EventType.PreDisconnect)
@@ -614,7 +626,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)
                     {
@@ -634,7 +646,7 @@ namespace IW4MAdmin
                             }
                         }
 
-                        ChatHistory.Add(new ChatInfo()
+                        ChatHistory.Add(new ChatInfo
                         {
                             Name = E.Origin.Name,
                             Message = message,
@@ -644,7 +656,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 +697,7 @@ namespace IW4MAdmin
                     }
                 }
 
-                if (E.Type == GameEvent.EventType.MapEnd)
+                else if (E.Type == GameEvent.EventType.MapEnd)
                 {
                     ServerLogger.LogInformation("Game ending...");
 
@@ -695,18 +707,23 @@ 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
                     {
                         await E.Owner.ExecuteCommandAsync(E.Data);
                     }
                 }
+                
+                else if (E.Type == GameEvent.EventType.JoinTeam)
+                {
+                    E.Origin.UpdateTeam(E.Extra as string);
+                }
 
                 lock (ChatHistory)
                 {
@@ -777,7 +794,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)
@@ -889,16 +906,10 @@ namespace IW4MAdmin
 
                 await e.WaitAsync(Utilities.DefaultCommandTimeout, new CancellationTokenRegistration().Token);
             }
-
-            foreach (var plugin in Manager.Plugins)
-            {
-                await plugin.OnUnloadAsync();
-            }
         }
 
-        DateTime start = DateTime.Now;
-        DateTime playerCountStart = DateTime.Now;
-        DateTime lastCount = DateTime.Now;
+        private DateTime _lastMessageSent = DateTime.Now;
+        private DateTime _lastPlayerCount = DateTime.Now;
 
         public override async Task<bool> ProcessUpdatesAsync(CancellationToken cts)
         {
@@ -912,14 +923,16 @@ namespace IW4MAdmin
 
                 try
                 {
-                    if (Manager.GetApplicationSettings().Configuration().RConPollRate == int.MaxValue && Utilities.IsDevelopment)
+                    if (Manager.GetApplicationSettings().Configuration().RConPollRate == int.MaxValue &&
+                        Utilities.IsDevelopment)
                     {
                         return true;
                     }
 
                     var polledClients = await PollPlayersAsync();
 
-                    foreach (var disconnectingClient in polledClients[1].Where(_client => !_client.IsZombieClient /* ignores "fake" zombie clients */))
+                    foreach (var disconnectingClient in polledClients[1]
+                                 .Where(client => !client.IsZombieClient /* ignores "fake" zombie clients */))
                     {
                         disconnectingClient.CurrentServer = this;
                         var e = new GameEvent()
@@ -935,16 +948,11 @@ namespace IW4MAdmin
                     }
 
                     // this are our new connecting clients
-                    foreach (var client in polledClients[0])
+                    foreach (var client in polledClients[0].Where(client =>
+                                 !string.IsNullOrEmpty(client.Name) && (client.Ping != 999 || client.IsBot)))
                     {
-                        // note: this prevents players in ZMBI state from being registered with no name
-                        if (string.IsNullOrEmpty(client.Name) || (client.Ping == 999 && !client.IsBot))
-                        {
-                            continue;
-                        }
-
                         client.CurrentServer = this;
-                        var e = new GameEvent()
+                        var e = new GameEvent
                         {
                             Type = GameEvent.EventType.PreConnect,
                             Origin = client,
@@ -962,19 +970,19 @@ namespace IW4MAdmin
                     foreach (var client in polledClients[2])
                     {
                         client.CurrentServer = this;
-                        var e = new GameEvent()
+                        var gameEvent = new GameEvent
                         {
                             Type = GameEvent.EventType.Update,
                             Origin = client,
                             Owner = this
                         };
 
-                        Manager.AddEvent(e);
+                        Manager.AddEvent(gameEvent);
                     }
 
                     if (Throttled)
                     {
-                        var _event = new GameEvent()
+                        var gameEvent = new GameEvent
                         {
                             Type = GameEvent.EventType.ConnectionRestored,
                             Owner = this,
@@ -982,65 +990,52 @@ namespace IW4MAdmin
                             Target = Utilities.IW4MAdminClient(this)
                         };
 
-                        Manager.AddEvent(_event);
+                        Manager.AddEvent(gameEvent);
                     }
 
                     LastPoll = DateTime.Now;
                 }
 
-                catch (NetworkException e)
+                catch (NetworkException ex)
                 {
-                    if (!Throttled)
+                    if (Throttled)
                     {
-                        var _event = new GameEvent()
-                        {
-                            Type = GameEvent.EventType.ConnectionLost,
-                            Owner = this,
-                            Origin = Utilities.IW4MAdminClient(this),
-                            Target = Utilities.IW4MAdminClient(this),
-                            Extra = e,
-                            Data = ConnectionErrors.ToString()
-                        };
-
-                        Manager.AddEvent(_event);
+                        return true;
                     }
 
+                    var gameEvent = new GameEvent
+                    {
+                        Type = GameEvent.EventType.ConnectionLost,
+                        Owner = this,
+                        Origin = Utilities.IW4MAdminClient(this),
+                        Target = Utilities.IW4MAdminClient(this),
+                        Extra = ex,
+                        Data = ConnectionErrors.ToString()
+                    };
+
+                    Manager.AddEvent(gameEvent);
+                    return true;
+                }
+                finally
+                {
+                    RunServerCollection();
+                }
+
+                if (DateTime.Now - _lastMessageSent <=
+                    TimeSpan.FromSeconds(Manager.GetApplicationSettings().Configuration().AutoMessagePeriod) ||
+                    BroadcastMessages.Count <= 0 || ClientNum <= 0)
+                {
                     return true;
                 }
 
-                LastMessage = DateTime.Now - start;
-                lastCount = DateTime.Now;
-
-                var appConfig = _serviceProvider.GetService<ApplicationConfiguration>();
-                // update the player history 
-                if (lastCount - playerCountStart >= appConfig.ServerDataCollectionInterval)
-                {
-                    var maxItems = Math.Ceiling(appConfig.MaxClientHistoryTime.TotalMinutes /
-                                                appConfig.ServerDataCollectionInterval.TotalMinutes);
-                    while ( ClientHistory.Count > maxItems) 
-                    {
-                        ClientHistory.Dequeue();
-                    }
-
-                    ClientHistory.Enqueue(new PlayerHistory(ClientNum));
-                    playerCountStart = DateTime.Now;
-                }
-
                 // send out broadcast messages
-                if (LastMessage.TotalSeconds > Manager.GetApplicationSettings().Configuration().AutoMessagePeriod
-                    && BroadcastMessages.Count > 0
-                    && ClientNum > 0)
-                {
-                    string[] messages = (await this.ProcessMessageToken(Manager.GetMessageTokens(), BroadcastMessages[NextMessage])).Split(Environment.NewLine);
+                var messages =
+                    (await this.ProcessMessageToken(Manager.GetMessageTokens(), BroadcastMessages[NextMessage])).Split(
+                        Environment.NewLine);
+                await BroadcastAsync(messages, token: Manager.CancellationToken);
 
-                    foreach (string message in messages)
-                    {
-                        Broadcast(message);
-                    }
-
-                    NextMessage = NextMessage == (BroadcastMessages.Count - 1) ? 0 : NextMessage + 1;
-                    start = DateTime.Now;
-                }
+                NextMessage = NextMessage == BroadcastMessages.Count - 1 ? 0 : NextMessage + 1;
+                _lastMessageSent = DateTime.Now;
 
                 return true;
             }
@@ -1052,26 +1047,56 @@ namespace IW4MAdmin
             }
 
             // this one is ok
-            catch (Exception e) when(e is ServerException || e is RConException)
+            catch (Exception e) when (e is ServerException || e is RConException)
             {
-                using(LogContext.PushProperty("Server", ToString()))
+                using (LogContext.PushProperty("Server", ToString()))
                 {
                     ServerLogger.LogWarning(e, "Undesirable exception occured during processing updates");
                 }
+
                 return false;
             }
 
             catch (Exception e)
             {
-                using(LogContext.PushProperty("Server", ToString()))
+                using (LogContext.PushProperty("Server", ToString()))
                 {
                     ServerLogger.LogError(e, "Unexpected exception occured during processing updates");
                 }
+
                 Console.WriteLine(loc["SERVER_ERROR_EXCEPTION"].FormatExt($"[{IP}:{Port}]"));
                 return false;
             }
         }
 
+        private void RunServerCollection()
+        {
+            var appConfig = _serviceProvider.GetService<ApplicationConfiguration>();
+           
+            if (DateTime.Now - _lastPlayerCount < appConfig?.ServerDataCollectionInterval)
+            {
+                return;
+            }
+
+            var maxItems = Math.Ceiling(appConfig.MaxClientHistoryTime.TotalMinutes /
+                                        appConfig.ServerDataCollectionInterval.TotalMinutes);
+                    
+            while (ClientHistory.ClientCounts.Count > maxItems) 
+            {
+                ClientHistory.ClientCounts.RemoveAt(0);
+            }
+
+            ClientHistory.ClientCounts.Add(new ClientCountSnapshot
+            {
+                ClientCount = ClientNum,
+                ConnectionInterrupted = Throttled,
+                Time = DateTime.UtcNow,
+                Map = CurrentMap.Name
+            });
+            
+            _lastPlayerCount = DateTime.Now;
+        }
+
         public async Task Initialize()
         {
             try
@@ -1103,7 +1128,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 +1145,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 +1154,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 +1221,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 +1240,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 +1465,6 @@ namespace IW4MAdmin
                 Offender = targetClient,
                 Offense = reason,
                 Punisher = originClient,
-                Link = targetClient.AliasLink,
                 IsEvadedOffense = isEvade
             };
 
@@ -1474,7 +1499,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;
@@ -76,8 +77,12 @@ namespace IW4MAdmin.Application
         /// <param name="e"></param>
         private static async void OnCancelKey(object sender, ConsoleCancelEventArgs e)
         {
-            _serverManager?.Stop();
-            if (_applicationTask != null)
+            if (_serverManager is not null)
+            {
+                await _serverManager.Stop();
+            }
+
+            if (_applicationTask is not null)
             {
                 await _applicationTask;
             }
@@ -112,10 +117,11 @@ namespace IW4MAdmin.Application
                 var tasks = new[]
                 {
                     versionChecker.CheckVersion(),
-                    _serverManager.Init(),
                     _applicationTask
                 };
 
+                await _serverManager.Init();
+
                 await Task.WhenAll(tasks);
             }
 
@@ -138,11 +144,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 +158,11 @@ namespace IW4MAdmin.Application
                     Console.WriteLine(e.Message);
                 }
 
+                if (_serverManager is not null)
+                {
+                    await _serverManager?.Stop();
+                }
+
                 Console.WriteLine(exitMessage);
                 await Console.In.ReadAsync(new char[1], 0, 1);
                 return;
@@ -277,7 +285,7 @@ namespace IW4MAdmin.Application
 
             // register the native commands
             foreach (var commandType in typeof(SharedLibraryCore.Commands.QuitCommand).Assembly.GetTypes()
-                .Concat(typeof(Program).Assembly.GetTypes().Where(type => type.Namespace == "IW4MAdmin.Application.Commands"))
+                .Concat(typeof(Program).Assembly.GetTypes().Where(type => type.Namespace?.StartsWith("IW4MAdmin.Application.Commands") ?? false))
                 .Where(command => command.BaseType == typeof(Command)))
             {
                 defaultLogger.LogDebug("Registered native command type {Name}", commandType.Name);
@@ -347,7 +355,7 @@ namespace IW4MAdmin.Application
             await defaultConfigHandler.BuildAsync();
             var commandConfigHandler = new BaseConfigurationHandler<CommandConfiguration>("CommandConfiguration");
             await commandConfigHandler.BuildAsync();
-            var statsCommandHandler = new BaseConfigurationHandler<StatsConfiguration>();
+            var statsCommandHandler = new BaseConfigurationHandler<StatsConfiguration>("StatsPluginSettings");
             await statsCommandHandler.BuildAsync();
             var defaultConfig = defaultConfigHandler.Configuration();
             var appConfig = appConfigHandler.Configuration();
@@ -404,7 +412,10 @@ namespace IW4MAdmin.Application
                 .AddSingleton<IScriptCommandFactory, ScriptCommandFactory>()
                 .AddSingleton<IAuditInformationRepository, AuditInformationRepository>()
                 .AddSingleton<IEntityService<EFClient>, ClientService>()
+#pragma warning disable CS0618
                 .AddSingleton<IMetaService, MetaService>()
+#pragma warning restore CS0618
+                .AddSingleton<IMetaServiceV2, MetaServiceV2>()
                 .AddSingleton<ClientService>()
                 .AddSingleton<PenaltyService>()
                 .AddSingleton<ChangeHistoryService>()
@@ -418,6 +429,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>()
@@ -435,6 +447,7 @@ namespace IW4MAdmin.Application
                 .AddSingleton<IServerDataViewer, ServerDataViewer>()
                 .AddSingleton<IServerDataCollector, ServerDataCollector>()
                 .AddSingleton<IEventPublisher, EventPublisher>()
+                .AddSingleton<IGeoLocationService>(new GeoLocationService(Path.Join(".", "Resources", "GeoLite2-Country.mmdb")))
                 .AddTransient<IScriptPluginTimerHelper, ScriptPluginTimerHelper>()
                 .AddSingleton(translationLookup)
                 .AddDatabaseContextOptions(appConfig);

Application/Meta/MetaRegistration.cs

@@ -5,6 +5,7 @@ using SharedLibraryCore.Interfaces;
 using SharedLibraryCore.QueryHelper;
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
@@ -15,19 +16,28 @@ namespace IW4MAdmin.Application.Meta
     {
         private readonly ILogger _logger;
         private ITranslationLookup _transLookup;
-        private readonly IMetaService _metaService;
+        private readonly IMetaServiceV2 _metaService;
         private readonly IEntityService<EFClient> _clientEntityService;
         private readonly IResourceQueryHelper<ClientPaginationRequest, ReceivedPenaltyResponse> _receivedPenaltyHelper;
-        private readonly IResourceQueryHelper<ClientPaginationRequest, AdministeredPenaltyResponse> _administeredPenaltyHelper;
+
+        private readonly IResourceQueryHelper<ClientPaginationRequest, AdministeredPenaltyResponse>
+            _administeredPenaltyHelper;
+
         private readonly IResourceQueryHelper<ClientPaginationRequest, UpdatedAliasResponse> _updatedAliasHelper;
+
         private readonly IResourceQueryHelper<ClientPaginationRequest, ConnectionHistoryResponse>
             _connectionHistoryHelper;
 
-        public MetaRegistration(ILogger<MetaRegistration> logger, IMetaService metaService, ITranslationLookup transLookup, IEntityService<EFClient> clientEntityService,
+        private readonly IResourceQueryHelper<ClientPaginationRequest, PermissionLevelChangedResponse>
+            _permissionLevelHelper;
+
+        public MetaRegistration(ILogger<MetaRegistration> logger, IMetaServiceV2 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,21 +47,31 @@ namespace IW4MAdmin.Application.Meta
             _administeredPenaltyHelper = administeredPenaltyHelper;
             _updatedAliasHelper = updatedAliasHelper;
             _connectionHistoryHelper = connectionHistoryHelper;
+            _permissionLevelHelper = permissionLevelHelper;
         }
 
         public void Register()
         {
-            _metaService.AddRuntimeMeta<ClientPaginationRequest, InformationResponse>(MetaType.Information, GetProfileMeta);
-            _metaService.AddRuntimeMeta<ClientPaginationRequest, ReceivedPenaltyResponse>(MetaType.ReceivedPenalty, GetReceivedPenaltiesMeta);
-            _metaService.AddRuntimeMeta<ClientPaginationRequest, AdministeredPenaltyResponse>(MetaType.Penalized, GetAdministeredPenaltiesMeta);
-            _metaService.AddRuntimeMeta<ClientPaginationRequest, UpdatedAliasResponse>(MetaType.AliasUpdate, GetUpdatedAliasMeta);
-            _metaService.AddRuntimeMeta<ClientPaginationRequest, ConnectionHistoryResponse>(MetaType.ConnectionHistory, GetConnectionHistoryMeta);
+            _metaService.AddRuntimeMeta<ClientPaginationRequest, InformationResponse>(MetaType.Information,
+                GetProfileMeta);
+            _metaService.AddRuntimeMeta<ClientPaginationRequest, ReceivedPenaltyResponse>(MetaType.ReceivedPenalty,
+                GetReceivedPenaltiesMeta);
+            _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)
+        private async Task<IEnumerable<InformationResponse>> GetProfileMeta(ClientPaginationRequest request,
+            CancellationToken cancellationToken = default)
         {
             var metaList = new List<InformationResponse>();
-            var lastMapMeta = await _metaService.GetPersistentMeta("LastMapPlayed", new EFClient() { ClientId = request.ClientId });
+            var lastMapMeta =
+                await _metaService.GetPersistentMeta("LastMapPlayed", request.ClientId, cancellationToken);
 
             if (lastMapMeta != null)
             {
@@ -63,12 +83,12 @@ namespace IW4MAdmin.Application.Meta
                     Value = lastMapMeta.Value,
                     ShouldDisplay = true,
                     Type = MetaType.Information,
-                    Column = 1,
                     Order = 6
                 });
             }
 
-            var lastServerMeta = await _metaService.GetPersistentMeta("LastServerPlayed", new EFClient() { ClientId = request.ClientId });
+            var lastServerMeta =
+                await _metaService.GetPersistentMeta("LastServerPlayed", request.ClientId, cancellationToken);
 
             if (lastServerMeta != null)
             {
@@ -80,8 +100,7 @@ namespace IW4MAdmin.Application.Meta
                     Value = lastServerMeta.Value,
                     ShouldDisplay = true,
                     Type = MetaType.Information,
-                    Column = 0,
-                    Order = 6
+                    Order = 7
                 });
             }
 
@@ -89,7 +108,7 @@ namespace IW4MAdmin.Application.Meta
 
             if (client == null)
             {
-                _logger.LogWarning("No client found with id {clientId} when generating profile meta", request.ClientId);
+                _logger.LogWarning("No client found with id {ClientId} when generating profile meta", request.ClientId);
                 return metaList;
             }
 
@@ -99,8 +118,7 @@ namespace IW4MAdmin.Application.Meta
                 Key = _transLookup["WEBFRONT_PROFILE_META_PLAY_TIME"],
                 Value = TimeSpan.FromHours(client.TotalConnectionTime / 3600.0).HumanizeForCurrentCulture(),
                 ShouldDisplay = true,
-                Column = 1,
-                Order = 0,
+                Order = 8,
                 Type = MetaType.Information
             });
 
@@ -110,8 +128,7 @@ namespace IW4MAdmin.Application.Meta
                 Key = _transLookup["WEBFRONT_PROFILE_META_FIRST_SEEN"],
                 Value = (DateTime.UtcNow - client.FirstConnection).HumanizeForCurrentCulture(),
                 ShouldDisplay = true,
-                Column = 1,
-                Order = 1,
+                Order = 9,
                 Type = MetaType.Information
             });
 
@@ -121,8 +138,7 @@ namespace IW4MAdmin.Application.Meta
                 Key = _transLookup["WEBFRONT_PROFILE_META_LAST_SEEN"],
                 Value = (DateTime.UtcNow - client.LastConnection).HumanizeForCurrentCulture(),
                 ShouldDisplay = true,
-                Column = 1,
-                Order = 2,
+                Order = 10,
                 Type = MetaType.Information
             });
 
@@ -130,10 +146,10 @@ namespace IW4MAdmin.Application.Meta
             {
                 ClientId = client.ClientId,
                 Key = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_CONNECTIONS"],
-                Value = client.Connections.ToString("#,##0", new System.Globalization.CultureInfo(Utilities.CurrentLocalization.LocalizationName)),
+                Value = client.Connections.ToString("#,##0",
+                    new System.Globalization.CultureInfo(Utilities.CurrentLocalization.LocalizationName)),
                 ShouldDisplay = true,
-                Column = 1,
-                Order = 3,
+                Order = 11,
                 Type = MetaType.Information
             });
 
@@ -141,38 +157,50 @@ namespace IW4MAdmin.Application.Meta
             {
                 ClientId = client.ClientId,
                 Key = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_MASKED"],
-                Value = client.Masked ? Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_TRUE"] : Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_FALSE"],
+                Value = client.Masked
+                    ? Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_TRUE"]
+                    : Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_FALSE"],
                 IsSensitive = true,
-                Column = 1,
-                Order = 4,
+                Order = 12,
                 Type = MetaType.Information
             });
 
             return metaList;
         }
 
-        private async Task<IEnumerable<ReceivedPenaltyResponse>> GetReceivedPenaltiesMeta(ClientPaginationRequest request)
+        private async Task<IEnumerable<ReceivedPenaltyResponse>> GetReceivedPenaltiesMeta(
+            ClientPaginationRequest request, CancellationToken token = default)
         {
             var penalties = await _receivedPenaltyHelper.QueryResource(request);
             return penalties.Results;
         }
 
-        private async Task<IEnumerable<AdministeredPenaltyResponse>> GetAdministeredPenaltiesMeta(ClientPaginationRequest request)
+        private async Task<IEnumerable<AdministeredPenaltyResponse>> GetAdministeredPenaltiesMeta(
+            ClientPaginationRequest request, CancellationToken token = default)
         {
             var penalties = await _administeredPenaltyHelper.QueryResource(request);
             return penalties.Results;
         }
 
-        private async Task<IEnumerable<UpdatedAliasResponse>> GetUpdatedAliasMeta(ClientPaginationRequest request)
+        private async Task<IEnumerable<UpdatedAliasResponse>> GetUpdatedAliasMeta(ClientPaginationRequest request,
+            CancellationToken token = default)
         {
             var aliases = await _updatedAliasHelper.QueryResource(request);
             return aliases.Results;
         }
-        
-        private async Task<IEnumerable<ConnectionHistoryResponse>> GetConnectionHistoryMeta(ClientPaginationRequest request)
+
+        private async Task<IEnumerable<ConnectionHistoryResponse>> GetConnectionHistoryMeta(
+            ClientPaginationRequest request, CancellationToken token = default)
         {
             var connections = await _connectionHistoryHelper.QueryResource(request);
             return connections.Results;
         }
+
+        private async Task<IEnumerable<PermissionLevelChangedResponse>> GetPermissionLevelMeta(
+            ClientPaginationRequest request, CancellationToken token = default)
+        {
+            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

@@ -11,6 +11,7 @@ using SharedLibraryCore.Dtos.Meta.Responses;
 using SharedLibraryCore.Helpers;
 using SharedLibraryCore.Interfaces;
 using SharedLibraryCore.QueryHelper;
+using SharedLibraryCore.Services;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application.Meta
@@ -19,13 +20,14 @@ namespace IW4MAdmin.Application.Meta
     /// implementation of IResourceQueryHelper
     /// used to pull in penalties applied to a given client id
     /// </summary>
-    public class ReceivedPenaltyResourceQueryHelper : IResourceQueryHelper<ClientPaginationRequest, ReceivedPenaltyResponse>
+    public class
+        ReceivedPenaltyResourceQueryHelper : IResourceQueryHelper<ClientPaginationRequest, ReceivedPenaltyResponse>
     {
         private readonly ILogger _logger;
         private readonly IDatabaseContextFactory _contextFactory;
         private readonly ApplicationConfiguration _appConfig;
 
-        public ReceivedPenaltyResourceQueryHelper(ILogger<ReceivedPenaltyResourceQueryHelper> logger, 
+        public ReceivedPenaltyResourceQueryHelper(ILogger<ReceivedPenaltyResourceQueryHelper> logger,
             IDatabaseContextFactory contextFactory, ApplicationConfiguration appConfig)
         {
             _contextFactory = contextFactory;
@@ -33,45 +35,58 @@ namespace IW4MAdmin.Application.Meta
             _appConfig = appConfig;
         }
 
-        public async Task<ResourceQueryHelperResult<ReceivedPenaltyResponse>> QueryResource(ClientPaginationRequest query)
+        public async Task<ResourceQueryHelperResult<ReceivedPenaltyResponse>> QueryResource(
+            ClientPaginationRequest query)
         {
             var linkedPenaltyType = Utilities.LinkedPenaltyTypes();
             await using var ctx = _contextFactory.CreateContext(enableTracking: false);
 
             var linkId = await ctx.Clients.AsNoTracking()
-                    .Where(_client => _client.ClientId == query.ClientId)
-                    .Select(_client => new {_client.AliasLinkId, _client.CurrentAliasId })
-                    .FirstOrDefaultAsync();
+                .Where(_client => _client.ClientId == query.ClientId)
+                .Select(_client => new { _client.AliasLinkId, _client.CurrentAliasId })
+                .FirstOrDefaultAsync();
 
             var iqPenalties = ctx.Penalties.AsNoTracking()
                 .Where(_penalty => _penalty.OffenderId == query.ClientId ||
                                    linkedPenaltyType.Contains(_penalty.Type) && _penalty.LinkId == linkId.AliasLinkId);
 
             IQueryable<EFPenalty> iqIpLinkedPenalties = null;
-            
+            IQueryable<EFPenalty> identifierPenalties = null;
+
             if (!_appConfig.EnableImplicitAccountLinking)
             {
                 var usedIps = await ctx.Aliases.AsNoTracking()
-                    .Where(alias => (alias.LinkId == linkId.AliasLinkId || alias.AliasId == linkId.CurrentAliasId) && alias.IPAddress != null)
+                    .Where(alias =>
+                        (alias.LinkId == linkId.AliasLinkId || alias.AliasId == linkId.CurrentAliasId) &&
+                        alias.IPAddress != null)
                     .Select(alias => alias.IPAddress).ToListAsync();
 
+                   identifierPenalties = ctx.PenaltyIdentifiers.AsNoTracking().Where(identifier =>
+                        identifier.IPv4Address != null && usedIps.Contains(identifier.IPv4Address))
+                    .Select(id => id.Penalty);
+
                 var aliasedIds = await ctx.Aliases.AsNoTracking().Where(alias => usedIps.Contains(alias.IPAddress))
                     .Select(alias => alias.LinkId)
                     .ToListAsync();
 
                 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;
-            
+
             if (iqIpLinkedPenalties != null)
             {
                 iqAllPenalties = iqPenalties.Union(iqIpLinkedPenalties);
             }
 
-             var penalties = await iqAllPenalties
+            if (identifierPenalties != null)
+            {
+                iqAllPenalties = iqPenalties.Union(identifierPenalties);
+            }
+
+            var penalties = await iqAllPenalties
                 .Where(_penalty => _penalty.When < query.Before)
                 .OrderByDescending(_penalty => _penalty.When)
                 .Take(query.Count)
@@ -97,7 +112,7 @@ namespace IW4MAdmin.Application.Meta
             {
                 // todo: maybe actually count
                 RetrievedResultCount = penalties.Count,
-                Results = penalties
+                Results = penalties.Distinct()
             };
         }
     }

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/GeoLocationResult.cs

@@ -0,0 +1,13 @@
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Misc;
+
+public class GeoLocationResult : IGeoLocationResult
+{
+    public string Country { get; set; }
+    public string CountryCode { get; set; }
+    public string Region { get; set; }
+    public string ASN { get; set; }
+    public string Timezone { get; set; }
+    public string Organization { get; set; }
+}

Application/Misc/GeoLocationService.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Threading.Tasks;
+using MaxMind.GeoIP2;
+using MaxMind.GeoIP2.Responses;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Misc;
+
+public class GeoLocationService : IGeoLocationService
+{
+    private readonly string _sourceAddress;
+    
+    public GeoLocationService(string sourceAddress)
+    {
+        _sourceAddress = sourceAddress;
+    }
+    
+    public Task<IGeoLocationResult> Locate(string address)
+    {
+        CountryResponse country = null;
+        
+        try
+        {
+            using var reader = new DatabaseReader(_sourceAddress);
+            reader.TryCountry(address, out country);
+        }
+        catch
+        {
+            // ignored
+        }
+
+        var response = new GeoLocationResult
+        {
+            Country = country?.Country.Name ?? "Unknown",
+            CountryCode = country?.Country.IsoCode ?? ""
+        };
+
+        return Task.FromResult((IGeoLocationResult)response);
+    }
+}

Application/Misc/MetaService.cs

@@ -18,6 +18,7 @@ namespace IW4MAdmin.Application.Misc
     /// implementation of IMetaService
     /// used to add and retrieve runtime and persistent meta
     /// </summary>
+    [Obsolete("Use MetaServiceV2")]
     public class MetaService : IMetaService
     {
         private readonly IDictionary<MetaType, List<dynamic>> _metaActions;

Application/Misc/MetaServiceV2.cs

@@ -0,0 +1,453 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Data.Abstractions;
+using Data.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore.Dtos;
+using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.QueryHelper;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
+
+namespace IW4MAdmin.Application.Misc;
+
+public class MetaServiceV2 : IMetaServiceV2
+{
+    private readonly IDictionary<MetaType, List<dynamic>> _metaActions;
+    private readonly IDatabaseContextFactory _contextFactory;
+    private readonly ILogger _logger;
+
+    public MetaServiceV2(ILogger<MetaServiceV2> logger, IDatabaseContextFactory contextFactory)
+    {
+        _logger = logger;
+        _metaActions = new Dictionary<MetaType, List<dynamic>>();
+        _contextFactory = contextFactory;
+    }
+
+    public async Task SetPersistentMeta(string metaKey, string metaValue, int clientId,
+        CancellationToken token = default)
+    {
+        if (!ValidArgs(metaKey, clientId))
+        {
+            return;
+        }
+
+        await using var context = _contextFactory.CreateContext();
+
+        var existingMeta = await context.EFMeta
+            .Where(meta => meta.Key == metaKey)
+            .Where(meta => meta.ClientId == clientId)
+            .FirstOrDefaultAsync(token);
+
+        if (existingMeta != null)
+        {
+            _logger.LogDebug("Updating existing meta with key {Key} and id {Id}", existingMeta.Key,
+                existingMeta.MetaId);
+            existingMeta.Value = metaValue;
+            existingMeta.Updated = DateTime.UtcNow;
+        }
+
+        else
+        {
+            _logger.LogDebug("Adding new meta with key {Key}", metaKey);
+            context.EFMeta.Add(new EFMeta
+            {
+                ClientId = clientId,
+                Created = DateTime.UtcNow,
+                Key = metaKey,
+                Value = metaValue,
+            });
+        }
+
+        await context.SaveChangesAsync(token);
+    }
+
+    public async Task SetPersistentMetaValue<T>(string metaKey, T metaValue, int clientId,
+        CancellationToken token = default) where T : class
+    {
+        if (!ValidArgs(metaKey, clientId))
+        {
+            return;
+        }
+
+        string serializedValue;
+
+        try
+        {
+            serializedValue = JsonSerializer.Serialize(metaValue);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Could not serialize meta with key {Key}", metaKey);
+            return;
+        }
+
+        await SetPersistentMeta(metaKey, serializedValue, clientId, token);
+    }
+
+    public async Task SetPersistentMetaForLookupKey(string metaKey, string lookupKey, int lookupId, int clientId,
+        CancellationToken token = default)
+    {
+        if (!ValidArgs(metaKey, clientId))
+        {
+            return;
+        }
+
+        await using var context = _contextFactory.CreateContext();
+
+        var lookupMeta = await context.EFMeta.FirstOrDefaultAsync(meta => meta.Key == lookupKey, token);
+
+        if (lookupMeta is null)
+        {
+            _logger.LogWarning("No lookup meta exists for metaKey {MetaKey} and lookupKey {LookupKey}", metaKey,
+                lookupKey);
+            return;
+        }
+
+        var lookupValues = JsonSerializer.Deserialize<List<LookupValue<string>>>(lookupMeta.Value);
+
+        if (lookupValues is null)
+        {
+            return;
+        }
+
+        var foundLookup = lookupValues.FirstOrDefault(value => value.Id == lookupId);
+
+        if (foundLookup is null)
+        {
+            _logger.LogWarning("No lookup meta found for provided lookup id {MetaKey}, {LookupKey}, {LookupId}",
+                metaKey, lookupKey, lookupId);
+            return;
+        }
+
+        _logger.LogDebug("Setting meta for lookup {MetaKey}, {LookupKey}, {LookupId}",
+            metaKey, lookupKey, lookupId);
+
+        await SetPersistentMeta(metaKey, lookupId.ToString(), clientId, token);
+    }
+
+    public async Task IncrementPersistentMeta(string metaKey, int incrementAmount, int clientId,
+        CancellationToken token = default)
+    {
+        if (!ValidArgs(metaKey, clientId))
+        {
+            return;
+        }
+
+        var existingMeta = await GetPersistentMeta(metaKey, clientId, token);
+
+        if (!long.TryParse(existingMeta?.Value ?? "0", out var existingValue))
+        {
+            existingValue = 0;
+        }
+
+        var newValue = existingValue + incrementAmount;
+        await SetPersistentMeta(metaKey, newValue.ToString(), clientId, token);
+    }
+
+    public async Task DecrementPersistentMeta(string metaKey, int decrementAmount, int clientId,
+        CancellationToken token = default)
+    {
+        await IncrementPersistentMeta(metaKey, -decrementAmount, clientId, token);
+    }
+
+    public async Task<EFMeta> GetPersistentMeta(string metaKey, int clientId, CancellationToken token = default)
+    {
+        if (!ValidArgs(metaKey, clientId))
+        {
+            return null;
+        }
+
+        await using var ctx = _contextFactory.CreateContext(enableTracking: false);
+
+        return await ctx.EFMeta
+            .Where(meta => meta.Key == metaKey)
+            .Where(meta => meta.ClientId == clientId)
+            .Select(meta => new EFMeta
+            {
+                MetaId = meta.MetaId,
+                Key = meta.Key,
+                ClientId = meta.ClientId,
+                Value = meta.Value,
+            })
+            .FirstOrDefaultAsync(token);
+    }
+
+    public async Task<T> GetPersistentMetaValue<T>(string metaKey, int clientId, CancellationToken token = default)
+        where T : class
+    {
+        var meta = await GetPersistentMeta(metaKey, clientId, token);
+
+        if (meta is null)
+        {
+            return default;
+        }
+
+        try
+        {
+            return JsonSerializer.Deserialize<T>(meta.Value);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Could not deserialize meta with key {Key} and value {Value}", metaKey, meta.Value);
+            return default;
+        }
+    }
+
+    public async Task<EFMeta> GetPersistentMetaByLookup(string metaKey, string lookupKey, int clientId,
+        CancellationToken token = default)
+    {
+        await using var context = _contextFactory.CreateContext();
+
+        var metaValue = await GetPersistentMeta(metaKey, clientId, token);
+
+        if (metaValue is null)
+        {
+            _logger.LogDebug("No meta exists for key {Key}, clientId {ClientId}", metaKey, clientId);
+            return default;
+        }
+
+        var lookupMeta = await context.EFMeta.FirstOrDefaultAsync(meta => meta.Key == lookupKey, token);
+
+        if (lookupMeta is null)
+        {
+            _logger.LogWarning("No lookup meta exists for metaKey {MetaKey} and lookupKey {LookupKey}", metaKey,
+                lookupKey);
+            return default;
+        }
+
+        var lookupId = int.Parse(metaValue.Value);
+        var lookupValues = JsonSerializer.Deserialize<List<LookupValue<string>>>(lookupMeta.Value);
+
+        if (lookupValues is null)
+        {
+            return default;
+        }
+
+        var foundLookup = lookupValues.FirstOrDefault(value => value.Id == lookupId);
+
+        if (foundLookup is not null)
+        {
+            return new EFMeta
+            {
+                Created = metaValue.Created,
+                Updated = metaValue.Updated,
+                Extra = metaValue.Extra,
+                MetaId = metaValue.MetaId,
+                Value = foundLookup.Value
+            };
+        }
+
+        _logger.LogWarning("No lookup meta found for provided lookup id {MetaKey}, {LookupKey}, {LookupId}",
+            metaKey, lookupKey, lookupId);
+        return default;
+    }
+
+    public async Task RemovePersistentMeta(string metaKey, int clientId, CancellationToken token = default)
+    {
+        if (!ValidArgs(metaKey, clientId))
+        {
+            return;
+        }
+
+        await using var context = _contextFactory.CreateContext();
+
+        var existingMeta = await context.EFMeta
+            .FirstOrDefaultAsync(meta => meta.Key == metaKey && meta.ClientId == clientId, token);
+
+        if (existingMeta == null)
+        {
+            _logger.LogDebug("No meta with key {Key} found for client id {Id}", metaKey, clientId);
+            return;
+        }
+
+        _logger.LogDebug("Removing meta for key {Key} with id {Id}", metaKey, existingMeta.MetaId);
+        context.EFMeta.Remove(existingMeta);
+        await context.SaveChangesAsync(token);
+    }
+
+    public async Task SetPersistentMeta(string metaKey, string metaValue, CancellationToken token = default)
+    {
+        if (string.IsNullOrWhiteSpace(metaKey))
+        {
+            _logger.LogWarning("Cannot save meta with no key");
+            return;
+        }
+
+        await using var ctx = _contextFactory.CreateContext();
+
+        var existingMeta = await ctx.EFMeta
+            .Where(meta => meta.Key == metaKey)
+            .Where(meta => meta.ClientId == null)
+            .FirstOrDefaultAsync(token);
+
+        if (existingMeta is not null)
+        {
+            _logger.LogDebug("Updating existing meta with key {Key} and id {Id}", existingMeta.Key,
+                existingMeta.MetaId);
+
+            existingMeta.Value = metaValue;
+            existingMeta.Updated = DateTime.UtcNow;
+
+            await ctx.SaveChangesAsync(token);
+        }
+
+        else
+        {
+            _logger.LogDebug("Adding new meta with key {Key}", metaKey);
+
+            ctx.EFMeta.Add(new EFMeta
+            {
+                Created = DateTime.UtcNow,
+                Key = metaKey,
+                Value = metaValue
+            });
+
+            await ctx.SaveChangesAsync(token);
+        }
+    }
+
+    public async Task SetPersistentMetaValue<T>(string metaKey, T metaValue, CancellationToken token = default)
+        where T : class
+    {
+        if (string.IsNullOrWhiteSpace(metaKey))
+        {
+            _logger.LogWarning("Meta key is null, not setting");
+            return;
+        }
+
+        if (metaValue is null)
+        {
+            _logger.LogWarning("Meta value is null, not setting");
+            return;
+        }
+
+        string serializedMeta;
+        try
+        {
+            serializedMeta = JsonSerializer.Serialize(metaValue);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Could not serialize meta with {Key} and value {Value}", metaKey, metaValue);
+            return;
+        }
+
+        await SetPersistentMeta(metaKey, serializedMeta, token);
+    }
+
+    public async Task<EFMeta> GetPersistentMeta(string metaKey, CancellationToken token = default)
+    {
+        if (string.IsNullOrWhiteSpace(metaKey))
+        {
+            return null;
+        }
+
+        await using var context = _contextFactory.CreateContext(false);
+        return await context.EFMeta.FirstOrDefaultAsync(meta => meta.Key == metaKey, token);
+    }
+
+    public async Task<T> GetPersistentMetaValue<T>(string metaKey, CancellationToken token = default) where T : class
+    {
+        if (string.IsNullOrWhiteSpace(metaKey))
+        {
+            return default;
+        }
+
+        var meta = await GetPersistentMeta(metaKey, token);
+
+        if (meta is null)
+        {
+            return default;
+        }
+
+        try
+        {
+            return JsonSerializer.Deserialize<T>(meta.Value);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Could not serialize meta with key {Key} and value {Value}", metaKey, meta.Value);
+            return default;
+        }
+    }
+
+    public async Task RemovePersistentMeta(string metaKey, CancellationToken token = default)
+    {
+        if (string.IsNullOrWhiteSpace(metaKey))
+        {
+            return;
+        }
+
+        await using var context = _contextFactory.CreateContext(enableTracking: false);
+
+        var existingMeta = await context.EFMeta
+            .Where(meta => meta.Key == metaKey)
+            .Where(meta => meta.ClientId == null)
+            .FirstOrDefaultAsync(token);
+
+        if (existingMeta != null)
+        {
+            _logger.LogDebug("Removing meta for key {Key} with id {Id}", metaKey, existingMeta.MetaId);
+            context.Remove(existingMeta);
+            await context.SaveChangesAsync(token);
+        }
+    }
+
+    public void AddRuntimeMeta<T, TReturnType>(MetaType metaKey,
+        Func<T, CancellationToken, Task<IEnumerable<TReturnType>>> metaAction)
+        where T : PaginationRequest where TReturnType : IClientMeta
+    {
+        if (!_metaActions.ContainsKey(metaKey))
+        {
+            _metaActions.Add(metaKey, new List<dynamic> { metaAction });
+        }
+
+        else
+        {
+            _metaActions[metaKey].Add(metaAction);
+        }
+    }
+
+    public async Task<IEnumerable<IClientMeta>> GetRuntimeMeta(ClientPaginationRequest request, CancellationToken token = default)
+    {
+        var metas = await Task.WhenAll(_metaActions.Where(kvp => kvp.Key != MetaType.Information)
+            .Select(async kvp => await kvp.Value[0](request, token)));
+
+        return metas.SelectMany(m => (IEnumerable<IClientMeta>)m)
+            .OrderByDescending(m => m.When)
+            .Take(request.Count)
+            .ToList();
+    }
+
+    public async Task<IEnumerable<T>> GetRuntimeMeta<T>(ClientPaginationRequest request, MetaType metaType,  CancellationToken token = default)
+        where T : IClientMeta
+    {
+        if (metaType == MetaType.Information)
+        {
+            var allMeta = new List<T>();
+
+            var completedMeta = await Task.WhenAll(_metaActions[metaType].Select(async individualMetaRegistration =>
+                (IEnumerable<T>)await individualMetaRegistration(request, token)));
+
+            allMeta.AddRange(completedMeta.SelectMany(meta => meta));
+
+            return ProcessInformationMeta(allMeta);
+        }
+
+        var meta = await _metaActions[metaType][0](request, token) as IEnumerable<T>;
+
+        return meta;
+    }
+
+    private static IEnumerable<T> ProcessInformationMeta<T>(IEnumerable<T> meta) where T : IClientMeta
+    {
+        return meta;
+    }
+
+    private static bool ValidArgs(string key, int clientId) => !string.IsNullOrWhiteSpace(key) && clientId > 0;
+}

Application/Misc/ScriptPlugin.cs

@@ -223,47 +223,49 @@ namespace IW4MAdmin.Application.Misc
 
         public async Task OnEventAsync(GameEvent gameEvent, Server server)
         {
-            if (_successfullyLoaded)
+            if (!_successfullyLoaded)
             {
-                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()))
-                    {
-                        _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);
-                    }
+                return;
+            }
 
-                    throw new PluginException("An error occured while executing action for script plugin");
+            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()))
+                {
+                    _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 (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");
+            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);
                 }
 
-                finally
+                throw new PluginException("An error occured while executing action for script plugin");
+            }
+
+            finally
+            {
+                if (_onProcessing.CurrentCount == 0)
                 {
-                    if (_onProcessing.CurrentCount == 0)
-                    {
-                        _onProcessing.Release(1);
-                    }
+                    _onProcessing.Release(1);
                 }
             }
         }
@@ -274,6 +276,8 @@ namespace IW4MAdmin.Application.Misc
             {
                 _logger.LogDebug("OnLoad executing for {Name}", Name);
                 _scriptEngine.SetValue("_manager", manager);
+                _scriptEngine.SetValue("getDvar", GetDvarAsync);
+                _scriptEngine.SetValue("setDvar", SetDvarAsync);
                 _scriptEngine.Evaluate("plugin.onLoadAsync(_manager)");
 
                 return Task.CompletedTask;
@@ -449,6 +453,85 @@ namespace IW4MAdmin.Application.Misc
 
             return commandList;
         }
+
+        private void GetDvarAsync(Server server, string dvarName, Delegate onCompleted)
+        {
+            Task.Run<Task>(async () =>
+            {
+                var tokenSource = new CancellationTokenSource();
+                tokenSource.CancelAfter(TimeSpan.FromSeconds(5));
+                string result = null;
+                var success = true;
+                try
+                {
+                    result = (await server.GetDvarAsync<string>(dvarName, token: tokenSource.Token)).Value;
+                }
+                catch
+                {
+                    success = false;
+                }
+
+                await _onProcessing.WaitAsync();
+                try
+                {
+                    onCompleted.DynamicInvoke(JsValue.Undefined,
+                        new[]
+                        {
+                            JsValue.FromObject(_scriptEngine, server), 
+                            JsValue.FromObject(_scriptEngine, dvarName),
+                            JsValue.FromObject(_scriptEngine, result),
+                            JsValue.FromObject(_scriptEngine, success), 
+                        });
+                }
+
+                finally
+                {
+                    if (_onProcessing.CurrentCount == 0)
+                    {
+                        _onProcessing.Release();
+                    }
+                }
+            });
+        }
+        private void SetDvarAsync(Server server, string dvarName, string dvarValue, Delegate onCompleted)
+        {
+            Task.Run<Task>(async () =>
+            {
+                var tokenSource = new CancellationTokenSource();
+                tokenSource.CancelAfter(TimeSpan.FromSeconds(5));
+                var success = true;
+
+                try
+                {
+                    await server.SetDvarAsync(dvarName, dvarValue, tokenSource.Token);
+                }
+                catch
+                {
+                    success = false;
+                }
+
+                await _onProcessing.WaitAsync();
+                try
+                {
+                    onCompleted.DynamicInvoke(JsValue.Undefined,
+                        new[]
+                        {
+                            JsValue.FromObject(_scriptEngine, server),
+                            JsValue.FromObject(_scriptEngine, dvarName), 
+                            JsValue.FromObject(_scriptEngine, dvarValue),
+                            JsValue.FromObject(_scriptEngine, success)
+                        });
+                }
+
+                finally
+                {
+                    if (_onProcessing.CurrentCount == 0)
+                    {
+                        _onProcessing.Release();
+                    }
+                }
+            });
+        }
     }
 
     public class PermissionLevelToStringConverter : IObjectConverter

Application/Misc/ScriptPluginConfigurationWrapper.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
 using IW4MAdmin.Application.Configuration;
 using Jint;
@@ -84,9 +85,9 @@ namespace IW4MAdmin.Application.Misc
 
             var item = _config[_pluginName][key];
 
-            if (item is JArray array)
+            if (item is JsonElement { ValueKind: JsonValueKind.Array } jElem)
             {
-                item = array.ToObject<List<dynamic>>();
+                item = jElem.Deserialize<List<dynamic>>();
             }
 
             return JsValue.FromObject(_scriptEngine, item);

Application/Misc/ServerDataCollector.cs

@@ -94,7 +94,8 @@ namespace IW4MAdmin.Application.Misc
                     PeriodBlock = (int) (DateTimeOffset.UtcNow - DateTimeOffset.UnixEpoch).TotalMinutes,
                     ServerId = await server.GetIdForServer(),
                     MapId = await GetOrCreateMap(server.CurrentMap.Name, (Reference.Game) server.GameName, token),
-                    ClientCount = server.ClientNum
+                    ClientCount = server.ClientNum,
+                    ConnectionInterrupted = server.Throttled,
                 }));
 
             return data;
@@ -144,4 +145,4 @@ namespace IW4MAdmin.Application.Misc
             context.SaveChanges();
         }
     }
-}
+}

Application/Misc/ServerDataViewer.cs

@@ -135,7 +135,9 @@ namespace IW4MAdmin.Application.Misc
                         {
                             snapshot.ServerId,
                             snapshot.CapturedAt,
-                            snapshot.ClientCount
+                            snapshot.ClientCount,
+                            snapshot.ConnectionInterrupted,
+                            MapName = snapshot.Map.Name,
                         })
                     .OrderBy(snapshot => snapshot.CapturedAt)
                     .ToListAsync(cancellationToken);
@@ -143,8 +145,8 @@ namespace IW4MAdmin.Application.Misc
                 return history.GroupBy(snapshot => snapshot.ServerId).Select(byServer => new ClientHistoryInfo
                 {
                     ServerId = byServer.Key,
-                    ClientCounts = byServer.Select(snapshot => new ClientCountSnapshot()
-                        {Time = snapshot.CapturedAt, ClientCount = snapshot.ClientCount}).ToList()
+                    ClientCounts = byServer.Select(snapshot => new ClientCountSnapshot
+                        { Time = snapshot.CapturedAt, ClientCount = snapshot.ClientCount, ConnectionInterrupted = snapshot.ConnectionInterrupted ?? false, Map = snapshot.MapName}).ToList()
                 }).ToList();
             }, nameof(_clientHistoryCache), TimeSpan.MaxValue);
 
@@ -159,4 +161,4 @@ namespace IW4MAdmin.Application.Misc
             }
         }
     }
-}
+}

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)

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; }
 
@@ -119,6 +120,9 @@ namespace Data.Context
                 ent.Property(_alias => _alias.SearchableName).HasMaxLength(24);
                 ent.HasIndex(_alias => _alias.SearchableName);
                 ent.HasIndex(_alias => new {_alias.Name, _alias.IPAddress});
+                ent.Property(alias => alias.SearchableIPAddress)
+                    .HasComputedColumnSql(@"((IPAddress & 255) || '.' || ((IPAddress >> 8) & 255)) || '.' || ((IPAddress >> 16) & 255) || '.' || ((IPAddress >> 24) & 255)", stored: true);
+                ent.HasIndex(alias => alias.SearchableIPAddress);
             });
 
             modelBuilder.Entity<EFMeta>(ent =>
@@ -130,6 +134,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 +147,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/20220329213440_AddConnectionInterruptedToEFServerSnapshot.cs

@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.MySql
+{
+    public partial class AddConnectionInterruptedToEFServerSnapshot : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "ConnectionInterrupted",
+                table: "EFServerSnapshot",
+                type: "tinyint(1)",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ConnectionInterrupted",
+                table: "EFServerSnapshot");
+        }
+    }
+}

Data/Migrations/MySql/20220404151444_AddSearchableIPToEFAlias.cs

@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.MySql
+{
+    public partial class AddSearchableIPToEFAlias : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "SearchableIPAddress",
+                table: "EFAlias",
+                type: "longtext",
+                nullable: true,
+                computedColumnSql: "CONCAT((IPAddress & 255), \".\", ((IPAddress >> 8) & 255), \".\", ((IPAddress >> 16) & 255), \".\", ((IPAddress >> 24) & 255))",
+                stored: true)
+                .Annotation("MySql:CharSet", "utf8mb4");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "SearchableIPAddress",
+                table: "EFAlias");
+        }
+    }
+}

Data/Migrations/MySql/20220404192417_AddIndexToSearchableIPToEFAlias.cs

@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.MySql
+{
+    public partial class AddIndexToSearchableIPToEFAlias : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateIndex(
+                name: "IX_EFAlias_SearchableIPAddress",
+                table: "EFAlias",
+                column: "SearchableIPAddress");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_EFAlias_SearchableIPAddress",
+                table: "EFAlias");
+        }
+    }
+}

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,17 @@ 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>("SearchableIPAddress")
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("varchar(255)")
+                        .HasComputedColumnSql("((IPAddress & 255) || '.' || ((IPAddress >> 8) & 255)) || '.' || ((IPAddress >> 16) & 255) || '.' || ((IPAddress >> 24) & 255)", true);
 
                     b.Property<string>("SearchableName")
-                        .HasColumnType("varchar(24) CHARACTER SET utf8mb4")
-                        .HasMaxLength(24);
+                        .HasMaxLength(24)
+                        .HasColumnType("varchar(24)");
 
                     b.HasKey("AliasId");
 
@@ -814,11 +821,13 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("Name");
 
+                    b.HasIndex("SearchableIPAddress");
+
                     b.HasIndex("SearchableName");
 
                     b.HasIndex("Name", "IPAddress");
 
-                    b.ToTable("EFAlias");
+                    b.ToTable("EFAlias", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.EFAliasLink", b =>
@@ -832,7 +841,7 @@ namespace Data.Migrations.MySql
 
                     b.HasKey("AliasLinkId");
 
-                    b.ToTable("EFAliasLinks");
+                    b.ToTable("EFAliasLinks", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.EFChangeHistory", b =>
@@ -845,11 +854,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 +867,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 +899,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 +914,7 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("Value")
                         .IsRequired()
-                        .HasColumnType("longtext CHARACTER SET utf8mb4");
+                        .HasColumnType("longtext");
 
                     b.HasKey("MetaId");
 
@@ -928,7 +937,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 +945,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 +953,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 +972,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 +1023,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 +1054,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 +1070,7 @@ namespace Data.Migrations.MySql
 
                     b.HasKey("ServerId");
 
-                    b.ToTable("EFServers");
+                    b.ToTable("EFServers", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerSnapshot", b =>
@@ -1047,6 +1088,9 @@ namespace Data.Migrations.MySql
                     b.Property<int>("ClientCount")
                         .HasColumnType("int");
 
+                    b.Property<bool?>("ConnectionInterrupted")
+                        .HasColumnType("tinyint(1)");
+
                     b.Property<int>("MapId")
                         .HasColumnType("int");
 
@@ -1062,7 +1106,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 +1131,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFServerStatistics");
+                    b.ToTable("EFServerStatistics", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Vector3", b =>
@@ -1107,7 +1151,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 +1167,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 +1186,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 +1205,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 +1242,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 +1269,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 +1310,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 +1351,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 +1376,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 +1389,8 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("ClientId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Client");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientStatistics", b =>
@@ -1304,6 +1406,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 +1431,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 +1448,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 +1469,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 +1484,8 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("LinkId")
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
+
+                    b.Navigation("Link");
                 });
 
             modelBuilder.Entity("Data.Models.EFMeta", b =>
@@ -1376,15 +1498,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 +1521,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 +1557,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 +1578,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 +1591,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/20220329213521_AddConnectionInterruptedToEFServerSnapshot.cs

@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.Postgresql
+{
+    public partial class AddConnectionInterruptedToEFServerSnapshot : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "ConnectionInterrupted",
+                table: "EFServerSnapshot",
+                type: "boolean",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ConnectionInterrupted",
+                table: "EFServerSnapshot");
+        }
+    }
+}

Data/Migrations/Postgresql/20220404185627_AddSearchableIPToEFAlias.cs

@@ -0,0 +1,27 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.Postgresql
+{
+    public partial class AddSearchableIPToEFAlias : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "SearchableIPAddress",
+                table: "EFAlias",
+                type: "text",
+                nullable: true,
+                computedColumnSql: "CASE WHEN \"IPAddress\" IS NULL THEN 'NULL'::text ELSE (\"IPAddress\" & 255)::text || '.'::text || ((\"IPAddress\" >> 8) & 255)::text || '.'::text || ((\"IPAddress\" >> 16) & 255)::text || '.'::text || ((\"IPAddress\" >> 24) & 255)::text END",
+                stored: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "SearchableIPAddress",
+                table: "EFAlias");
+        }
+    }
+}

Data/Migrations/Postgresql/20220404192553_AddIndexToSearchableIPToEFAlias.cs

@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.Postgresql
+{
+    public partial class AddIndexToSearchableIPToEFAlias : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateIndex(
+                name: "IX_EFAlias_SearchableIPAddress",
+                table: "EFAlias",
+                column: "SearchableIPAddress");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_EFAlias_SearchableIPAddress",
+                table: "EFAlias");
+        }
+    }
+}

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,17 @@ namespace Data.Migrations.Postgresql
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasColumnType("character varying(24)")
-                        .HasMaxLength(24);
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)");
+
+                    b.Property<string>("SearchableIPAddress")
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("text")
+                        .HasComputedColumnSql("((IPAddress & 255) || '.' || ((IPAddress >> 8) & 255)) || '.' || ((IPAddress >> 16) & 255) || '.' || ((IPAddress >> 24) & 255)", true);
 
                     b.Property<string>("SearchableName")
-                        .HasColumnType("character varying(24)")
-                        .HasMaxLength(24);
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)");
 
                     b.HasKey("AliasId");
 
@@ -834,41 +860,45 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("Name");
 
+                    b.HasIndex("SearchableIPAddress");
+
                     b.HasIndex("SearchableName");
 
                     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 +930,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 +948,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 +976,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 +992,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 +1019,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 +1121,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");
@@ -1073,6 +1141,9 @@ namespace Data.Migrations.Postgresql
                     b.Property<int>("ClientCount")
                         .HasColumnType("integer");
 
+                    b.Property<bool?>("ConnectionInterrupted")
+                        .HasColumnType("boolean");
+
                     b.Property<int>("MapId")
                         .HasColumnType("integer");
 
@@ -1088,15 +1159,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 +1186,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 +1208,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 +1224,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 +1243,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 +1262,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 +1299,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 +1326,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 +1367,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 +1408,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 +1433,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 +1446,8 @@ namespace Data.Migrations.Postgresql
                         .HasForeignKey("ClientId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Client");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientStatistics", b =>
@@ -1332,6 +1463,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 +1488,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 +1505,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 +1526,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 +1541,8 @@ namespace Data.Migrations.Postgresql
                         .HasForeignKey("LinkId")
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
+
+                    b.Navigation("Link");
                 });
 
             modelBuilder.Entity("Data.Models.EFMeta", b =>
@@ -1404,15 +1555,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 +1578,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 +1614,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 +1635,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 +1648,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/20220329163928_AddConnectionInterruptedToEFServerSnapshot.cs

@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.Sqlite
+{
+    public partial class AddConnectionInterruptedToEFServerSnapshot : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "ConnectionInterrupted",
+                table: "EFServerSnapshot",
+                type: "INTEGER",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ConnectionInterrupted",
+                table: "EFServerSnapshot");
+        }
+    }
+}

Data/Migrations/Sqlite/20220402211115_AddSearchableIPToEFAlias.cs

@@ -0,0 +1,26 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.Sqlite
+{
+    public partial class AddSearchableIPToEFAlias : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "SearchableIPAddress",
+                table: "EFAlias",
+                type: "TEXT",
+                nullable: true,
+                computedColumnSql: "((IPAddress & 255) || '.' || ((IPAddress >> 8) & 255)) || '.' || ((IPAddress >> 16) & 255) || '.' || ((IPAddress >> 24) & 255)");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "SearchableIPAddress",
+                table: "EFAlias");
+        }
+    }
+}

Data/Migrations/Sqlite/20220404192319_AddIndexToSearchableIPToEFAlias.cs

@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.Sqlite
+{
+    public partial class AddIndexToSearchableIPToEFAlias : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateIndex(
+                name: "IX_EFAlias_SearchableIPAddress",
+                table: "EFAlias",
+                column: "SearchableIPAddress");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_EFAlias_SearchableIPAddress",
+                table: "EFAlias");
+        }
+    }
+}

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,17 @@ namespace Data.Migrations.Sqlite
 
                     b.Property<string>("Name")
                         .IsRequired()
+                        .HasMaxLength(24)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SearchableIPAddress")
+                        .ValueGeneratedOnAddOrUpdate()
                         .HasColumnType("TEXT")
-                        .HasMaxLength(24);
+                        .HasComputedColumnSql("((IPAddress & 255) || '.' || ((IPAddress >> 8) & 255)) || '.' || ((IPAddress >> 16) & 255) || '.' || ((IPAddress >> 24) & 255)");
 
                     b.Property<string>("SearchableName")
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(24);
+                        .HasMaxLength(24)
+                        .HasColumnType("TEXT");
 
                     b.HasKey("AliasId");
 
@@ -813,11 +819,13 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("Name");
 
+                    b.HasIndex("SearchableIPAddress");
+
                     b.HasIndex("SearchableName");
 
                     b.HasIndex("Name", "IPAddress");
 
-                    b.ToTable("EFAlias");
+                    b.ToTable("EFAlias", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.EFAliasLink", b =>
@@ -831,7 +839,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasKey("AliasLinkId");
 
-                    b.ToTable("EFAliasLinks");
+                    b.ToTable("EFAliasLinks", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.EFChangeHistory", b =>
@@ -844,8 +852,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 +901,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 +943,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 +970,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 +1068,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasKey("ServerId");
 
-                    b.ToTable("EFServers");
+                    b.ToTable("EFServers", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerSnapshot", b =>
@@ -1046,6 +1086,9 @@ namespace Data.Migrations.Sqlite
                     b.Property<int>("ClientCount")
                         .HasColumnType("INTEGER");
 
+                    b.Property<bool?>("ConnectionInterrupted")
+                        .HasColumnType("INTEGER");
+
                     b.Property<int>("MapId")
                         .HasColumnType("INTEGER");
 
@@ -1061,7 +1104,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 +1129,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFServerStatistics");
+                    b.ToTable("EFServerStatistics", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Vector3", b =>
@@ -1106,7 +1149,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 +1165,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 +1184,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 +1203,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 +1240,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 +1267,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 +1308,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 +1349,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 +1374,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 +1387,8 @@ namespace Data.Migrations.Sqlite
                         .HasForeignKey("ClientId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Client");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientStatistics", b =>
@@ -1303,6 +1404,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 +1429,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 +1446,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 +1467,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 +1482,8 @@ namespace Data.Migrations.Sqlite
                         .HasForeignKey("LinkId")
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
+
+                    b.Navigation("Link");
                 });
 
             modelBuilder.Entity("Data.Models.EFMeta", b =>
@@ -1375,15 +1496,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 +1519,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 +1555,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 +1576,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 +1589,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/AuditFields.cs

@@ -10,4 +10,4 @@ namespace Stats.Models
         public DateTime CreatedDateTime { get; set; } = DateTime.UtcNow;
         public DateTime? UpdatedDateTime { get; set; } 
     }
-}
+}

Data/Models/EFAlias.cs

@@ -19,6 +19,7 @@ namespace Data.Models
         public string SearchableName { get; set; }
         [Required]
         public int? IPAddress { get; set; }
+        public string SearchableIPAddress { get; set; }
         [Required]
         public DateTime DateAdded { get; set; }
 

Data/Models/EFMeta.cs

@@ -10,8 +10,8 @@ namespace Data.Models
     /// </summary>
     public class EFMeta : SharedEntity
     {
-        public const string ClientTagName = nameof(ClientTagName);
-        public const string ClientTag = nameof(ClientTag);
+        public const string ClientTagNameV2 = nameof(ClientTagNameV2);
+        public const string ClientTagV2 = nameof(ClientTagV2);
 
         [Key]
         public int MetaId { get; set; }

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; }
+}

Data/Models/Server/EFServerSnapshot.cs

@@ -32,5 +32,7 @@ namespace Data.Models.Server
         public EFMap Map { get; set; }
         
         public int ClientCount { get; set; }
+        
+        public bool? ConnectionInterrupted {get;set;}
     }
-}
+}

DeploymentFiles/deployment-pipeline.yml

@@ -75,6 +75,7 @@ steps:
       Write-Host 'Unzipping download'
       Expand-Archive -LiteralPath $(Build.Repository.LocalPath)\dotnet-bundle.zip -DestinationPath $(Build.Repository.LocalPath)
       Write-Host 'Executing dotnet-bundle'
+      $(Build.Repository.LocalPath)\dotnet-bundle.exe clean $(Build.Repository.LocalPath)\WebfrontCore\bundleconfig.json
       $(Build.Repository.LocalPath)\dotnet-bundle.exe $(Build.Repository.LocalPath)\WebfrontCore\bundleconfig.json
     failOnStderr: true
     workingDirectory: '$(Build.Repository.LocalPath)\WebfrontCore'

GameFiles/IW4x/userraw/scripts/_integration.gsc

@@ -33,7 +33,12 @@ init()
     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();
@@ -60,7 +65,15 @@ OnPlayerConnect()
         }
         
         player thread OnPlayerSpawned();
+        player thread OnPlayerJoinedTeam();
+        player thread OnPlayerJoinedSpectators();
         player thread PlayerTrackingOnInterval();
+        
+        // only toggle if it's enabled
+        if ( IsDefined( level.nightModeEnabled ) && level.nightModeEnabled )
+        {
+            player ToggleNightMode();
+        }
     }
 }
 
@@ -86,6 +99,30 @@ OnPlayerDisconnect()
     }
 }
 
+OnPlayerJoinedTeam()
+{
+	self endon( "disconnect" );
+
+	for( ;; )
+	{
+		self waittill( "joined_team" );
+        // join spec and join team occur at the same moment - out of order logging would be problematic
+        wait( 0.25 ); 
+        LogPrint( GenerateJoinTeamString( false ) );
+	}
+}
+
+OnPlayerJoinedSpectators()
+{
+	self endon( "disconnect" );
+
+	for( ;; )
+	{
+        self waittill( "joined_spectators" );
+        LogPrint( GenerateJoinTeamString( true ) );
+	}
+}
+
 OnGameEnded() 
 {
     level endon ( "disconnect" );
@@ -94,7 +131,7 @@ OnGameEnded()
     {
         level waittill( "game_ended" );
         // note: you can run data code here but it's possible for 
-        // data to get trucated, so we will try a timer based approach for now
+        // data to get truncated, so we will try a timer based approach for now
     }
 }
 
@@ -117,6 +154,11 @@ DisplayWelcomeData()
 PlayerConnectEvents() 
 {
     self endon( "disconnect" );
+
+    if ( IsDefined( self.isHidden ) && self.isHidden )
+    {
+        self HideImpl();
+    }
     
     clientData = self.pers[level.clientDataKey];
     
@@ -199,6 +241,37 @@ DecrementClientMeta( metaKey, decrementValue, clientId )
     SetClientMeta( metaKey, decrementValue, clientId, "decrement" );
 }
 
+GenerateJoinTeamString( isSpectator ) 
+{
+    team = self.team;
+
+    if ( IsDefined( self.joining_team ) )
+    {
+        team = self.joining_team;
+    }
+    else
+    {
+        if ( isSpectator || !IsDefined( team ) ) 
+        {
+            team = "spectator";
+        }
+    }
+
+    guid = self GetXuid();
+
+    if ( guid == "0" )
+    {
+        guid = self.guid;
+    }
+
+    if ( !IsDefined( guid ) || guid == "0" )
+    {
+        guid = "undefined";
+    }
+
+    return "JT;" + guid + ";" + self getEntityNumber() + ";" + team + ";" + self.name + "\n";
+}
+
 SetClientMeta( metaKey, metaValue, clientId, direction )
 {
     data = "key=" + metaKey + "|value=" + metaValue;
@@ -228,15 +301,21 @@ SaveTrackingMetrics()
 {
     if ( level.iw4adminIntegrationDebug == 1 )
     {
-        self IPrintLn( "Saving tracking metrics for " + self.persistentClientId );
+        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 )
     {
-        self IPrintLn( "Total Shots Fired increased by " + change );
+        IPrintLn( "Total Shots Fired increased by " + change );
     }
 
     if ( !IsDefined( change ) )
@@ -251,7 +330,6 @@ SaveTrackingMetrics()
 
     IncrementClientMeta( "TotalShotsFired", change, self.persistentClientId );
 
-    self.lastShotCount = currentShotCount;
 }
 
 BuildEventRequest( responseExpected, eventType, eventSubtype, entOrId, data ) 
@@ -391,18 +469,22 @@ NotifyClientEventTimeout( eventType )
 
 NotifyClientEvent( eventInfo )
 {
-    client = getPlayerFromClientNum( int( eventInfo[3] ) );
+    origin = getPlayerFromClientNum( int( eventInfo[3] ) );
+    target = getPlayerFromClientNum( int( eventInfo[4] ) );
     
     event = spawnstruct();
     event.type = eventInfo[1];
     event.subtype = eventInfo[2];
-    event.data = eventInfo[4];
+    event.data = eventInfo[5];
+    event.origin = origin;
+    event.target = target;
     
     if ( level.iw4adminIntegrationDebug == 1 )
     {
-        IPrintLn(event.data);
+        IPrintLn( "NotifyClientEvent->" + event.data );
     }
-    
+
+    client = event.origin;
     client.event = event;
 
     level notify( level.eventTypes.localClientEvent, client );
@@ -452,33 +534,59 @@ OnClientDataReceived( event )
 OnExecuteCommand( event ) 
 {
     data = ParseDataString( event.data );
+    response = "";
+
     switch ( event.subtype ) 
     {
         case "GiveWeapon":
-            self GiveWeaponImpl( data );
+            response = event.target GiveWeaponImpl( data );
             break;
         case "TakeWeapons":
-            self TakeWeaponsImpl();
+            response = event.target TakeWeaponsImpl();
             break;
         case "SwitchTeams":
-            self TeamSwitchImpl();
+            response = event.target TeamSwitchImpl();
             break;
         case "Hide":
-            self HideImpl();
+            response = self HideImpl();
             break;
         case "Unhide":
-            self UnhideImpl();
+            response = self UnhideImpl();
             break;
         case "Alert":
-            self AlertImpl( data );
+            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"] );
@@ -491,54 +599,201 @@ OnSetClientDataCompleted( event )
 
 GiveWeaponImpl( data )
 {
-    if ( IsAlive( self ) ) 
+    if ( !IsAlive( self ) )
     {
-        self IPrintLnBold( "You have been given a new weapon" );
-        self GiveWeapon( data["weaponName"] );
-        self SwitchToWeapon( data["weaponName"] );
+        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 ) )
+    if ( !IsAlive( self ) )
     {
-        self TakeAllWeapons();
-        self IPrintLnBold( "All your weapons have been taken" );
+        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" ) 
     {
-        self [[level.axis]]();
-    }
-    else
-    {
-        self [[level.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 ) )
+    if ( !IsAlive( self ) )
     {
-        self Hide();
-        self IPrintLnBold( "You are now hidden" );
+        self IPrintLnBold( "You are not alive" );
+        return;
     }
+
+    self SetClientDvar( "sv_cheats", 1 );
+    self SetClientDvar( "cg_thirdperson", 1 );
+    self SetClientDvar( "sv_cheats", 0 );
+
+    if ( !IsDefined( self.savedHealth ) || self.health < 1000  )
+    {
+        self.savedHealth = self.health;
+        self.savedMaxHealth = self.maxhealth;
+    }
+
+    self.maxhealth = 99999;
+    self.health = 99999;
+    self.isHidden = true;
+    
+    self Hide();
+
+    self IPrintLnBold( "You are now ^5hidden ^7from other players" );
 }
 
 UnhideImpl()
 {
-    if ( IsAlive( self ) )
+    if ( !IsAlive( self ) )
     {
-        self Show();
-        self IPrintLnBold( "You are now visible" );
+        self IPrintLnBold( "You are not alive" );
+        return;
     }
+    
+    if ( !IsDefined( self.isHidden ) || !self.isHidden ) 
+    {
+        self IPrintLnBold( "You are not hidden" );
+        return;
+    }
+
+    self SetClientDvar( "sv_cheats", 1 );
+    self SetClientDvar( "cg_thirdperson", 0 );
+    self SetClientDvar( "sv_cheats", 0 );
+
+    self.health = self.savedHealth;
+    self.maxhealth = self.savedMaxHealth;
+    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

@@ -13,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}"
@@ -50,6 +51,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ScriptPlugins", "ScriptPlug
 		Plugins\ScriptPlugins\ParserCSGOSM.js = Plugins\ScriptPlugins\ParserCSGOSM.js
 		Plugins\ScriptPlugins\ParserPlutoniumT4COZM.js = Plugins\ScriptPlugins\ParserPlutoniumT4COZM.js
 		Plugins\ScriptPlugins\GameInterface.js = Plugins\ScriptPlugins\GameInterface.js
+		Plugins\ScriptPlugins\SubnetBan.js = Plugins\ScriptPlugins\SubnetBan.js
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomessageFeed", "Plugins\AutomessageFeed\AutomessageFeed.csproj", "{F5815359-CFC7-44B4-9A3B-C04BACAD5836}"

Integrations/Cod/CodRConConnection.cs

@@ -23,12 +23,12 @@ 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; }
 
-        private IRConParser parser;
-        private IRConParserConfiguration config;
+        private IRConParser _parser;
+        private IRConParserConfiguration _config;
         private readonly ILogger _log;
         private readonly Encoding _gameEncoding;
         private readonly int _retryAttempts;
@@ -44,73 +44,117 @@ namespace Integrations.Cod
 
         public void SetConfiguration(IRConParser parser)
         {
-            this.parser = parser;
-            config = parser.Configuration;
+            _parser = parser;
+            _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)
         {
-            if (!ActiveQueries.ContainsKey(this.Endpoint))
+            try
             {
-                ActiveQueries.TryAdd(this.Endpoint, new ConnectionState());
+                return await SendQueryAsyncInternal(type, parameters, token);
+            }
+            catch (Exception ex)
+            {
+                using (LogContext.PushProperty("Server", Endpoint.ToString()))
+                {
+                    _log.LogWarning(ex, "Could not complete RCon request");
+                }
+
+                throw;
+            }
+            finally
+            {
+                if (ActiveQueries[Endpoint].OnComplete.CurrentCount == 0)
+                {
+                    ActiveQueries[Endpoint].OnComplete.Release();
+                }
+            }
+        }
+        
+        private async Task<string[]> SendQueryAsyncInternal(StaticHelpers.QueryType type, string parameters = "", CancellationToken token = default)
+        {
+            if (!ActiveQueries.ContainsKey(Endpoint))
+            {
+                ActiveQueries.TryAdd(Endpoint, new ConnectionState());
             }
 
-            var connectionState = ActiveQueries[this.Endpoint];
+            var connectionState = ActiveQueries[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();
+            try
+            {
+                await connectionState.OnComplete.WaitAsync(token);
+            }
+            catch (OperationCanceledException)
+            {
+                throw new RConException("Timed out waiting for access to rcon socket");
+            }
 
             var timeSinceLastQuery = (DateTime.Now - connectionState.LastQuery).TotalMilliseconds;
 
-            if (timeSinceLastQuery < config.FloodProtectInterval)
+            if (timeSinceLastQuery < _config.FloodProtectInterval)
             {
-                await Task.Delay(config.FloodProtectInterval - (int)timeSinceLastQuery);
+                try
+                {
+                    await Task.Delay(_config.FloodProtectInterval - (int)timeSinceLastQuery, token);
+                }
+                catch (OperationCanceledException)
+                {
+                    throw new RConException("Timed out waiting for flood protect to expire");
+                }
             }
 
-            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)
                 {
                     case StaticHelpers.QueryType.GET_DVAR:
                         waitForResponse |= true;
-                        payload = string.Format(config.CommandPrefixes.RConGetDvar, convertedRConPassword, convertedParameters + '\0').Select(Convert.ToByte).ToArray();
+                        payload = string
+                            .Format(_config.CommandPrefixes.RConGetDvar, convertedRConPassword,
+                                convertedParameters + '\0').Select(Convert.ToByte).ToArray();
                         break;
                     case StaticHelpers.QueryType.SET_DVAR:
-                        payload = string.Format(config.CommandPrefixes.RConSetDvar, convertedRConPassword, convertedParameters + '\0').Select(Convert.ToByte).ToArray();
+                        payload = string
+                            .Format(_config.CommandPrefixes.RConSetDvar, convertedRConPassword,
+                                convertedParameters + '\0').Select(Convert.ToByte).ToArray();
                         break;
                     case StaticHelpers.QueryType.COMMAND:
-                        payload = string.Format(config.CommandPrefixes.RConCommand, convertedRConPassword, convertedParameters + '\0').Select(Convert.ToByte).ToArray();
+                        payload = string
+                            .Format(_config.CommandPrefixes.RConCommand, convertedRConPassword,
+                                convertedParameters + '\0').Select(Convert.ToByte).ToArray();
                         break;
                     case StaticHelpers.QueryType.GET_STATUS:
                         waitForResponse |= true;
-                        payload = (config.CommandPrefixes.RConGetStatus + '\0').Select(Convert.ToByte).ToArray();
+                        payload = (_config.CommandPrefixes.RConGetStatus + '\0').Select(Convert.ToByte).ToArray();
                         break;
                     case StaticHelpers.QueryType.GET_INFO:
                         waitForResponse |= true;
-                        payload = (config.CommandPrefixes.RConGetInfo + '\0').Select(Convert.ToByte).ToArray();
+                        payload = (_config.CommandPrefixes.RConGetInfo + '\0').Select(Convert.ToByte).ToArray();
                         break;
                     case StaticHelpers.QueryType.COMMAND_STATUS:
                         waitForResponse |= true;
-                        payload = string.Format(config.CommandPrefixes.RConCommand, convertedRConPassword, "status\0").Select(Convert.ToByte).ToArray();
+                        payload = string.Format(_config.CommandPrefixes.RConCommand, convertedRConPassword, "status\0")
+                            .Select(Convert.ToByte).ToArray();
                         break;
                 }
             }
@@ -119,14 +163,14 @@ namespace Integrations.Cod
             // e.g: emoji -> windows-1252
             catch (OverflowException ex)
             {
-                connectionState.OnComplete.Release(1);
+               
                 using (LogContext.PushProperty("Server", Endpoint.ToString()))
                 {
-                    _log.LogError(ex, "Could not convert RCon data payload to desired encoding {encoding} {params}",
+                    _log.LogError(ex, "Could not convert RCon data payload to desired encoding {Encoding} {Params}",
                         _gameEncoding.EncodingName, parameters);
                 }
 
-                throw new RConException($"Invalid character encountered when converting encodings");
+                throw new RConException("Invalid character encountered when converting encodings");
             }
 
             byte[][] response = null;
@@ -137,34 +181,66 @@ 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);
                 }
             }
-            using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp)
-            {
-                DontFragment = false,
-                Ttl = 100,
-                ExclusiveAddressUse = true,
-            })
-            {
-                connectionState.SendEventArgs.UserToken = socket;
-                connectionState.ConnectionAttempts++;
-                await connectionState.OnSentData.WaitAsync();
-                await connectionState.OnReceivedData.WaitAsync();
-                connectionState.BytesReadPerSegment.Clear();
-                bool exceptionCaught = false;
 
-                _log.LogDebug("Sending {payloadLength} bytes to [{endpoint}] ({connectionAttempts}/{allowedConnectionFailures})",
-                payload.Length, Endpoint, connectionState.ConnectionAttempts, _retryAttempts);
+            using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp)
+                   {
+                       DontFragment = false,
+                       Ttl = 100,
+                       ExclusiveAddressUse = true,
+                   })
+            {
+                // wait for send to be ready
+                try
+                {
+                    await connectionState.OnSentData.WaitAsync(token);
+                }
+                catch (OperationCanceledException)
+                {
+                    throw new RConException("Timed out waiting for access to RCon send socket");
+                }
+
+                // wait for receive to be ready
+                try
+                {
+                    await connectionState.OnReceivedData.WaitAsync(token);
+                }
+                catch (OperationCanceledException)
+                {
+                    throw new RConException("Timed out waiting for access to RCon receive socket");
+                }
+                finally
+                {
+                    if (connectionState.OnSentData.CurrentCount == 0)
+                    {
+                        connectionState.OnSentData.Release();
+                    }
+                }
+
+                connectionState.SendEventArgs.UserToken = new ConnectionUserToken
+                {
+                    Socket = socket,
+                    CancellationToken = token
+                };
+
+                connectionState.ConnectionAttempts++;
+                connectionState.BytesReadPerSegment.Clear();
+
+                _log.LogDebug(
+                    "Sending {PayloadLength} bytes to [{Endpoint}] ({ConnectionAttempts}/{AllowedConnectionFailures})",
+                    payload.Length, Endpoint, connectionState.ConnectionAttempts, _retryAttempts);
 
                 try
                 {
-                    
-                    response = await SendPayloadAsync(payload, waitForResponse, parser.OverrideTimeoutForCommand(parameters));
+                    connectionState.LastQuery = DateTime.Now;
+                    response = await SendPayloadAsync(payload, waitForResponse,
+                        _parser.OverrideTimeoutForCommand(parameters), token);
 
-                    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");
                     }
@@ -172,56 +248,73 @@ namespace Integrations.Cod
                     connectionState.ConnectionAttempts = 0;
                 }
 
+                catch (OperationCanceledException)
+                {
+                    // if we timed out due to the cancellation token,
+                    // we don't want to count that as an attempt
+                    connectionState.ConnectionAttempts = 0;
+                }
                 catch
                 {
                     // we want to retry with a delay
                     if (connectionState.ConnectionAttempts < _retryAttempts)
                     {
-                        exceptionCaught = true;
-                        await Task.Delay(StaticHelpers.SocketTimeout(connectionState.ConnectionAttempts));
+                        try
+                        {
+                            await Task.Delay(StaticHelpers.SocketTimeout(connectionState.ConnectionAttempts), token);
+                        }
+                        catch (OperationCanceledException)
+                        {
+                            return Array.Empty<string>();
+                        }
+
                         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;
                     throw new NetworkException("Reached maximum retry attempts to send RCon data to server");
                 }
-
                 finally
                 {
-                    // we don't want to release if we're going to retry the query
-                    if (connectionState.OnComplete.CurrentCount == 0 && !exceptionCaught)
+                    try
                     {
-                        connectionState.OnComplete.Release(1);
-                    }
+                        if (connectionState.OnSentData.CurrentCount == 0)
+                        {
+                            connectionState.OnSentData.Release();
+                        }
 
-                    if (connectionState.OnSentData.CurrentCount == 0)
-                    {
-                        connectionState.OnSentData.Release();
+                        if (connectionState.OnReceivedData.CurrentCount == 0)
+                        {
+                            connectionState.OnReceivedData.Release();
+                        }
                     }
-
-                    if (connectionState.OnReceivedData.CurrentCount == 0)
+                    catch
                     {
-                        connectionState.OnReceivedData.Release();
+                        // ignored because we can have the socket operation cancelled (which releases the semaphore) but 
+                        // this thread is not notified because it's an event
                     }
                 }
             }
 
+            // at this point we can run in parallel and the next request can start because we have our data
             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"]);
@@ -232,26 +325,26 @@ namespace Integrations.Cod
                 throw new RConException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_RCON_NOTSET"]);
             }
 
-            if (responseString.Contains(config.ServerNotRunningResponse))
+            if (responseString.Contains(_config.ServerNotRunningResponse))
             {
                 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}",
-                        config.CommandPrefixes.RConResponse, headerSplit.FirstOrDefault());
+                    _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[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
             return splitResponse;
         }
 
@@ -261,14 +354,14 @@ namespace Integrations.Cod
         /// </summary>
         /// <param name="segments">array of segmented byte arrays</param>
         /// <returns></returns>
-        public string ReassembleSegmentedStatus(byte[][] segments)
+        private string ReassembleSegmentedStatus(IEnumerable<byte[]> segments)
         {
             var splitStatusStrings = new List<string>();
 
-            foreach (byte[] segment in segments)
+            foreach (var segment in segments)
             {
-                string responseString = _gameEncoding.GetString(segment, 0, segment.Length);
-                var statusHeaderMatch = config.StatusHeader.PatternMatcher.Match(responseString);
+                var responseString = _gameEncoding.GetString(segment, 0, segment.Length);
+                var statusHeaderMatch = _config.StatusHeader.PatternMatcher.Match(responseString);
                 if (statusHeaderMatch.Success)
                 {
                     splitStatusStrings.Insert(0, responseString.TrimEnd('\0'));
@@ -276,7 +369,7 @@ namespace Integrations.Cod
 
                 else
                 {
-                    splitStatusStrings.Add(responseString.Replace(config.CommandPrefixes.RConResponse, "").TrimEnd('\0'));
+                    splitStatusStrings.Add(responseString.Replace(_config.CommandPrefixes.RConResponse, "").TrimEnd('\0'));
                 }
             }
 
@@ -288,34 +381,37 @@ namespace Integrations.Cod
         /// </summary>
         /// <param name="payload"></param>
         /// <returns></returns>
-        private string RecombineMessages(byte[][] payload)
+        private string RecombineMessages(IReadOnlyList<byte[]> payload)
         {
-            if (payload.Length == 1)
+            if (payload.Count == 1)
             {
                 return _gameEncoding.GetString(payload[0]).TrimEnd('\n') + '\n';
             }
 
-            else
+            var builder = new StringBuilder();
+            for (var i = 0; i < payload.Count; i++)
             {
-                var builder = new StringBuilder();
-                for (int i = 0; i < payload.Length; i++)
+                var message = _gameEncoding.GetString(payload[i]).TrimEnd('\n') + '\n';
+                if (i > 0)
                 {
-                    string message = _gameEncoding.GetString(payload[i]).TrimEnd('\n') + '\n';
-                    if (i > 0)
-                    {
-                        message = message.Replace(config.CommandPrefixes.RConResponse, "");
-                    }
-                    builder.Append(message);
+                    message = message.Replace(_config.CommandPrefixes.RConResponse, "");
                 }
-                builder.Append('\n');
-                return builder.ToString();
+                builder.Append(message);
             }
+            builder.Append('\n');
+            return builder.ToString();
         }
 
-        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;
+            var connectionState = ActiveQueries[Endpoint];
+            var rconSocket = ((ConnectionUserToken)connectionState.SendEventArgs.UserToken)?.Socket;
+
+            if (rconSocket is null)
+            {
+                throw new InvalidOperationException("State is not valid for socket operation");
+            }
 
             if (connectionState.ReceiveEventArgs.RemoteEndPoint == null &&
                 connectionState.SendEventArgs.RemoteEndPoint == null)
@@ -323,8 +419,8 @@ namespace Integrations.Cod
                 // setup the event handlers only once because we're reusing the event args
                 connectionState.SendEventArgs.Completed += OnDataSent;
                 connectionState.ReceiveEventArgs.Completed += OnDataReceived;
-                connectionState.SendEventArgs.RemoteEndPoint = this.Endpoint;
-                connectionState.ReceiveEventArgs.RemoteEndPoint = this.Endpoint;
+                connectionState.SendEventArgs.RemoteEndPoint = Endpoint;
+                connectionState.ReceiveEventArgs.RemoteEndPoint = Endpoint;
                 connectionState.ReceiveEventArgs.DisconnectReuseSocket = true;
                 connectionState.SendEventArgs.DisconnectReuseSocket = true;
             }
@@ -332,20 +428,22 @@ 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 = await connectionState.OnSentData.WaitAsync(StaticHelpers.SocketTimeout(4), token);
                 
-                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();
                     throw new NetworkException("Timed out sending RCon data", rconSocket);
                 }
@@ -359,24 +457,36 @@ 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
                     {
                         using (LogContext.PushProperty("Server", Endpoint.ToString()))
                         {
                             _log.LogWarning(
-                                "Socket timed out while waiting for RCon response on attempt {attempt} with timeout delay of {timeout}",
+                                "Socket timed out while waiting for RCon response on attempt {Attempt} with timeout delay of {Timeout}",
                                 connectionState.ConnectionAttempts,
                                 StaticHelpers.SocketTimeout(connectionState.ConnectionAttempts));
                         }
@@ -388,16 +498,15 @@ namespace Integrations.Cod
             }
 
             rconSocket.Close();
-
             return GetResponseData(connectionState);
         }
 
-        private byte[][] GetResponseData(ConnectionState connectionState)
+        private static 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)
@@ -412,36 +521,57 @@ namespace Integrations.Cod
 
         private void OnDataReceived(object sender, SocketAsyncEventArgs e)
         {
-            _log.LogDebug("Read {bytesTransferred} bytes from {endpoint}", e.BytesTransferred, e.RemoteEndPoint);
+            _log.LogDebug("Read {BytesTransferred} bytes from {Endpoint}", e.BytesTransferred, e.RemoteEndPoint?.ToString());
 
             // this occurs when we close the socket
             if (e.BytesTransferred == 0)
             {
                 _log.LogDebug("No bytes were transmitted so the connection was probably closed");
                
-                var semaphore = ActiveQueries[this.Endpoint].OnReceivedData;
-                if (semaphore.CurrentCount == 0)
-                {
-                    semaphore.Release();
-                }
-                
-                return;
-            }
+                var semaphore = ActiveQueries[Endpoint].OnReceivedData;
 
-            if (sender is not Socket sock)
-            {
-                var semaphore = ActiveQueries[this.Endpoint].OnReceivedData;
-                if (semaphore.CurrentCount == 0)
+                try
                 {
-                    semaphore.Release();
+                    if (semaphore.CurrentCount == 0)
+                    {
+                        semaphore.Release();
+                    }
                 }
-                
+                catch
+                {
+                    // ignored because we can have the socket operation cancelled (which releases the semaphore) but 
+                    // this thread is not notified because it's an event
+                }
+
                 return;
             }
             
-            var state = ActiveQueries[this.Endpoint];
-            state.BytesReadPerSegment.Add(e.BytesTransferred);
+            var state = ActiveQueries[Endpoint];
+            var cancellationRequested = ((ConnectionUserToken)e.UserToken)?.CancellationToken.IsCancellationRequested ??
+                                        false;
 
+            if (sender is not Socket sock || cancellationRequested)
+            {
+                var semaphore = ActiveQueries[Endpoint].OnReceivedData;
+
+                try
+                {
+                    if (semaphore.CurrentCount == 0)
+                    {
+                        semaphore.Release();
+                    }
+                }
+                catch
+                {
+                    // ignored because we can have the socket operation cancelled (which releases the semaphore) but 
+                    // this thread is not notified because it's an event
+                }
+            
+                return;
+            }
+            
+            state.BytesReadPerSegment.Add(e.BytesTransferred);
+            
             // I don't even want to know why this works for getting more data from Cod4x
             // but I'm leaving it in here as long as it doesn't break anything.
             // it's very stupid...
@@ -450,32 +580,33 @@ namespace Integrations.Cod
             try
             {
                 var totalBytesTransferred = e.BytesTransferred;
-                _log.LogDebug("{total} total bytes transferred with {available} bytes remaining", totalBytesTransferred,
+                _log.LogDebug("{Total} total bytes transferred with {Available} bytes remaining", totalBytesTransferred,
                     sock.Available);
+                
                 // we still have available data so the payload was segmented
                 while (sock.Available > 0)
                 {
-                    _log.LogDebug("{available} more bytes to be read", sock.Available);
+                    _log.LogDebug("{Available} more bytes to be read", sock.Available);
 
                     var bufferSpaceAvailable = sock.Available + totalBytesTransferred - state.ReceiveBuffer.Length;
                     if (bufferSpaceAvailable >= 0)
                     {
                         _log.LogWarning(
-                            "Not enough buffer space to store incoming data {bytesNeeded} additional bytes required",
+                            "Not enough buffer space to store incoming data {BytesNeeded} additional bytes required",
                             bufferSpaceAvailable);
                         continue;
                     }
-
+                    
                     state.ReceiveEventArgs.SetBuffer(state.ReceiveBuffer, totalBytesTransferred, sock.Available);
-
                     if (sock.ReceiveAsync(state.ReceiveEventArgs))
                     {
                         _log.LogDebug("Remaining bytes are async");
                         continue;
                     }
-
-                    _log.LogDebug("Read {bytesTransferred} synchronous bytes from {endpoint}",
-                        state.ReceiveEventArgs.BytesTransferred, e.RemoteEndPoint);
+                    
+                    _log.LogDebug("Read {BytesTransferred} synchronous bytes from {Endpoint}",
+                        state.ReceiveEventArgs.BytesTransferred, e.RemoteEndPoint?.ToString());
+                    
                     // we need to increment this here because the callback isn't executed if there's no pending IO
                     state.BytesReadPerSegment.Add(state.ReceiveEventArgs.BytesTransferred);
                     totalBytesTransferred += state.ReceiveEventArgs.BytesTransferred;
@@ -489,22 +620,38 @@ namespace Integrations.Cod
 
             finally
             {
-                var semaphore = ActiveQueries[this.Endpoint].OnReceivedData;
-                if (semaphore.CurrentCount == 0)
+                var semaphore = ActiveQueries[Endpoint].OnReceivedData;
+                try
                 {
-                    semaphore.Release();
+                    if (semaphore.CurrentCount == 0)
+                    {
+                        semaphore.Release();
+                    }
+                }
+                catch
+                {
+                    // ignored because we can have the socket operation cancelled (which releases the semaphore) but 
+                    // this thread is not notified because it's an event
                 }
             }
         }
 
         private void OnDataSent(object sender, SocketAsyncEventArgs e)
         {
-            _log.LogDebug("Sent {byteCount} bytes to {endpoint}", e.Buffer?.Length, e.ConnectSocket?.RemoteEndPoint);
+            _log.LogDebug("Sent {ByteCount} bytes to {Endpoint}", e.Buffer?.Length, e.ConnectSocket?.RemoteEndPoint?.ToString());
             
-            var semaphore = ActiveQueries[this.Endpoint].OnSentData;
-            if (semaphore.CurrentCount == 0)
+            var semaphore = ActiveQueries[Endpoint].OnSentData;
+            try
             {
-                semaphore.Release();
+                if (semaphore.CurrentCount == 0)
+                {
+                    semaphore.Release();
+                }
+            }
+            catch
+            {
+                // ignored because we can have the socket operation cancelled (which releases the semaphore) but 
+                // this thread is not notified because it's an event
             }
         }
     }

Integrations/Cod/ConnectionState.cs

@@ -24,9 +24,15 @@ namespace Integrations.Cod
         public readonly SemaphoreSlim OnSentData = new(1, 1);
         public readonly SemaphoreSlim OnReceivedData = new (1, 1);
        
-        public List<int> BytesReadPerSegment { get; set; } = new List<int>();
-        public SocketAsyncEventArgs SendEventArgs { get; set; } = new SocketAsyncEventArgs();
-        public SocketAsyncEventArgs ReceiveEventArgs { get; set; } = new SocketAsyncEventArgs();
+        public List<int> BytesReadPerSegment { get; set; } = new();
+        public SocketAsyncEventArgs SendEventArgs { get; set; } = new();
+        public SocketAsyncEventArgs ReceiveEventArgs { get; set; } = new();
         public DateTime LastQuery { get; set; } = DateTime.Now;
     }
+
+    internal class ConnectionUserToken
+    {
+        public Socket Socket { get; set; }
+        public CancellationToken CancellationToken { get; set; }
+    }
 }

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.3.23.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/AutomessageFeed/Configuration.cs

@@ -1,5 +1,4 @@
-using SharedLibraryCore;
-using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.Interfaces;
 
 namespace AutomessageFeed
 {
@@ -11,16 +10,6 @@ namespace AutomessageFeed
 
         public IBaseConfiguration Generate()
         {
-            EnableFeed = Utilities.PromptBool(Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_AUTOMESSAGEFEED_PROMPT_ENABLE"]);
-
-            if (EnableFeed)
-            {
-                FeedUrl = Utilities.PromptString(Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_AUTOMESSAGEFEED_URL"]);
-                MaxFeedItems = Utilities.PromptInt(Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_AUTOMESSAGEFEED_PROMPT_MAXITEMS"],
-                    Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_AUTOMESSAGEFEED_PROMPT_MAXITEMS_DESC"],
-                    0, int.MaxValue, 0);
-            }
-
             return this;
         }
 

Plugins/LiveRadar/Controllers/RadarController.cs

@@ -24,20 +24,22 @@ namespace LiveRadar.Web.Controllers
 
         [HttpGet]
         [Route("Radar/{serverId}")]
-        public IActionResult Index(long? serverId = null)
+        public IActionResult Index(string serverId = null)
         {
-            ViewBag.IsFluid = true;
-            ViewBag.Title = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_RADAR_TITLE"];
-            ViewBag.ActiveServerId = serverId ?? _manager.GetServers().FirstOrDefault()?.EndPoint;
-            ViewBag.Servers = _manager.GetServers()
-                .Where(_server => _server.GameName == Server.Game.IW4)
-                .Select(_server => new ServerInfo()
+            var servers =  _manager.GetServers()
+                .Where(server => server.GameName == Server.Game.IW4)
+                .Select(server => new ServerInfo
                 {
-                    Name = _server.Hostname,
-                    ID = _server.EndPoint
+                    Name = server.Hostname,
+                    IPAddress = server.IP,
+                    Port = server.Port
                 });
+            
+            ViewBag.Title = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_RADAR_TITLE"];
+            ViewBag.SelectedServerId = string.IsNullOrEmpty(serverId) ? servers.FirstOrDefault()?.Endpoint : serverId;
 
-            return View();
+            // ReSharper disable once Mvc.ViewNotResolved
+            return View("~/Views/Plugins/LiveRadar/Radar/Index.cshtml", servers);
         }
 
         [HttpGet]

Plugins/LiveRadar/LiveRadar.csproj

@@ -15,15 +15,8 @@
     <StartupObject />
   </PropertyGroup>
 
-
   <ItemGroup>
-    <Content Update="Views\_ViewImports.cshtml">
-      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
-    </Content>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.28.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.3.23.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/LiveRadar/Views/Radar/Index.cshtml

@@ -1,470 +0,0 @@
-@model IEnumerable<long>
-
-<style>
-    .progress {
-        border-radius: 0 !important;
-    }
-
-    .player-stat-icon {
-        height: 1.5rem;
-        width: 1.5rem;
-        background-size: 1.5rem 1.5rem;
-    }
-</style>
-<div class="row p-0 ml-auto mr-auto mb-4">
-    <div class="col-12 col-xl-10 p-0 ml-auto mr-auto p-0 pl-lg-3 pr-lg-3 ">
-        <ul class="nav nav-tabs border-top border-bottom nav-fill" role="tablist">
-            @foreach (SharedLibraryCore.Dtos.ServerInfo server in ViewBag.Servers)
-            {
-                <li class="nav-item">
-                    <a asp-controller="Radar" asp-action="Index" asp-route-serverId="@server.ID" class="nav-link @(server.ID == ViewBag.ActiveServerId ? "active": "")" aria-selected="@(server.ID == ViewBag.ActiveServerId ? "true": "false")"><color-code value="@server.Name"></color-code></a>
-                </li>
-            }
-        </ul>
-    </div>
-</div>
-
-<div class="row p-0 ml-auto mr-auto col-12 col-xl-10">
-    <div class="p-0 pl-lg-3 pr-lg-3 m-0 col-lg-3 col-12 text-lg-right text-center player-data-left" style="opacity: 0;">
-    </div>
-    <div class="pl-0 pr-0 pl-lg-3 pr-lg-3 col-lg-6 col-12 pb-4">
-        <div id="map_name" class="h4 text-center pb-2 pt-2 mb-0 bg-primary">&mdash;</div>
-        <div id="map_list" style="background-size:cover; padding-bottom: 100% !important;">
-            <canvas id="map_canvas" style="position:absolute;"></canvas>
-        </div>
-    </div>
-
-    <div class="p-0 pl-lg-3 pr-lg-3 m-0 col-lg-3 col-12 text-lg-left text-center player-data-right" style="opacity: 0;">
-    </div>
-</div>
-
-<!-- images used by canvas -->
-<img class="hide" id="hud_death" src="~/images/radar/death.png" />
-
-
-@section scripts {
-
-    <script defer="defer">
-        const textOffset = 15;
-        let previousRadarData = undefined;
-        let newRadarData = undefined;
-
-        /************************
-         *          IW4         *
-         * **********************/
-        const weapons = {};
-        weapons["ak47"] = "ak47";
-        weapons["ak47classic"] = "icon_ak47_classic";
-        weapons["ak74u"] = "akd74u";
-        weapons["m16"] = "m16a4";
-        weapons["m4"] = "m4carbine";
-        weapons["fn2000"] = "fn2000";
-        weapons["masada"] = "masada";
-        weapons["famas"] = "famas";
-        weapons["fal"] = "fnfal";
-        weapons["scar"] = "scar_h";
-        weapons["tavor"] = "tavor";
-
-        weapons["mp5k"] = "mp5k";
-        weapons["uzi"] = "mini_uzi";
-        weapons["p90"] = "p90";
-        weapons["kriss"] = "kriss";
-        weapons["ump45"] = "ump45";
-
-        weapons["rpd"] = "rpd";
-        weapons["sa80"] = "sa80_lmg";
-        weapons["mg4"] = "mg4";
-        weapons["m240"] = "m240";
-        weapons["aug"] = "steyr";
-
-        weapons["barrett"] = "barrett50cal";
-        weapons["wa2000"] = "wa2000";
-        weapons["m21"] = "m14ebr";
-        weapons["cheytac"] = "cheytac";
-        weapons["dragunov"] = "dragunovsvd";
-
-        weapons["beretta"] = "m9beretta";
-        weapons["usp"] = "usp_45";
-        weapons["deserteagle"] = "desert_eagle";
-        weapons["deserteaglegold"] = "desert_eagle_gold";
-        weapons["desert"]
-        weapons["coltanaconda"] = "colt_anaconda";
-
-        weapons["tmp"] = "mp9";
-        weapons["glock"] = "glock";
-        weapons["beretta393"] = "beretta393";
-        weapons["pp2000"] = "pp2000";
-
-        weapons["ranger"] = "sawed_off";
-        weapons["model1887"] = "model1887";
-        weapons["striker"] = "striker";
-        weapons["aa12"] = "aa12";
-        weapons["m1014"] = "benelli_m4";
-        weapons["spas12"] = "spas12";
-
-        weapons["m79"] = "m79";
-        weapons["rpg"] = "rpg";
-        weapons["at4"] = "at4";
-        weapons["stinger"] = "stinger";
-        weapons["javelin"] = "javelin";
-
-        weapons["m40a3"] = "m40a3";
-        weapons["none"] = "neutral";
-        weapons["riotshield"] = "riot_shield";
-        weapons["peacekeeper"] = "peacekeeper";
-
-        function drawCircle(context, x, y, color) {
-            context.beginPath();
-            context.arc(x, y, 6 * stateInfo.imageScaler, 0, 2 * Math.PI, false);
-            context.fillStyle = color;
-            context.fill();
-            context.lineWidth = 0.5;
-            context.strokeStyle = 'rgba(255, 255, 255, 0.5)';
-            context.closePath();
-            context.stroke();
-        }
-
-        function drawLine(context, x1, y1, x2, y2, color) {
-            context.beginPath();
-            context.lineWidth = '3';
-            context.moveTo(x1, y1);
-            context.lineTo(x2, y2);
-            context.closePath();
-            context.stroke();
-        }
-
-        function drawTriangle(context, v1, v2, v3, color) {
-            context.beginPath();
-            context.moveTo(v1.x, v1.y);
-            context.lineTo(v2.x, v2.y);
-            context.lineTo(v3.x, v3.y);
-            context.closePath();
-            context.fillStyle = color;
-            context.fill();
-        }
-
-        function drawText(context, x, y, text, size, fillColor, strokeColor, alignment = 'left') {
-            context.beginPath();
-            context.save();
-            context.font = `bold ${Math.max(12, size * stateInfo.imageScaler)}px courier new`;
-            context.fillStyle = fillColor;
-            context.shadowColor = strokeColor;
-            context.shadowBlur = 4;
-            context.textAlign = alignment;
-            context.fillText(text, x, y);
-            context.restore();
-            context.closePath();
-        }
-
-        function drawImage(context, imgSelector, x, y, alpha = 1) {
-            context.save();
-            context.globalAlpha = alpha;
-            context.drawImage(document.getElementById(imgSelector), x - (15 * stateInfo.imageScaler), y - (15 * stateInfo.imageScaler), 32 * stateInfo.imageScaler, 32 * stateInfo.imageScaler);
-            context.globalAlpha = 1;
-            context.restore();
-        }
-
-        function checkCanvasSize(canvas, context, minimap, map) {
-
-            let width = Math.round(minimap.width());
-            if (Math.round(context.canvas.width) != width) {
-
-                canvas.width(width);
-                canvas.height(width);
-
-                context.canvas.height = width;
-                context.canvas.width = context.canvas.height;
-            }
-
-            stateInfo.imageScaler = (stateInfo.canvas.width() / 1024)
-            stateInfo.mapScalerX = (((stateInfo.mapInfo.right * stateInfo.imageScaler) - (stateInfo.mapInfo.left * stateInfo.imageScaler)) / stateInfo.mapInfo.width);
-            stateInfo.mapScalerY = (((stateInfo.mapInfo.bottom * stateInfo.imageScaler) - (stateInfo.mapInfo.top * stateInfo.imageScaler)) / stateInfo.mapInfo.height);
-            stateInfo.mapScaler = (stateInfo.mapScalerX + stateInfo.mapScalerY) / 2
-
-            stateInfo.forwardDistance = 500.0;
-            stateInfo.fovWidth = 40;
-        }
-
-        function calculateViewPosition(x, y, distance) {
-            let nx = Math.cos(x) * Math.cos(y);
-            let ny = Math.sin(x) * Math.cos(y);
-            let nz = Math.sin(360.0 - y);
-
-            return { x: (nx * distance) * stateInfo.mapScaler, y: (ny * distance) * stateInfo.mapScaler, z: (nz * distance)  * stateInfo.mapScaler };
-        }
-
-        function lerp(start, end, complete) {
-            return (1 - complete) * start + complete * end;
-        }
-
-        function easeLerp(start, end, t) {
-            let t2 = (1 - Math.cos(t * Math.PI)) / 2;
-
-            return (start * (1-t2) + end * t2);
-        }
-
-        function fixRollAngles(oldAngles, newAngles) {
-            let newX = newAngles.x;
-            let newY = newAngles.y;
-
-            let angleDifferenceX = (oldAngles.x - newAngles.x);
-
-            if (angleDifferenceX > Math.PI) {
-                newX = oldAngles.x + (Math.PI * 2) - angleDifferenceX;
-            }
-
-            else if (Math.abs(newAngles.x - oldAngles.x) > Math.PI) {
-                newX = newAngles.x - (Math.PI * 2);
-            }
-
-            let angleDifferenceY = (oldAngles.y - newAngles.y);
-
-            if (angleDifferenceY > Math.PI) {
-                newY = oldAngles.y + (Math.PI * 2) - angleDifferenceY;
-            }
-
-            else if (Math.abs(newAngles.y - oldAngles.y) > Math.PI) {
-                newY = newAngles.y - (Math.PI * 2);
-            }
-
-            return { x: newX, y: newY };
-        }
-
-        function toRadians(deg) {
-            return deg * Math.PI / 180.0;
-        }
-
-        function rotate(cx, cy, x, y, angle) {
-            var radians = (Math.PI / 180) * angle,
-            cos = Math.cos(radians),
-            sin = Math.sin(radians),
-            nx = (cos * (x - cx)) + (sin * (y - cy)) + cx,
-            ny = (cos * (y - cy)) - (sin * (x - cx)) + cy;
-            return {
-                x: nx,
-                y: ny
-            };
-        }
-
-        function weaponImageForWeapon(weapon) {
-            let name = weapon.split('_')[0];
-            if (weapons[name] == undefined) {
-                console.log(name);
-                name = "none";
-            }
-
-            return `../images/radar/hud_weapons/hud_${weapons[name]}.png`;
-        }
-
-        function updatePlayerData() {
-            $('.player-data-left').html('');
-            $('.player-data-right').html('');
-
-            $.each(newRadarData, function (index, player) {
-                if (player == null) {
-                    return;
-                }
-
-                let column = index % 2 == 0 ? $('.player-data-left') : $('.player-data-right');
-                column.append(`<div class="progress" style="height: 1.5rem; background-color: transparent;">
-                                 <div style="position: absolute; font-size: 1rem; left: 1.5rem;">${player.name}</div>
-                                 <div class="progress-bar bg-success" role="progressbar" style="min-width: 0px; width: ${player.health}%" aria-valuenow="${player.health}" aria-valuemin="0" aria-valuemax="100"></div>
-                                <div class="progress-bar bg-danger" role="progressbar" style="min-width: 0px; border-right: 0px; width: ${100 - player.health}%" aria-valuenow="${100 - player.health}" aria-valuemin="0" aria-valuemax="100"></div>
-                               </div>
-                               <div class="d-flex flex-row flex-wrap p-2 mb-4 bg-dark border-bottom">
-                                 <div style="width: 3rem; height: 1.5rem; background-image:url(${weaponImageForWeapon(player.weapon)}); background-size: 3rem 1.5rem;" class="mr-auto text-left">
-                               </div>
-                                <div class="player-stat-icon" style="background-image:url('/images/radar/kills.png')"></div>
-                                <div class="pr-2">${player.kills}</div>
-                                <div class="player-stat-icon" style="background-image:url('/images/radar/death.png')"></div>
-                                <div class="pr-3">${player.deaths}</div>
-                                <span class="align-self-center oi oi-target pr-1"></span>
-                                <div class="pr-3 ">${player.deaths == 0 ? player.kills.toFixed(2) : (player.kills / player.deaths).toFixed(2)}</div>
-                                <span class="align-self-center oi oi-graph pr-1"></span>
-                                <div>${ player.playTime == 0 ? '&mdash;' : Math.round(player.score / (player.playTime / 60))}</div>
-                              </div>`);
-            });
-
-            $('.player-data-left').delay(1000).animate({opacity: 1}, 500);
-            $('.player-data-right').delay(1000).animate({opacity: 1}, 500);
-        }
-
-        const stateInfo = {
-            canvas: $('#map_canvas'),
-            ctx: $('#map_canvas')[0].getContext('2d'),
-            updateFrequency: 750,
-            updateFrameTimeDeviation: 0,
-            forwardDistance: undefined,
-            fovWidth: undefined,
-            mapInfo: undefined,
-            mapScaler: undefined,
-            deathIcons: {},
-            deathIconTime: 4000
-        };
-
-        function updateRadarData() {
-            $.getJSON('@Url.Action("Data", "Radar", new { serverId = ViewBag.ActiveServerId })', function (_radarItem) {
-                newRadarData = _radarItem;
-            });
-
-
-             $.getJSON('@Url.Action("Map", "Radar", new { serverId = ViewBag.ActiveServerId })', function (_map) {
-                 stateInfo.mapInfo = _map
-             });
-
-            $.each(newRadarData, function (index, value) {
-                if (previousRadarData != undefined && index < previousRadarData.length) {
-
-                    let previous = previousRadarData[index];
-
-                    // this happens when the player has first joined and we haven't gotten two snapshots yet
-                    if (value == null) {
-                      return;
-                    }
-
-                    if (previous == null) {
-                        previous = value;
-                    }
-
-                    // we don't want to treat a disconnected player snapshot as the previous
-                    else if (previous.guid == value.guid) {
-                        value.previous = previous;
-                    }
-
-                    // we haven't gotten a new item, it's just the old one again
-                    if (previous.id === value.id) {
-                        value.animationTime = previous.animationTime;
-                        value.previous = value;
-                    }
-
-                    // they died between this snapshot and last so we wanna setup the death icon
-                    if (!value.isAlive && previous.isAlive) {
-                        stateInfo.deathIcons[value.guid] = {
-                            animationTime: now,
-                            location: value.location
-                        };
-                    }
-
-                    // they respawned between this snapshot and last so we don't want to show wherever the were specating from
-                    else if (value.isAlive && !previous.isAlive) {
-                        value.previous = value;
-                    }
-            }});
-
-            // we switch out the items to
-            previousRadarData = newRadarData;
-
-            $('#map_name').html(stateInfo.mapInfo.alias);
-            $('#map_list').css('background-image', `url(../images/radar/minimaps/compass_map_${stateInfo.mapInfo.name}@('@')2x.jpg)`);
-            checkCanvasSize(stateInfo.canvas, stateInfo.ctx, $('#map_list'), stateInfo.mapInfo);
-            updatePlayerData();
-        }
-
-        function updateMap() {
-            let ctx = stateInfo.ctx;
-
-            ctx.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);
-            now = performance.now();
-
-            $.each(previousRadarData, function (index, value) {
-                if (value == null) {
-                    return;
-                }
-
-                if (value.previous == null) {
-                    value.previous = value;
-                }
-
-                // this indicates we got a new snapshot to work with so we set the time based off the previous
-                // frame deviation to have minimal interpolation skipping
-                if (value.animationTime === undefined) {
-                    value.animationTime = now - stateInfo.updateFrameTimeDeviation;
-                }
-
-                if (!value.isAlive) {
-                    return;
-                }
-
-                const elapsedFrameTime = now - value.animationTime;
-                const completionPercent = elapsedFrameTime / stateInfo.updateFrequency;
-
-                // certain maps like estate have an off center axis of origin, so we need to account for that
-                let rotatedPreviousLocation = rotate(stateInfo.mapInfo.centerX, stateInfo.mapInfo.centerY, value.previous.location.x, value.previous.location.y, stateInfo.mapInfo.rotation);
-                let rotatedCurrentLocation = rotate(stateInfo.mapInfo.centerX, stateInfo.mapInfo.centerY, value.location.x, value.location.y, stateInfo.mapInfo.rotation);
-
-                const startX = ((stateInfo.mapInfo.maxLeft - rotatedPreviousLocation.y) * stateInfo.mapScaler) + (stateInfo.mapInfo.left * stateInfo.imageScaler);
-                const startY = ((stateInfo.mapInfo.maxTop - rotatedPreviousLocation.x) * stateInfo.mapScalerY) + (stateInfo.mapInfo.top * stateInfo.imageScaler);
-
-                const endX = ((stateInfo.mapInfo.maxLeft - rotatedCurrentLocation.y) * stateInfo.mapScaler) + (stateInfo.mapInfo.left * stateInfo.imageScaler);
-                const endY = ((stateInfo.mapInfo.maxTop - rotatedCurrentLocation.x) * stateInfo.mapScalerY) + (stateInfo.mapInfo.top * stateInfo.imageScaler);
-
-                let teamColor = value.team == 'allies' ? 'rgb(0, 122, 204, 1)' : 'rgb(255, 69, 69)';
-                let fovColor = value.team == 'allies' ? 'rgba(0, 122, 204, 0.2)' : 'rgba(255, 69, 69, 0.2)';
-
-                // this takes care of moving past the roll-over point of yaw/pitch (ie 360->0)
-                const rollAngleFix = fixRollAngles(value.previous.radianAngles, value.radianAngles);
-
-                const radianLerpX = lerp(value.previous.radianAngles.x, rollAngleFix.x, completionPercent);
-                const radianLerpY = lerp(value.previous.radianAngles.y, rollAngleFix.y, completionPercent);
-
-                // this is some jankiness to get the fov to point the right direction
-                let firstVertex = calculateViewPosition(toRadians(stateInfo.mapInfo.rotation + stateInfo.mapInfo.viewPositionRotation - 90) - radianLerpX + toRadians(stateInfo.fovWidth), radianLerpY, stateInfo.forwardDistance);
-                let secondVertex = calculateViewPosition(toRadians(stateInfo.mapInfo.rotation + stateInfo.mapInfo.viewPositionRotation - 90) - radianLerpX - toRadians(stateInfo.fovWidth), radianLerpY, stateInfo.forwardDistance);
-
-                let currentX = lerp(startX, endX, completionPercent);
-                let currentY = lerp(startY, endY, completionPercent);
-
-                // we need to calculate the distance from the center of the map so we can scale if necessary
-                let centerX = ((stateInfo.mapInfo.maxLeft - stateInfo.mapInfo.centerY) * stateInfo.mapScaler) + (stateInfo.mapInfo.left * stateInfo.imageScaler);
-                let centerY = ((stateInfo.mapInfo.maxTop - stateInfo.mapInfo.centerX) * stateInfo.mapScaler) + (stateInfo.mapInfo.top * stateInfo.imageScaler);
-
-                // reuse lerp to scale the pixel to map ratio
-                currentX = lerp(centerX, currentX, stateInfo.mapInfo.scaler);
-                currentY = lerp(centerY, currentY, stateInfo.mapInfo.scaler);
-
-                drawCircle(ctx, currentX, currentY, teamColor);
-                drawTriangle(ctx,
-                    { x: currentX, y: currentY },
-                    { x: currentX + firstVertex.x, y: currentY + firstVertex.y },
-                    { x: currentX + secondVertex.x, y: currentY + secondVertex.y },
-                    fovColor);
-                drawText(ctx, currentX, currentY - (textOffset * stateInfo.imageScaler), value.name, 16, 'white', teamColor, 'center')
-            });
-
-            const completedIcons = [];
-
-            for (let key in stateInfo.deathIcons) {
-                const icon = stateInfo.deathIcons[key];
-
-                const x = ((stateInfo.mapInfo.maxLeft - icon.location.y) * stateInfo.mapScaler) + (stateInfo.mapInfo.left * stateInfo.imageScaler);
-                const y = ((stateInfo.mapInfo.maxTop - icon.location.x) * stateInfo.mapScaler) + (stateInfo.mapInfo.top * stateInfo.imageScaler);
-
-                const elapsedFrameTime = now - icon.animationTime;
-                const completionPercent = elapsedFrameTime / stateInfo.deathIconTime;
-                const opacity = easeLerp(1, 0, completionPercent);
-
-                drawImage(stateInfo.ctx, 'hud_death', x, y, opacity);
-
-                if (completionPercent >= 1) {
-                    completedIcons.push(key);
-                }
-            }
-
-            for (let i = 0; i < completedIcons.length; i++) {
-                delete stateInfo.deathIcons[completedIcons[i]];
-            }
-
-            window.requestAnimationFrame(updateMap);
-        }
-
-        $(document).ready(function () {
-             $.getJSON('@Url.Action("Map", "Radar", new { serverId = ViewBag.ActiveServerId })', function (_map) {
-                 stateInfo.mapInfo = _map;
-                 updateRadarData();
-                 setInterval(updateRadarData, stateInfo.updateFrequency);
-                 window.requestAnimationFrame(updateMap);
-             });
-        })
-
-    </script>
-}

Plugins/LiveRadar/Views/_ViewImports.cshtml

@@ -1,3 +0,0 @@
-@using SharedLibraryCore
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
-@addTagHelper *, SharedLibraryCore

Plugins/Login/Configuration.cs

@@ -9,7 +9,6 @@ namespace IW4MAdmin.Plugins.Login
 
         public IBaseConfiguration Generate()
         {
-            RequirePrivilegedClientLogin = Utilities.PromptBool("Require privileged client login");
             return this;
         }
 

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.3.23.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.3.23.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">