fix issue with detecting bans on accounts with new ips when implicit linking is disabled

Application/Application.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
     <PackageId>RaidMax.IW4MAdmin.Application</PackageId>
     <Version>2020.0.0.0</Version>
@@ -24,14 +24,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Jint" Version="3.0.0-beta-2037" />
+    <PackageReference Include="Jint" Version="3.0.0-beta-1632" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.10">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.10" />
-    <PackageReference Include="RestEase" Version="1.5.5" />
+    <PackageReference Include="RestEase" Version="1.5.1" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
   </ItemGroup>
 
   <PropertyGroup>

Application/ApplicationManager.cs

@@ -15,7 +15,6 @@ using System;
 using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Linq;
 using System.Reflection;
 using System.Text;
@@ -27,7 +26,6 @@ using IW4MAdmin.Application.Migration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Serilog.Context;
-using SharedLibraryCore.Formatting;
 using static SharedLibraryCore.GameEvent;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 using ObsoleteLogger = SharedLibraryCore.Interfaces.ILogger;
@@ -219,8 +217,6 @@ namespace IW4MAdmin.Application
             return _commands;
         }
 
-        public IReadOnlyList<IManagerCommand> Commands => _commands.ToImmutableList();
-
         public async Task UpdateServerStates()
         {
             // store the server hash code and task for it
@@ -236,6 +232,13 @@ namespace IW4MAdmin.Application
                     .Select(ut => ut.Key)
                     .ToList();
 
+                // this is to prevent the log reader from starting before the initial
+                // query of players on the server
+                if (serverTasksToRemove.Count > 0)
+                {
+                    IsInitialized = true;
+                }
+
                 // remove the update tasks as they have completed
                 foreach (var serverId in serverTasksToRemove.Where(serverId => runningUpdateTasks.ContainsKey(serverId)))
                 {
@@ -348,10 +351,10 @@ namespace IW4MAdmin.Application
             // copy over default config if it doesn't exist
             if (!_appConfig.Servers?.Any() ?? true)
             {
-                var defaultHandler = new BaseConfigurationHandler<DefaultSettings>("DefaultSettings");
+                var defaultConfig = new BaseConfigurationHandler<DefaultSettings>("DefaultSettings").Configuration();
-                await defaultHandler.BuildAsync();
+                //ConfigHandler.Set((ApplicationConfiguration)new ApplicationConfiguration().Generate());
-                var defaultConfig = defaultHandler.Configuration();
+                //var newConfig = ConfigHandler.Configuration();
-        
+
                 _appConfig.AutoMessages = defaultConfig.AutoMessages;
                 _appConfig.GlobalRules = defaultConfig.GlobalRules;
                 _appConfig.DisallowedClientNames = defaultConfig.DisallowedClientNames;
@@ -412,7 +415,7 @@ namespace IW4MAdmin.Application
 
                 if (!validationResult.IsValid)
                 {
-                    throw new ConfigurationException("Could not validate configuration")
+                    throw new ConfigurationException("MANAGER_CONFIGURATION_ERROR")
                     {
                         Errors = validationResult.Errors.Select(_error => _error.ErrorMessage).ToArray(),
                         ConfigurationFileName = ConfigHandler.FileName
@@ -449,17 +452,6 @@ namespace IW4MAdmin.Application
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
             Utilities.EncodingType = Encoding.GetEncoding(!string.IsNullOrEmpty(_appConfig.CustomParserEncoding) ? _appConfig.CustomParserEncoding : "windows-1252");
 
-            foreach (var parser in AdditionalRConParsers)
-            {
-                if (!parser.Configuration.ColorCodeMapping.ContainsKey(ColorCodes.Accent.ToString()))
-                {
-                    parser.Configuration.ColorCodeMapping.Add(ColorCodes.Accent.ToString(),
-                        parser.Configuration.ColorCodeMapping.TryGetValue(_appConfig.IngameAccentColorKey, out var colorCode)
-                            ? colorCode
-                            : "");
-                }
-            }
-
             #endregion
 
             #region COMMANDS
@@ -485,17 +477,13 @@ namespace IW4MAdmin.Application
 
             // this is because I want to store the command prefix in IW4MAdminSettings, but can't easily
             // inject it to all the places that need it
-            cmdConfig.CommandPrefix = _appConfig?.CommandPrefix ?? "!";
+            cmdConfig.CommandPrefix = _appConfig.CommandPrefix;
-            cmdConfig.BroadcastCommandPrefix = _appConfig?.BroadcastCommandPrefix ?? "@";
+            cmdConfig.BroadcastCommandPrefix = _appConfig.BroadcastCommandPrefix;
 
             foreach (var cmd in commandsToAddToConfig)
             {
-                if (cmdConfig.Commands.ContainsKey(cmd.CommandConfigNameForType()))
-                {
-                    continue;
-                }
                 cmdConfig.Commands.Add(cmd.CommandConfigNameForType(),
-                new CommandProperties
+                new CommandProperties()
                 {
                     Name = cmd.Name,
                     Alias = cmd.Alias,
@@ -523,7 +511,6 @@ namespace IW4MAdmin.Application
 
             Console.WriteLine(_translationLookup["MANAGER_COMMUNICATION_INFO"]);
             await InitializeServers();
-            IsInitialized = true;
         }
 
         private async Task InitializeServers()
@@ -545,7 +532,7 @@ namespace IW4MAdmin.Application
 
                         _servers.Add(ServerInstance);
                         Console.WriteLine(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_MONITORING_TEXT"].FormatExt(ServerInstance.Hostname.StripColors()));
-                        _logger.LogInformation("Finishing initialization and now monitoring [{Server}]", ServerInstance.Hostname);
+                        _logger.LogInformation("Finishing initialization and now monitoring [{server}]", ServerInstance.Hostname, ServerInstance.ToString());
                     }
 
                     // add the start event for this server
@@ -618,11 +605,6 @@ namespace IW4MAdmin.Application
             return _servers.SelectMany(s => s.Clients).ToList().Where(p => p != null).ToList();
         }
 
-        public EFClient FindActiveClient(EFClient client) =>client.ClientNumber < 0 ?
-                GetActiveClients()
-                    .FirstOrDefault(c => c.NetworkId == client.NetworkId) ?? client :
-                client;
-
         public ClientService GetClientService()
         {
             return ClientSvc;

Application/BuildScripts/PostBuild.bat

@@ -13,5 +13,4 @@ if not exist "%TargetDir%Plugins" (
 	md "%TargetDir%Plugins"
 )
 
-xcopy /y "%SolutionDir%Build\Plugins" "%TargetDir%Plugins\"
+xcopy /y "%SolutionDir%Build\Plugins" "%TargetDir%Plugins\"
-del "%TargetDir%Plugins\SQLite*"

Application/BuildScripts/PostPublish.bat

@@ -23,7 +23,6 @@ echo setting up default folders
 if not exist "%PublishDir%\Configuration" md "%PublishDir%\Configuration"
 move "%PublishDir%\DefaultSettings.json" "%PublishDir%\Configuration\"
 if not exist "%PublishDir%\Lib\" md "%PublishDir%\Lib\"
-del "%PublishDir%\Microsoft.CodeAnalysis*.dll" /F /Q
 move "%PublishDir%\*.dll" "%PublishDir%\Lib\"
 move "%PublishDir%\*.json" "%PublishDir%\Lib\"
 move "%PublishDir%\runtimes" "%PublishDir%\Lib\runtimes"
@@ -31,37 +30,16 @@ move "%PublishDir%\ru" "%PublishDir%\Lib\ru"
 move "%PublishDir%\de" "%PublishDir%\Lib\de"
 move "%PublishDir%\pt" "%PublishDir%\Lib\pt"
 move "%PublishDir%\es" "%PublishDir%\Lib\es"
-rmdir /Q /S "%PublishDir%\cs"
-rmdir /Q /S "%PublishDir%\fr"
-rmdir /Q /S "%PublishDir%\it"
-rmdir /Q /S "%PublishDir%\ja"
-rmdir /Q /S "%PublishDir%\ko"
-rmdir /Q /S "%PublishDir%\pl"
-rmdir /Q /S "%PublishDir%\pt-BR"
-rmdir /Q /S "%PublishDir%\tr"
-rmdir /Q /S "%PublishDir%\zh-Hans"
-rmdir /Q /S "%PublishDir%\zh-Hant"
 if exist "%PublishDir%\refs" move "%PublishDir%\refs" "%PublishDir%\Lib\refs"
 
 echo making start scripts
 @(echo @echo off && echo @title IW4MAdmin && echo set DOTNET_CLI_TELEMETRY_OPTOUT=1 && echo dotnet Lib\IW4MAdmin.dll && echo pause) > "%PublishDir%\StartIW4MAdmin.cmd"
 @(echo #!/bin/bash&& echo export DOTNET_CLI_TELEMETRY_OPTOUT=1&& echo dotnet Lib/IW4MAdmin.dll) > "%PublishDir%\StartIW4MAdmin.sh"
 
-echo copying update scripts
-copy "%SourceDir%\DeploymentFiles\UpdateIW4MAdmin.ps1" "%PublishDir%\UpdateIW4MAdmin.ps1"
-copy "%SourceDir%\DeploymentFiles\UpdateIW4MAdmin.sh" "%PublishDir%\UpdateIW4MAdmin.sh"
-
 echo moving front-end library dependencies
 if not exist "%PublishDir%\wwwroot\font" mkdir "%PublishDir%\wwwroot\font"
 move "WebfrontCore\wwwroot\lib\open-iconic\font\fonts\*.*" "%PublishDir%\wwwroot\font\"
 if exist "%PublishDir%\wwwroot\lib" rd /s /q "%PublishDir%\wwwroot\lib"
-if not exist "%PublishDir%\wwwroot\css" mkdir "%PublishDir%\wwwroot\css"
-move "WebfrontCore\wwwroot\css\global.min.css" "%PublishDir%\wwwroot\css\global.min.css"
-if not exist "%PublishDir%\wwwroot\js" mkdir "%PublishDir%\wwwroot\js"
-move "%SourceDir%\WebfrontCore\wwwroot\js\global.min.js" "%PublishDir%\wwwroot\js\global.min.js"
-if not exist "%PublishDir%\wwwroot\images" mkdir "%PublishDir%\wwwroot\images"
-xcopy "%SourceDir%\WebfrontCore\wwwroot\images" "%PublishDir%\wwwroot\images" /E /H /C /I
-
 
 echo setting permissions...
-cacls "%PublishDir%" /t /e /p Everyone:F
+cacls "%PublishDir%" /t /e /p Everyone:F

Application/Commands/FindPlayerCommand.cs

@@ -1,59 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Data.Models.Client;
-using SharedLibraryCore;
-using SharedLibraryCore.Commands;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
-
-namespace IW4MAdmin.Application.Commands
-{
-    /// <summary>
-    /// Finds player by name
-    /// </summary>
-    public class FindPlayerCommand : Command
-    {
-        public FindPlayerCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
-            translationLookup)
-        {
-            Name = "find";
-            Description = _translationLookup["COMMANDS_FIND_DESC"];
-            Alias = "f";
-            Permission = EFClient.Permission.Administrator;
-            RequiresTarget = false;
-            Arguments = new[]
-            {
-                new CommandArgument()
-                {
-                    Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
-                    Required = true
-                }
-            };
-        }
-
-        public override async Task ExecuteAsync(GameEvent gameEvent)
-        {
-            if (gameEvent.Data.Length < 3)
-            {
-                gameEvent.Origin.Tell(_translationLookup["COMMANDS_FIND_MIN"]);
-                return;
-            }
-
-            var players = await gameEvent.Owner.Manager.GetClientService().FindClientsByIdentifier(gameEvent.Data);
-
-            if (!players.Any())
-            {
-                gameEvent.Origin.Tell(_translationLookup["COMMANDS_FIND_EMPTY"]);
-                return;
-            }
-
-            foreach (var client in players)
-            {
-                gameEvent.Origin.Tell(_translationLookup["COMMANDS_FIND_FORMAT_V2"].FormatExt(client.Name,
-                    client.ClientId, Utilities.ConvertLevelToColor((EFClient.Permission) client.LevelInt, client.Level),
-                    client.IPAddress, (DateTime.UtcNow - client.LastConnection).HumanizeForCurrentCulture()));
-            }
-        }
-    }
-}

Application/Commands/HelpCommand.cs

@@ -1,93 +0,0 @@
-using System;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Data.Models.Client;
-using SharedLibraryCore;
-using SharedLibraryCore.Commands;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
-
-namespace IW4MAdmin.Application.Commands
-{
-    /// <summary>
-    /// Prints help information
-    /// </summary>
-    public class HelpCommand : Command
-    {
-        public HelpCommand(CommandConfiguration config, ITranslationLookup translationLookup) :
-            base(config, translationLookup)
-        {
-            Name = "help";
-            Description = translationLookup["COMMANDS_HELP_DESC"];
-            Alias = "h";
-            Permission = EFClient.Permission.User;
-            RequiresTarget = false;
-            Arguments = new[]
-            {
-                new CommandArgument
-                {
-                    Name = translationLookup["COMMANDS_ARGS_COMMANDS"],
-                    Required = false
-                }
-            };
-        }
-
-        public override Task ExecuteAsync(GameEvent gameEvent)
-        {
-            var searchTerm = gameEvent.Data.Trim();
-            var availableCommands = gameEvent.Owner.Manager.Commands.Distinct().Where(command =>
-                    command.SupportedGames == null || !command.SupportedGames.Any() ||
-                    command.SupportedGames.Contains(gameEvent.Owner.GameName))
-                .Where(command => gameEvent.Origin.Level >= command.Permission);
-
-            if (searchTerm.Length > 2)
-            {
-                var matchingCommand = availableCommands.FirstOrDefault(command =>
-                    command.Name.Equals(searchTerm, StringComparison.InvariantCultureIgnoreCase) ||
-                    command.Alias.Equals(searchTerm, StringComparison.InvariantCultureIgnoreCase));
-
-                if (matchingCommand != null)
-                {
-                    gameEvent.Origin.Tell(_translationLookup["COMMANDS_HELP_SEARCH_RESULT"]
-                        .FormatExt(matchingCommand.Name, matchingCommand.Alias));
-                    gameEvent.Origin.Tell(matchingCommand.Syntax);
-                }
-
-                else
-                {
-                    gameEvent.Origin.Tell(_translationLookup["COMMANDS_HELP_NOTFOUND"]);
-                }
-            }
-
-            else
-            {
-                var commandStrings = availableCommands.Select((command, index) =>
-                    new
-                    {
-                        response = $" {_translationLookup["COMMANDS_HELP_LIST_FORMAT"].FormatExt(command.Name)} ",
-                        index
-                    });
-
-                var helpResponse = new StringBuilder();
-
-                foreach (var item in commandStrings)
-                {
-                    helpResponse.Append(item.response);
-                    if (item.index == 0 || item.index % 4 != 0)
-                    {
-                        continue;
-                    }
-
-                    gameEvent.Origin.Tell(helpResponse.ToString());
-                    helpResponse = new StringBuilder();
-                }
-
-                gameEvent.Origin.Tell(helpResponse.ToString());
-                gameEvent.Origin.Tell(_translationLookup["COMMANDS_HELP_MOREINFO"]);
-            }
-
-            return Task.CompletedTask;
-        }
-    }
-}

Application/Commands/ListAdminsCommand.cs

@@ -1,50 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Data.Models.Client;
-using SharedLibraryCore;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
-
-namespace IW4MAdmin.Application.Commands
-{
-    /// <summary>
-    /// Lists all unmasked admins
-    /// </summary>
-    public class ListAdminsCommand : Command
-    {
-        public ListAdminsCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
-            translationLookup)
-        {
-            Name = "admins";
-            Description = _translationLookup["COMMANDS_ADMINS_DESC"];
-            Alias = "a";
-            Permission = EFClient.Permission.User;
-            RequiresTarget = false;
-        }
-
-        public static string OnlineAdmins(Server server, ITranslationLookup lookup)
-        {
-            var onlineAdmins = server.GetClientsAsList()
-                .Where(p => p.Level > EFClient.Permission.Flagged)
-                .Where(p => !p.Masked)
-                .Select(p =>
-                    $"[(Color::Yellow){Utilities.ConvertLevelToColor(p.Level, p.ClientPermission.Name)}(Color::White)] {p.Name}")
-                .ToList();
-
-            return onlineAdmins.Any() ? string.Join(Environment.NewLine, onlineAdmins) : lookup["COMMANDS_ADMINS_NONE"];
-        }
-
-        public override Task ExecuteAsync(GameEvent gameEvent)
-        {
-            foreach (var line in OnlineAdmins(gameEvent.Owner, _translationLookup).Split(Environment.NewLine))
-            {
-                var _ = gameEvent.Message.IsBroadcastCommand(_config.BroadcastCommandPrefix)
-                    ? gameEvent.Owner.Broadcast(line)
-                    : gameEvent.Origin.Tell(line);
-            }
-
-            return Task.CompletedTask;
-        }
-    }
-}

Application/Commands/ListAliasesCommand.cs

@@ -1,57 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Data.Models.Client;
-using SharedLibraryCore;
-using SharedLibraryCore.Commands;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
-
-namespace IW4MAdmin.Application.Commands
-{
-    /// <summary>
-    /// Lists alises of specified client
-    /// </summary>
-    public class ListAliasesCommand : Command
-    {
-        public ListAliasesCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
-            translationLookup)
-        {
-            Name = "alias";
-            Description = _translationLookup["COMMANDS_ALIAS_DESC"];
-            Alias = "known";
-            Permission = EFClient.Permission.Moderator;
-            RequiresTarget = true;
-            Arguments = new[]
-            {
-                new CommandArgument()
-                {
-                    Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
-                    Required = true,
-                }
-            };
-        }
-
-        public override Task ExecuteAsync(GameEvent gameEvent)
-        {
-            var message = new StringBuilder();
-            var names = new List<string>(gameEvent.Target.AliasLink.Children.Select(a => a.Name));
-            var ips = new List<string>(gameEvent.Target.AliasLink.Children.Select(a => a.IPAddress.ConvertIPtoString())
-                .Distinct());
-
-            gameEvent.Origin.Tell($"[(Color::Accent){gameEvent.Target}(Color::White)]");
-
-            message.Append($"{_translationLookup["COMMANDS_ALIAS_ALIASES"]}: ");
-            message.Append(string.Join(" | ", names));
-            gameEvent.Origin.Tell(message.ToString());
-
-            message.Clear();
-            message.Append($"{_translationLookup["COMMANDS_ALIAS_IPS"]}: ");
-            message.Append(string.Join(" | ", ips));
-            gameEvent.Origin.Tell(message.ToString());
-
-            return Task.CompletedTask;
-        }
-    }
-}

Application/Commands/ListClientsCommand.cs

@@ -1,37 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using Data.Models.Client;
-using SharedLibraryCore;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
-
-namespace IW4MAdmin.Application.Commands
-{
-    /// <summary>
-    /// List online clients
-    /// </summary>
-    public class ListClientsCommand : Command
-    {
-        public ListClientsCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
-            translationLookup)
-        {
-            Name = "list";
-            Description = _translationLookup["COMMANDS_LIST_DESC"];
-            Alias = "l";
-            Permission = EFClient.Permission.Moderator;
-            RequiresTarget = false;
-        }
-
-        public override Task ExecuteAsync(GameEvent gameEvent)
-        {
-            var clientList = gameEvent.Owner.GetClientsAsList()
-                .Select(client =>
-                    $"[(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);
-
-            return Task.CompletedTask;
-        }
-    }
-}

Application/Commands/ListPluginsCommand.cs

@@ -1,41 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Data.Models.Client;
-using SharedLibraryCore;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
-
-namespace IW4MAdmin.Application.Commands
-{
-    /// <summary>
-    /// Lists the loaded plugins
-    /// </summary>
-    public class ListPluginsCommand : Command
-    {
-        private readonly IEnumerable<IPlugin> _plugins;
-
-        public ListPluginsCommand(CommandConfiguration config, ITranslationLookup translationLookup,
-            IEnumerable<IPlugin> plugins) : base(config, translationLookup)
-        {
-            Name = "plugins";
-            Description = _translationLookup["COMMANDS_PLUGINS_DESC"];
-            Alias = "p";
-            Permission = EFClient.Permission.Administrator;
-            RequiresTarget = false;
-            _plugins = plugins;
-        }
-
-        public override Task ExecuteAsync(GameEvent gameEvent)
-        {
-            gameEvent.Origin.Tell(_translationLookup["COMMANDS_PLUGINS_LOADED"]);
-            foreach (var plugin in _plugins.Where(plugin => !plugin.IsParser))
-            {
-                gameEvent.Origin.Tell(_translationLookup["COMMANDS_LIST_PLUGINS_FORMAT"]
-                    .FormatExt(plugin.Name, plugin.Version, plugin.Author));
-            }
-
-            return Task.CompletedTask;
-        }
-    }
-}

Application/Commands/ListReportsCommand.cs

@@ -1,59 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Data.Models.Client;
-using SharedLibraryCore;
-using SharedLibraryCore.Commands;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Helpers;
-using SharedLibraryCore.Interfaces;
-
-namespace IW4MAdmin.Application.Commands
-{
-    /// <summary>
-    /// List all reports on the server
-    /// </summary>
-    public class ListReportsCommand : Command
-    {
-        public ListReportsCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
-            translationLookup)
-        {
-            Name = "reports";
-            Description = _translationLookup["COMMANDS_REPORTS_DESC"];
-            Alias = "reps";
-            Permission = EFClient.Permission.Moderator;
-            RequiresTarget = false;
-            Arguments = new[]
-            {
-                new CommandArgument
-                {
-                    Name = _translationLookup["COMMANDS_ARGS_CLEAR"],
-                    Required = false
-                }
-            };
-        }
-
-        public override Task ExecuteAsync(GameEvent gameEvent)
-        {
-            if (gameEvent.Data != null && gameEvent.Data.ToLower().Contains(_translationLookup["COMMANDS_ARGS_CLEAR"]))
-            {
-                gameEvent.Owner.Reports = new List<Report>();
-                gameEvent.Origin.Tell(_translationLookup["COMMANDS_REPORTS_CLEAR_SUCCESS"]);
-                return Task.CompletedTask;
-            }
-
-            if (gameEvent.Owner.Reports.Count < 1)
-            {
-                gameEvent.Origin.Tell(_translationLookup["COMMANDS_REPORTS_NONE"]);
-                return Task.CompletedTask;
-            }
-
-            foreach (var report in gameEvent.Owner.Reports)
-            {
-                gameEvent.Origin.Tell(
-                    $"(Color::Accent){report.Origin.Name}(Color::White) -> (Color::Red){report.Target.Name}(Color::White): {report.Reason}");
-            }
-
-            return Task.CompletedTask;
-        }
-    }
-}

Application/Commands/MapAndGameTypeCommand.cs

@@ -1,116 +0,0 @@
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using Data.Models.Client;
-using IW4MAdmin.Application.Extensions;
-using Microsoft.Extensions.Logging;
-using SharedLibraryCore;
-using SharedLibraryCore.Commands;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
-
-namespace IW4MAdmin.Application.Commands
-{
-    public class MapAndGameTypeCommand : Command
-    {
-        private const string ArgumentRegexPattern = "(?:\"([^\"]+)\"|([^\\s]+)) (?:\"([^\"]+)\"|([^\\s]+))";
-        private readonly ILogger _logger;
-        private readonly DefaultSettings _defaultSettings;
-
-        public MapAndGameTypeCommand(ILogger<MapAndGameTypeCommand> logger, CommandConfiguration config,
-            DefaultSettings defaultSettings, ITranslationLookup layout) : base(config, layout)
-        {
-            Name = "mapandgametype";
-            Description = _translationLookup["COMMANDS_MAG_DESCRIPTION"];
-            Alias = "mag";
-            Permission = EFClient.Permission.Administrator;
-            RequiresTarget = false;
-            Arguments = new[]
-            {
-                new CommandArgument
-                {
-                    Name = _translationLookup["COMMADS_MAG_ARG_1"],
-                    Required = true
-                },
-                new CommandArgument
-                {
-                    Name = _translationLookup["COMMADS_MAG_ARG_2"],
-                    Required = true
-                }
-            };
-            _logger = logger;
-            _defaultSettings = defaultSettings;
-        }
-
-        public override async Task ExecuteAsync(GameEvent gameEvent)
-        {
-            var match = Regex.Match(gameEvent.Data.Trim(), ArgumentRegexPattern,
-                RegexOptions.Compiled | RegexOptions.IgnoreCase);
-
-            if (!match.Success)
-            {
-                gameEvent.Origin.Tell(Syntax);
-                return;
-            }
-
-            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);
-
-            if (matchingMaps.Count > 1)
-            {
-                gameEvent.Origin.Tell(_translationLookup["COMMANDS_MAG_MULTIPLE_MAPS"]);
-
-                foreach (var matchingMap in matchingMaps)
-                {
-                    gameEvent.Origin.Tell(
-                        $"[(Color::Yellow){matchingMap.Alias}(Color::White)] [(Color::Yellow){matchingMap.Name}(Color::White)]");
-                }
-
-                return;
-            }
-
-            if (matchingGametypes.Count > 1)
-            {
-                gameEvent.Origin.Tell(_translationLookup["COMMANDS_MAG_MULTIPLE_GAMETYPES"]);
-
-                foreach (var matchingGametype in matchingGametypes)
-                {
-                    gameEvent.Origin.Tell(
-                        $"[(Color::Yellow){matchingGametype.Alias}(Color::White)] [(Color::Yellow){matchingGametype.Name}(Color::White)]");
-                }
-
-                return;
-            }
-
-            map = matchingMaps.FirstOrDefault()?.Name ?? map;
-            gametype = matchingGametypes.FirstOrDefault()?.Name ?? gametype;
-            var hasMatchingGametype = matchingGametypes.Any();
-
-            _logger.LogDebug("Changing map to {Map} and gametype {Gametype}", map, gametype);
-
-            await gameEvent.Owner.SetDvarAsync("g_gametype", gametype);
-            gameEvent.Owner.Broadcast(_translationLookup["COMMANDS_MAP_SUCCESS"].FormatExt(map));
-            await Task.Delay(gameEvent.Owner.Manager.GetApplicationSettings().Configuration().MapChangeDelaySeconds);
-
-            switch (gameEvent.Owner.GameName)
-            {
-                case Server.Game.IW5:
-                    await gameEvent.Owner.ExecuteCommandAsync(
-                        $"load_dsr {(hasMatchingGametype ? gametype.ToUpper() + "_default" : gametype)}");
-                    await gameEvent.Owner.ExecuteCommandAsync($"map {map}");
-                    break;
-                case Server.Game.T6:
-                    await gameEvent.Owner.ExecuteCommandAsync($"exec {gametype}.cfg");
-                    await gameEvent.Owner.ExecuteCommandAsync($"map {map}");
-                    break;
-                default:
-                    await gameEvent.Owner.ExecuteCommandAsync($"map {map}");
-                    break;
-            }
-        }
-    }
-}

Application/Commands/PrivateMessageCommand.cs

@@ -1,45 +0,0 @@
-using System.Threading.Tasks;
-using Data.Models.Client;
-using SharedLibraryCore;
-using SharedLibraryCore.Commands;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
-
-namespace IW4MAdmin.Application.Commands
-{
-    /// <summary>
-    /// Sends a private message to another player
-    /// </summary>
-    public class PrivateMessageCommand : Command
-    {
-        public PrivateMessageCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
-        {
-            Name = "privatemessage";
-            Description = _translationLookup["COMMANDS_PM_DESC"];
-            Alias = "pm";
-            Permission = EFClient.Permission.User;
-            RequiresTarget = true;
-            Arguments = new[]
-            {
-                new CommandArgument
-                {
-                    Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
-                    Required = true
-                },
-                new CommandArgument
-                {
-                    Name = _translationLookup["COMMANDS_ARGS_MESSAGE"],
-                    Required = true
-                }
-            };
-        }
-
-        public override Task ExecuteAsync(GameEvent gameEvent)
-        {
-            gameEvent.Target.Tell(_translationLookup["COMMANDS_PRIVATE_MESSAGE_FORMAT"].FormatExt(gameEvent.Origin.Name, gameEvent.Data));
-            gameEvent.Origin.Tell(_translationLookup["COMMANDS_PRIVATE_MESSAGE_RESULT"]
-                .FormatExt(gameEvent.Target.Name, gameEvent.Data));
-            return Task.CompletedTask;
-        }
-    }
-}

Application/Commands/ReportClientCommand.cs

@@ -1,77 +0,0 @@
-using System.Threading.Tasks;
-using Data.Models.Client;
-using SharedLibraryCore;
-using SharedLibraryCore.Commands;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
-
-namespace IW4MAdmin.Application.Commands
-{
-    /// <summary>
-    /// Report client for given reason
-    /// </summary>
-    public class ReportClientCommand : Command
-    {
-        public ReportClientCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
-            translationLookup)
-        {
-            Name = "report";
-            Description = _translationLookup["COMMANDS_REPORT_DESC"];
-            Alias = "rep";
-            Permission = EFClient.Permission.User;
-            RequiresTarget = true;
-            Arguments = new[]
-            {
-                new CommandArgument
-                {
-                    Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
-                    Required = true
-                },
-                new CommandArgument
-                {
-                    Name = _translationLookup["COMMANDS_ARGS_REASON"],
-                    Required = true
-                }
-            };
-        }
-
-        public override async Task ExecuteAsync(GameEvent commandEvent)
-        {
-            if (commandEvent.Data.ToLower().Contains("camp"))
-            {
-                commandEvent.Origin.Tell(_translationLookup["COMMANDS_REPORT_FAIL_CAMP"]);
-                return;
-            }
-
-            var success = false;
-
-            switch ((await commandEvent.Target.Report(commandEvent.Data, commandEvent.Origin)
-                .WaitAsync(Utilities.DefaultCommandTimeout, commandEvent.Owner.Manager.CancellationToken)).FailReason)
-            {
-                case GameEvent.EventFailReason.None:
-                    commandEvent.Origin.Tell(_translationLookup["COMMANDS_REPORT_SUCCESS"]);
-                    success = true;
-                    break;
-                case GameEvent.EventFailReason.Exception:
-                    commandEvent.Origin.Tell(_translationLookup["COMMANDS_REPORT_FAIL_DUPLICATE"]);
-                    break;
-                case GameEvent.EventFailReason.Permission:
-                    commandEvent.Origin.Tell(_translationLookup["COMMANDS_REPORT_FAIL"]
-                        .FormatExt(commandEvent.Target.Name));
-                    break;
-                case GameEvent.EventFailReason.Invalid:
-                    commandEvent.Origin.Tell(_translationLookup["COMMANDS_REPORT_FAIL_SELF"]);
-                    break;
-                case GameEvent.EventFailReason.Throttle:
-                    commandEvent.Origin.Tell(_translationLookup["COMMANDS_REPORT_FAIL_TOOMANY"]);
-                    break;
-            }
-
-            if (success)
-            {
-                commandEvent.Owner.ToAdmins(
-                    $"(Color::Accent){commandEvent.Origin.Name}(Color::White) -> (Color::Red){commandEvent.Target.Name}(Color::White): {commandEvent.Data}");
-            }
-        }
-    }
-}

Application/Commands/SayAllCommand.cs

@@ -1,46 +0,0 @@
-using System.Threading.Tasks;
-using Data.Models.Client;
-using SharedLibraryCore;
-using SharedLibraryCore.Commands;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
-
-namespace IW4MAdmin.Application.Commands
-{
-    /// <summary>
-    /// Prints out a message to all clients on all servers
-    /// </summary>
-    public class SayAllCommand : Command
-    {
-        public SayAllCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
-            translationLookup)
-        {
-            Name = "sayall";
-            Description = _translationLookup["COMMANDS_SAY_ALL_DESC"];
-            Alias = "sa";
-            Permission = EFClient.Permission.Moderator;
-            RequiresTarget = false;
-            Arguments = new[]
-            {
-                new CommandArgument
-                {
-                    Name = _translationLookup["COMMANDS_ARGS_MESSAGE"],
-                    Required = true
-                }
-            };
-        }
-
-        public override Task ExecuteAsync(GameEvent gameEvent)
-        {
-            var message = $"(Color::Accent){gameEvent.Origin.Name}(Color::White) - (Color::Red){gameEvent.Data}";
-
-            foreach (var server in gameEvent.Owner.Manager.GetServers())
-            {
-                server.Broadcast(message, gameEvent.Origin);
-            }
-
-            gameEvent.Origin.Tell(_translationLookup["COMMANDS_SAY_SUCCESS"]);
-            return Task.CompletedTask;
-        }
-    }
-}

Application/Commands/SayCommand.cs

@@ -1,42 +0,0 @@
-using System.Threading.Tasks;
-using SharedLibraryCore;
-using SharedLibraryCore.Commands;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
-using EFClient = Data.Models.Client.EFClient;
-
-namespace IW4MAdmin.Application.Commands
-{
-    /// <summary>
-    /// Prints out a message to all clients on the server
-    /// </summary>
-    public class SayCommand : Command
-    {
-        public SayCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
-            translationLookup)
-        {
-            Name = "say";
-            Description = _translationLookup["COMMANDS_SAY_DESC"];
-            Alias = "s";
-            Permission = EFClient.Permission.Moderator;
-            RequiresTarget = false;
-            Arguments = new[]
-            {
-                new CommandArgument
-                {
-                    Name = _translationLookup["COMMANDS_ARGS_MESSAGE"],
-                    Required = true
-                }
-            };
-        }
-
-        public override Task ExecuteAsync(GameEvent gameEvent)
-        {
-            gameEvent.Owner.Broadcast(
-                _translationLookup["COMMANDS_SAY_FORMAT"].FormatExt(gameEvent.Origin.Name, gameEvent.Data),
-                gameEvent.Origin);
-            gameEvent.Origin.Tell(_translationLookup["COMMANDS_SAY_SUCCESS"]);
-            return Task.CompletedTask;
-        }
-    }
-}

Application/Commands/WhoAmICommand.cs

@@ -1,38 +0,0 @@
-using System.Threading.Tasks;
-using Data.Models.Client;
-using SharedLibraryCore;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
-
-namespace IW4MAdmin.Application.Commands
-{
-    /// <summary>
-    /// Prints client information
-    /// </summary>
-    public class WhoAmICommand : Command
-    {
-        public WhoAmICommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
-            translationLookup)
-        {
-            Name = "whoami";
-            Description = _translationLookup["COMMANDS_WHO_DESC"];
-            Alias = "who";
-            Permission = EFClient.Permission.User;
-            RequiresTarget = false;
-        }
-
-        public override Task ExecuteAsync(GameEvent gameEvent)
-        {
-            var you =
-                "[(Color::Yellow)#{{clientNumber}}(Color::White)] [(Color::Yellow)@{{clientId}}(Color::White)] [{{networkId}}] [{{ip}}] [(Color::Cyan){{level}}(Color::White){{tag}}(Color::White)] {{name}}"
-                    .FormatExt(gameEvent.Origin.ClientNumber,
-                        gameEvent.Origin.ClientId, gameEvent.Origin.GuidString,
-                        gameEvent.Origin.IPAddressString, gameEvent.Origin.ClientPermission.Name,
-                        string.IsNullOrEmpty(gameEvent.Origin.Tag) ? "" : $" {gameEvent.Origin.Tag}",
-                        gameEvent.Origin.Name);
-            gameEvent.Origin.Tell(you);
-
-            return Task.CompletedTask;
-        }
-    }
-}

Application/Configuration/LoggingConfiguration.json

@@ -18,13 +18,6 @@
           "rollingInterval": "Day",
           "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss.fff} {Server} {Level:u3}] {Message:lj}{NewLine}{Exception}"
         }
-      },
-      {
-        "Name": "Console",
-        "Args": {
-          "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss.fff} {Server} {Level:u3}] {Message:lj}{NewLine}{Exception}",
-          "RestrictedToMinimumLevel": "Fatal"
-        }
       }
     ],
     "Enrich": [

Application/DefaultSettings.json

@@ -1,11 +1,11 @@
 {
   "AutoMessagePeriod": 60,
   "AutoMessages": [
-    "This server uses (Color::Accent)IW4M Admin v{{VERSION}} (Color::White)get it at (Color::Accent)raidmax.org/IW4MAdmin",
+    "This server uses ^5IW4M Admin v{{VERSION}} ^7get it at ^5raidmax.org/IW4MAdmin",
-    "(Color::Accent)IW4M Admin (Color::White)sees (Color::Accent)YOU!",
+    "^5IW4M Admin ^7sees ^5YOU!",
     "{{TOPSTATS}}",
-    "This server has seen a total of (Color::Accent){{TOTALPLAYERS}} (Color::White)players!",
+    "This server has seen a total of ^5{{TOTALPLAYERS}} ^7players!",
-    "Cheaters are (Color::Red)unwelcome (Color::White)on this server",
+    "Cheaters are ^1unwelcome ^7 on this server",
     "Did you know 8/10 people agree with unverified statistics?"
   ],
   "GlobalRules": [
@@ -68,504 +68,6 @@
       }
     }
   ],
-  "Gametypes": [
-    {
-      "Game": "IW4",
-      "Gametypes": [
-        {
-          "Name": "arena",
-          "Alias": "Arena"
-        },
-        {
-          "Name": "ctf",
-          "Alias": "Capture The Flag"
-        },
-        {
-          "Name": "dd",
-          "Alias": "Demolition"
-        },
-        {
-          "Name": "dm",
-          "Alias": "Free For All"
-        },
-        {
-          "Name": "dom",
-          "Alias": "Domination"
-        },
-        {
-          "Name": "gtnw",
-          "Alias": "Global Thermo-Nuclear War"
-        },
-        {
-          "Name": "koth",
-          "Alias": "Headquarters"
-        },
-        {
-          "Name": "oneflag",
-          "Alias": "One-Flag CTF"
-        },
-        {
-          "Name": "sab",
-          "Alias": "Sabotage"
-        },
-        {
-          "Name": "sd",
-          "Alias": "Search & Destroy"
-        },
-        {
-          "Name": "war",
-          "Alias": "Team Deathmatch"
-        }
-      ]
-    },
-    {
-      "Game": "T4",
-      "Gametypes": [
-        {
-          "Name": "ctf",
-          "Alias": "Capture The Flag"
-        },
-        {
-          "Name": "dom",
-          "Alias": "Domination"
-        },
-        {
-          "Name": "dm",
-          "Alias": "Free For All"
-        },
-        {
-          "Name": "koth",
-          "Alias": "Headquarters"
-        },
-        {
-          "Name": "tdm",
-          "Alias": "Team Deathmatch"
-        },
-        {
-          "Name": "sab",
-          "Alias": "Sabotage"
-        },
-        {
-          "Name": "sd",
-          "Alias": "Search & Destroy"
-        },
-        {
-          "Name": "twar",
-          "Alias": "War"
-        }
-      ]
-    },
-    {
-      "Game": "IW5",
-      "Gametypes": [
-        {
-          "Name": "tdm",
-          "Alias": "Team Deathmatch"
-        },
-        {
-          "Name": "dom",
-          "Alias": "Domination"
-        },
-        {
-          "Name": "ctf",
-          "Alias": "Capture The Flag"
-        },
-        {
-          "Name": "dd",
-          "Alias": "Demolition"
-        },
-        {
-          "Name": "dz",
-          "Alias": "Drop Zone"
-        },
-        {
-          "Name": "ffa",
-          "Alias": "Free For All"
-        },
-        {
-          "Name": "gg",
-          "Alias": "Gun Game"
-        },
-        {
-          "Name": "hq",
-          "Alias": "Headquarters"
-        },
-        {
-          "Name": "koth",
-          "Alias": "Headquarters"
-        },
-        {
-          "Name": "inf",
-          "Alias": "Infected"
-        },
-        {
-          "Name": "jug",
-          "Alias": "Juggernaut"
-        },
-        {
-          "Name": "kc",
-          "Alias": "Kill Confirmed"
-        },
-        {
-          "Name": "oic",
-          "Alias": "One In The Chamber"
-        },
-        {
-          "Name": "sab",
-          "Alias": "Sabotage"
-        },
-        {
-          "Name": "sd",
-          "Alias": "Search & Destroy"
-        },
-        {
-          "Name": "tdef",
-          "Alias": "Team Defender"
-        },
-        {
-          "Name": "tj",
-          "Alias": "Team Juggernaut"
-        }
-      ]
-    },
-    {
-      "Game": "T5",
-      "Gametypes": [
-        {
-          "Name": "ctf",
-          "Alias": "Capture The Flag"
-        },
-        {
-          "Name": "dem",
-          "Alias": "Demolition"
-        },
-        {
-          "Name": "dom",
-          "Alias": "Domination"
-        },
-        {
-          "Name": "dm",
-          "Alias": "Free For All"
-        },
-        {
-          "Name": "gun",
-          "Alias": "Gun Game"
-        },
-        {
-          "Name": "hlnd",
-          "Alias": "Sticks & Stones"
-        },
-        {
-          "Name": "koth",
-          "Alias": "Headquarters"
-        },
-        {
-          "Name": "oic",
-          "Alias": "One In The Chamber"
-        },
-        {
-          "Name": "sab",
-          "Alias": "Sabotage"
-        },
-        {
-          "Name": "sd",
-          "Alias": "Search & Destroy"
-        },
-        {
-          "Name": "shrp",
-          "Alias": "Sharpshooter"
-        },
-        {
-          "Name": "tdm",
-          "Alias": "Team Deathmatch"
-        }
-      ]
-    },
-    {
-      "Game": "IW6",
-      "Gametypes": [
-        {
-          "Name": "blitz",
-          "Alias": "Blitz"
-        },
-        {
-          "Name": "conf",
-          "Alias": "Kill Confirmed"
-        },
-        {
-          "Name": "cranked",
-          "Alias": "Cranked"
-        },
-        {
-          "Name": "dm",
-          "Alias": "Free For All"
-        },
-        {
-          "Name": "dom",
-          "Alias": "Domination"
-        },
-        {
-          "Name": "grind",
-          "Alias": "Grind"
-        },
-        {
-          "Name": "grnd",
-          "Alias": "Drop Zone"
-        },
-        {
-          "Name": "gun",
-          "Alias": "Gun Game"
-        },
-        {
-          "Name": "horde",
-          "Alias": "Safeguard"
-        },
-        {
-          "Name": "infect",
-          "Alias": "Infected"
-        },
-        {
-          "Name": "sd",
-          "Alias": "Search & Destroy"
-        },
-        {
-          "Name": "siege",
-          "Alias": "Reinforce"
-        },
-        {
-          "Name": "sotf",
-          "Alias": "Hunted"
-        },
-        {
-          "Name": "sotf_ffa",
-          "Alias": "Hunted FFA"
-        },
-        {
-          "Name": "sr",
-          "Alias": "Search & Rescue"
-        },
-        {
-          "Name": "war",
-          "Alias": "Team Deathmatch"
-        }
-      ]
-    },
-    {
-      "Game": "T6",
-      "Gametypes": [
-        {
-          "Name": "conf",
-          "Alias": "Kill Confirmed"
-        },
-        {
-          "Name": "ctf",
-          "Alias": "Capture The Flag"
-        },
-        {
-          "Name": "dem",
-          "Alias": "Demolition"
-        },
-        {
-          "Name": "dm",
-          "Alias": "Free For All"
-        },
-        {
-          "Name": "dom",
-          "Alias": "Domination"
-        },
-        {
-          "Name": "gun",
-          "Alias": "Gun Game"
-        },
-        {
-          "Name": "hq",
-          "Alias": "Headquarters"
-        },
-        {
-          "Name": "koth",
-          "Alias": "Hardpoint"
-        },
-        {
-          "Name": "oic",
-          "Alias": "One In The Chamber"
-        },
-        {
-          "Name": "oneflag",
-          "Alias": "One-Flag CTF"
-        },
-        {
-          "Name": "sas",
-          "Alias": "Sticks & Stones"
-        },
-        {
-          "Name": "sd",
-          "Alias": "Search & Destroy"
-        },
-        {
-          "Name": "shrp",
-          "Alias": "Sharpshooter"
-        },
-        {
-          "Name": "tdm",
-          "Alias": "Team Deathmatch"
-        }
-      ]
-    },
-    {
-      "Game": "T7",
-      "Gametypes": [
-        {
-          "Name": "ball",
-          "Alias": "Uplink"
-        },
-        {
-          "Name": "clean",
-          "Alias": "Fracture"
-        },
-        {
-          "Name": "conf",
-          "Alias": "Kill Confirmed"
-        },
-        {
-          "Name": "ctf",
-          "Alias": "Capture The Flag"
-        },
-        {
-          "Name": "dom",
-          "Alias": "Domination"
-        },
-        {
-          "Name": "dem",
-          "Alias": "Demolition"
-        },
-        {
-          "Name": "dm",
-          "Alias": "Free For All"
-        },
-        {
-          "Name": "escort",
-          "Alias": "Safeguard"
-        },
-        {
-          "Name": "gun",
-          "Alias": "Gun Game"
-        },
-        {
-          "Name": "koth",
-          "Alias": "Hardpoint"
-        },
-        {
-          "Name": "sd",
-          "Alias": "Search & Destroy"
-        },
-        {
-          "Name": "tdm",
-          "Alias": "Team Deathmatch"
-        },
-        {
-          "Name": "hc_ball",
-          "Alias": "Hardcore Uplink"
-        },
-        {
-          "Name": "hc_clean",
-          "Alias": "Hardcore Fracture"
-        },
-        {
-          "Name": "hc_conf",
-          "Alias": "Hardcore Kill Confirmed"
-        },
-        {
-          "Name": "hc_ctf",
-          "Alias": "Hardcore Capture The Flag"
-        },
-        {
-          "Name": "hc_dom",
-          "Alias": "Hardcore Domination"
-        },
-        {
-          "Name": "hc_dem",
-          "Alias": "Hardcore Demolition"
-        },
-        {
-          "Name": "hc_dm",
-          "Alias": "Hardcore Free For All"
-        },
-        {
-          "Name": "hc_escort",
-          "Alias": "Hardcore Safeguard"
-        },
-        {
-          "Name": "hc_gun",
-          "Alias": "Hardcore Gun Game"
-        },
-        {
-          "Name": "hc_koth",
-          "Alias": "Hardcore Hardpoint"
-        },
-        {
-          "Name": "hc_sd",
-          "Alias": "Hardcore Search & Destroy"
-        },
-        {
-          "Name": "hc_tdm",
-          "Alias": "Hardcore Team Deathmatch"
-        }
-      ]
-    },
-    {
-      "Game": "SHG1",
-      "Gametypes": [
-        {
-          "Name": "ball",
-          "Alias": "Uplink"
-        },
-        {
-          "Name": "conf",
-          "Alias": "Kill Confirmed"
-        },
-        {
-          "Name": "ctf",
-          "Alias": "Capture The Flag"
-        },
-        {
-          "Name": "dom",
-          "Alias": "Domination"
-        },
-        {
-          "Name": "dm",
-          "Alias": "Free For All"
-        },
-        {
-          "Name": "gun",
-          "Alias": "Gun Game"
-        },
-        {
-          "Name": "hp",
-          "Alias": "Hardpoint"
-        },
-        {
-          "Name": "infect",
-          "Alias": "Infected"
-        },
-        {
-          "Name": "sd",
-          "Alias": "Search & Destroy"
-        },
-        {
-          "Name": "sr",
-          "Alias": "Search & Rescue"
-        },
-        {
-          "Name": "war",
-          "Alias": "Team Deathmatch"
-        },
-        {
-          "Name": "twar",
-          "Alias": "Momentum"
-        }
-      ]
-    }
-  ],
   "Maps": [
     {
       "Game": "IW3",
@@ -1201,18 +703,6 @@
         {
           "Alias": "Highrise",
           "Name": "mp_highrise"
-        },
-        {
-          "Alias": "Favela",
-          "Name": "mp_favela"
-        },
-        {
-          "Alias": "Nuketown",
-          "Name": "mp_nuked"
-        },
-        {
-          "Alias": "Skidrow",
-          "Name": "mp_nightshift"
         }
       ]
     },
@@ -2027,62 +1517,62 @@
       "winchester1200": "W1200",
       "concussion": "Stun",
       "melee": "Knife",
-      "Frag": "Grenade",
+      "Frag" : "Grenade",
       "airstrike": "Airstrike",
       "helicopter": "Attack Helicopter",
       "player": "",
       "attach": ""
     },
-    "T4": {
+    "T4": {	
-      "torso_upper": "Upper Torso",
+	  "torso_upper": "Upper Torso",
-      "torso_lower": "Lower Torso",
+	  "torso_lower": "Lower Torso",
-      "right_leg_upper": "Upper Right Leg",
+	  "right_leg_upper": "Upper Right Leg",
-      "right_leg_lower": "Lower Right Leg",
+	  "right_leg_lower": "Lower Right Leg",
-      "right_hand": "Right Hand",
+	  "right_hand": "Right Hand",
-      "right_foot": "Right Foot",
+	  "right_foot": "Right Foot",
-      "right_arm_upper": "Upper Right Arm",
+	  "right_arm_upper": "Upper Right Arm",
-      "right_arm_lower": "Lower Right Arm",
+	  "right_arm_lower": "Lower Right Arm",
-      "left_leg_upper": "Upper Left Leg",
+	  "left_leg_upper": "Upper Left Leg",
-      "left_leg_lower": "Lower Left Leg",
+	  "left_leg_lower": "Lower Left Leg",
-      "left_hand": "Left Hand",
+	  "left_hand": "Left Hand",
-      "left_foot": "Left Foot",
+	  "left_foot": "Left Foot",
-      "left_arm_upper": "Upper Left Arm",
+	  "left_arm_upper": "Upper Left Arm",
-      "left_arm_lower": "Lower Left Arm",
+	  "left_arm_lower": "Lower Left Arm",
-      "gl": "Rifle Grenade",
+	  "gl": "Rifle Grenade",
-      "bigammo": "Round Drum",
+	  "bigammo": "Round Drum",
-      "scoped": "Sniper Scope",
+	  "scoped": "Sniper Scope",
-      "telescopic": "Telescopic Sight",
+	  "telescopic": "Telescopic Sight",
-      "aperture": "Aperture Sight",
+	  "aperture": "Aperture Sight",
-      "flash": "Flash Hider",
+	  "flash": "Flash Hider",
-      "silenced": "Silencer",
+	  "silenced": "Silencer",
-      "molotov": "Molotov Cocktail",
+	  "molotov": "Molotov Cocktail",
-      "sticky": "N° 74 ST",
+	  "sticky": "N° 74 ST",
-      "m2": "M2 Flamethrower",
+	  "m2": "M2 Flamethrower",
-      "artillery": "Artillery Strike",
+	  "artillery": "Artillery Strike",
-      "dog": "Attack Dogs",
+	  "dog": "Attack Dogs",
-      "colt": "Colt M1911",
+	  "colt":	"Colt M1911",
-      "357magnum": ".357 Magnum",
+	  "357magnum": ".357 Magnum",
-      "walther": "Walther P38",
+	  "walther": "Walther P38",
-      "tokarev": "Tokarev TT-33",
+	  "tokarev": "Tokarev TT-33",
-      "shotgun": "M1897 Trench Gun",
+	  "shotgun": "M1897 Trench Gun",
-      "doublebarreledshotgun": "Double-Barreled Shotgun",
+	  "doublebarreledshotgun": "Double-Barreled Shotgun",
-      "mp40": "MP40",
+	  "mp40": "MP40",
-      "type100smg": "Type 100",
+	  "type100smg": "Type 100",
-      "ppsh": "PPSh-41",
+	  "ppsh": "PPSh-41",
-      "svt40": "SVT-40",
+	  "svt40": "SVT-40",
-      "gewehr43": "Gewehr 43",
+	  "gewehr43": "Gewehr 43",
-      "m1garand": "M1 Garand",
+	  "m1garand": "M1 Garand",
-      "stg44": "STG-44",
+	  "stg44": "STG-44",
-      "m1carbine": "M1A1 Carbine",
+	  "m1carbine": "M1A1 Carbine",
-      "type99lmg": "Type 99",
+	  "type99lmg": "Type 99",
-      "bar": "BAR",
+	  "bar": "BAR",
-      "dp28": "DP-28",
+	  "dp28": "DP-28",
-      "mg42": "MG42",
+	  "mg42": "MG42",
-      "fg42": "FG42",
+	  "fg42": "FG42",
-      "30cal": "Browning M1919",
+	  "30cal": "Browning M1919",
-      "type99rifle": "Arisaka",
+	  "type99rifle": "Arisaka",
-      "mosinrifle": "Mosin-Nagant",
+	  "mosinrifle": "Mosin-Nagant",
-      "ptrs41": "PTRS-41"
+	  "ptrs41":"PTRS-41"
-    }
+	}
   }
 }

Application/EventParsers/BaseEventParser.cs

@@ -50,7 +50,7 @@ namespace IW4MAdmin.Application.EventParsers
             Configuration.Join.AddMapping(ParserRegex.GroupType.OriginClientNumber, 3);
             Configuration.Join.AddMapping(ParserRegex.GroupType.OriginName, 4);
 
-            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.Pattern = @"^(D);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,24});(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0)?;(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,24})?;((?:[0-9]+|[a-z]+|_|\+)+);([0-9]+);((?:[A-Z]|_)+);((?:[a-z]|_)+)$";
             Configuration.Damage.AddMapping(ParserRegex.GroupType.EventType, 1);
             Configuration.Damage.AddMapping(ParserRegex.GroupType.TargetNetworkId, 2);
             Configuration.Damage.AddMapping(ParserRegex.GroupType.TargetClientNumber, 3);
@@ -65,7 +65,7 @@ namespace IW4MAdmin.Application.EventParsers
             Configuration.Damage.AddMapping(ParserRegex.GroupType.MeansOfDeath, 12);
             Configuration.Damage.AddMapping(ParserRegex.GroupType.HitLocation, 13);
 
-            Configuration.Kill.Pattern = @"^(K);(-?[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.Kill.Pattern = @"^(K);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,24});(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0)?;(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,24})?;((?:[0-9]+|[a-z]+|_|\+)+);([0-9]+);((?:[A-Z]|_)+);((?:[a-z]|_)+)$";
             Configuration.Kill.AddMapping(ParserRegex.GroupType.EventType, 1);
             Configuration.Kill.AddMapping(ParserRegex.GroupType.TargetNetworkId, 2);
             Configuration.Kill.AddMapping(ParserRegex.GroupType.TargetClientNumber, 3);

Application/Extensions/CommandExtensions.cs

@@ -1,10 +1,6 @@
-using System;
+using IW4MAdmin.Application.Misc;
-using System.Collections.Generic;
-using IW4MAdmin.Application.Misc;
 using SharedLibraryCore.Interfaces;
 using System.Linq;
-using SharedLibraryCore;
-using SharedLibraryCore.Configuration;
 
 namespace IW4MAdmin.Application.Extensions
 {
@@ -17,19 +13,9 @@ namespace IW4MAdmin.Application.Extensions
         /// <returns></returns>
         public static string CommandConfigNameForType(this IManagerCommand command)
         {
-            return command.GetType() == typeof(ScriptCommand)
+            return command.GetType() == typeof(ScriptCommand) ?
-                ? $"{char.ToUpper(command.Name[0])}{command.Name.Substring(1)}Command"
+                        $"{char.ToUpper(command.Name[0])}{command.Name.Substring(1)}Command" :
-                : command.GetType().Name;
+                        command.GetType().Name;
         }
-
-        public static IList<Map> FindMap(this Server server, string mapName) => server.Maps.Where(map =>
-            map.Name.Equals(mapName, StringComparison.InvariantCultureIgnoreCase) ||
-            map.Alias.Equals(mapName, StringComparison.InvariantCultureIgnoreCase)).ToList();
-
-        public static IList<Gametype> FindGametype(this DefaultSettings settings, string gameType, Server.Game? game = null) =>
-            settings.Gametypes?.Where(gt => game == null || gt.Game == game)
-                .SelectMany(gt => gt.Gametypes).Where(gt =>
-                    gt.Alias.Contains(gameType, StringComparison.CurrentCultureIgnoreCase) ||
-                    gt.Name.Contains(gameType, StringComparison.CurrentCultureIgnoreCase)).ToList();
     }
 }

Application/Extensions/StartupExtensions.cs

@@ -78,10 +78,8 @@ namespace IW4MAdmin.Application.Extensions
                 case "mysql":
                     var appendTimeout = !appConfig.ConnectionString.Contains("default command timeout",
                         StringComparison.InvariantCultureIgnoreCase);
-                    var connectionString =
-                        appConfig.ConnectionString + (appendTimeout ? ";default command timeout=0" : "");
                     services.AddSingleton(sp => (DbContextOptions) new DbContextOptionsBuilder<MySqlDatabaseContext>()
-                        .UseMySql(connectionString, ServerVersion.AutoDetect(connectionString),
+                        .UseMySql(appConfig.ConnectionString + (appendTimeout ? ";default command timeout=0" : ""),
                             mysqlOptions => mysqlOptions.EnableRetryOnFailure())
                         .UseLoggerFactory(sp.GetRequiredService<ILoggerFactory>()).Options);
                     return services;
@@ -94,7 +92,7 @@ namespace IW4MAdmin.Application.Extensions
                                 postgresqlOptions =>
                                 {
                                     postgresqlOptions.EnableRetryOnFailure();
-                                    postgresqlOptions.SetPostgresVersion(new Version("12.9"));
+                                    postgresqlOptions.SetPostgresVersion(new Version("9.4"));
                                 })
                             .UseLoggerFactory(sp.GetRequiredService<ILoggerFactory>()).Options);
                     return services;
@@ -103,4 +101,4 @@ namespace IW4MAdmin.Application.Extensions
             }
         }
     }
-}
+}

Application/Factories/ConfigurationHandlerFactory.cs

@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
+using IW4MAdmin.Application.Misc;
-using IW4MAdmin.Application.Misc;
 using SharedLibraryCore.Interfaces;
 
 namespace IW4MAdmin.Application.Factories
@@ -18,17 +17,7 @@ namespace IW4MAdmin.Application.Factories
         /// <returns></returns>
         public IConfigurationHandler<T> GetConfigurationHandler<T>(string name) where T : IBaseConfiguration
         {
-            var handler = new BaseConfigurationHandler<T>(name);
+            return new BaseConfigurationHandler<T>(name);
-            handler.BuildAsync().Wait();
-            return handler;
-        }
-
-        /// <inheritdoc/>
-        public async Task<IConfigurationHandler<T>> GetConfigurationHandlerAsync<T>(string name) where T : IBaseConfiguration
-        {
-            var handler = new BaseConfigurationHandler<T>(name);
-            await handler.BuildAsync();
-            return handler;
         }
     }
 }

Application/Factories/GameLogReaderFactory.cs

@@ -18,22 +18,14 @@ namespace IW4MAdmin.Application.Factories
         public IGameLogReader CreateGameLogReader(Uri[] logUris, IEventParser eventParser)
         {
             var baseUri = logUris[0];
-            if (baseUri.Scheme == Uri.UriSchemeHttp || baseUri.Scheme == Uri.UriSchemeHttps)
+            if (baseUri.Scheme == Uri.UriSchemeHttp)
             {
-                return new GameLogReaderHttp(logUris, eventParser,
+                return new GameLogReaderHttp(logUris, eventParser, _serviceProvider.GetRequiredService<ILogger<GameLogReaderHttp>>());
-                    _serviceProvider.GetRequiredService<ILogger<GameLogReaderHttp>>());
             }
 
-            if (baseUri.Scheme == Uri.UriSchemeFile)
+            else if (baseUri.Scheme == Uri.UriSchemeFile)
             {
-                return new GameLogReader(baseUri.LocalPath, eventParser,
+                return new GameLogReader(baseUri.LocalPath, eventParser, _serviceProvider.GetRequiredService<ILogger<GameLogReader>>());
-                    _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/ScriptCommandFactory.cs

@@ -6,7 +6,6 @@ using SharedLibraryCore.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using Data.Models.Client;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -31,7 +30,7 @@ namespace IW4MAdmin.Application.Factories
 
         /// <inheritdoc/>
         public IManagerCommand CreateScriptCommand(string name, string alias, string description, string permission, 
-            bool isTargetRequired, IEnumerable<(string, bool)> args, Func<GameEvent, Task> executeAction, Server.Game[] supportedGames)
+            bool isTargetRequired, IEnumerable<(string, bool)> args, Action<GameEvent> executeAction)
         {
             var permissionEnum = Enum.Parse<EFClient.Permission>(permission);
             var argsArray = args.Select(_arg => new CommandArgument
@@ -41,7 +40,7 @@ namespace IW4MAdmin.Application.Factories
             }).ToArray();
 
             return new ScriptCommand(name, alias, description, isTargetRequired, permissionEnum, argsArray, executeAction,
-                _config, _transLookup, _serviceProvider.GetRequiredService<ILogger<ScriptCommand>>(), supportedGames);
+                _config, _transLookup, _serviceProvider.GetRequiredService<ILogger<ScriptCommand>>());
         }
     }
 }

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, _server);
+            var events = await _reader.ReadEventsFromLog(fileDiff, previousFileSize);
 
             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, Server server = null)
+        public async Task<IEnumerable<GameEvent>> ReadEventsFromLog(long fileSizeDiff, long startPosition)
         {
             // 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, Server server = null)
+        public async Task<IEnumerable<GameEvent>> ReadEventsFromLog(long fileSizeDiff, long startPosition)
         {
             var events = new List<GameEvent>();
             var response = await _logServerApi.Log(_safeLogPath, lastKey);

Application/IO/NetworkGameLogReader.cs

@@ -1,157 +0,0 @@
-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>());
-                    }
-                    
-                    new Thread(() => ReadNetworkData(client)).Start();
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Could not register {Name} endpoint {Endpoint}",
-                        nameof(NetworkGameLogReader), _uri);
-                    throw;
-                }
-            }
-
-            var events = new List<GameEvent>();
-
-            foreach (var logData in State.GetServerLogData(serverEndpoint)
-                         .Select(log => Utilities.EncodingType.GetString(log)))
-            {
-                if (string.IsNullOrWhiteSpace(logData))
-                {
-                    return Task.FromResult(Enumerable.Empty<GameEvent>());
-                }
-
-                var lines = logData
-                    .Split('\n')
-                    .Where(line => line.Length > 0);
-
-                foreach (var eventLine in lines)
-                {
-                    try
-                    {
-                        // this trim end should hopefully fix the nasty runaway regex
-                        var gameEvent = _eventParser.GenerateGameEvent(eventLine.TrimEnd('\r'));
-                        events.Add(gameEvent);
-                    }
-
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Could not properly parse event line from http {EventLine}",
-                            eventLine);
-                    }
-                }
-            }
-
-            return Task.FromResult((IEnumerable<GameEvent>)events);
-        }
-
-        private void ReadNetworkData(UdpClient client)
-        {
-            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
-                {
-                    bufferedData = client.Receive(ref remoteEndpoint);
-                }
-                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

@@ -1,138 +0,0 @@
-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

@@ -12,7 +12,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
-using System.Net.Sockets;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -24,7 +23,6 @@ using Serilog.Context;
 using static SharedLibraryCore.Database.Models.EFClient;
 using Data.Models;
 using Data.Models.Server;
-using IW4MAdmin.Application.Commands;
 using Microsoft.EntityFrameworkCore;
 using static Data.Models.Client.EFClient;
 
@@ -53,13 +51,11 @@ namespace IW4MAdmin
             IServiceProvider serviceProvider,
             IClientNoticeMessageFormatter messageFormatter,
             ILookupCache<EFServer> serverCache) : base(serviceProvider.GetRequiredService<ILogger<Server>>(), 
-#pragma warning disable CS0612
             serviceProvider.GetRequiredService<SharedLibraryCore.Interfaces.ILogger>(), 
-#pragma warning restore CS0612
             serverConfiguration,
             serviceProvider.GetRequiredService<IManager>(), 
             serviceProvider.GetRequiredService<IRConConnectionFactory>(),
-            serviceProvider.GetRequiredService<IGameLogReaderFactory>(), serviceProvider)
+            serviceProvider.GetRequiredService<IGameLogReaderFactory>())
         {
             _translationLookup = lookup;
             _metaService = metaService;
@@ -236,7 +232,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 { IsParser: true })
+            if (plugin is ScriptPlugin scriptPlugin && scriptPlugin.IsParser)
             {
                 return;
             }
@@ -246,16 +242,11 @@ namespace IW4MAdmin
 
             try
             {
-                await plugin.OnEventAsync(gameEvent, this).WithWaitCancellation(tokenSource.Token);
+                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));
+                Console.WriteLine(loc["SERVER_PLUGIN_ERROR"]);
                 ServerLogger.LogError(ex, "Could not execute {methodName} for plugin {plugin}", 
                     nameof(plugin.OnEventAsync), plugin.Name);
             }
@@ -295,7 +286,7 @@ namespace IW4MAdmin
                     }
                 }
                 
-                else if (E.Type == GameEvent.EventType.ConnectionLost)
+                if (E.Type == GameEvent.EventType.ConnectionLost)
                 {
                     var exception = E.Extra as Exception;
                     ServerLogger.LogError(exception,
@@ -309,7 +300,7 @@ namespace IW4MAdmin
                     Throttled = true;
                 }
 
-                else if (E.Type == GameEvent.EventType.ConnectionRestored)
+                if (E.Type == GameEvent.EventType.ConnectionRestored)
                 {
                     ServerLogger.LogInformation(
                         "Connection restored with {server}", ToString());
@@ -327,7 +318,7 @@ namespace IW4MAdmin
                     Throttled = false;
                 }
 
-                else if (E.Type == GameEvent.EventType.ChangePermission)
+                if (E.Type == GameEvent.EventType.ChangePermission)
                 {
                     var newPermission = (Permission) E.Extra;
                     ServerLogger.LogInformation("{origin} is setting {target} to permission level {newPermission}",
@@ -360,7 +351,7 @@ namespace IW4MAdmin
                         try
                         {
                             var factory = _serviceProvider.GetRequiredService<IDatabaseContextFactory>();
-                            await using var context = factory.CreateContext(enableTracking: false);
+                            await using var context = factory.CreateContext();
 
                             var messageCount = await context.InboxMessages
                                 .CountAsync(msg => msg.DestinationClientId == E.Origin.ClientId && !msg.IsDelivered);
@@ -442,7 +433,7 @@ namespace IW4MAdmin
 
                         if (E.Origin.Level > Permission.Moderator)
                         {
-                            E.Origin.Tell(loc["SERVER_REPORT_COUNT_V2"].FormatExt(E.Owner.Reports.Count));
+                            E.Origin.Tell(string.Format(loc["SERVER_REPORT_COUNT"], E.Owner.Reports.Count));
                         }
                     }
 
@@ -482,7 +473,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,
@@ -494,8 +485,7 @@ namespace IW4MAdmin
                     };
 
                     E.Target.SetLevel(Permission.User, E.Origin);
-                    await Manager.GetPenaltyService().RemoveActivePenalties(E.Target.AliasLinkId, E.Target.NetworkId,
+                    await Manager.GetPenaltyService().RemoveActivePenalties(E.Target.AliasLinkId);
-                        E.Target.CurrentAlias?.IPAddress);
                     await Manager.GetPenaltyService().Create(unflagPenalty);
                 }
 
@@ -620,7 +610,7 @@ namespace IW4MAdmin
                     await OnClientUpdate(E.Origin);
                 }
 
-                else if (E.Type == GameEvent.EventType.Say)
+                if (E.Type == GameEvent.EventType.Say)
                 {
                     if (E.Data?.Length > 0)
                     {
@@ -650,7 +640,7 @@ namespace IW4MAdmin
                     }
                 }
 
-                else if (E.Type == GameEvent.EventType.MapChange)
+                if (E.Type == GameEvent.EventType.MapChange)
                 {
                     ServerLogger.LogInformation("New map loaded - {clientCount} active players", ClientNum);
 
@@ -691,7 +681,7 @@ namespace IW4MAdmin
                     }
                 }
 
-                else if (E.Type == GameEvent.EventType.MapEnd)
+                if (E.Type == GameEvent.EventType.MapEnd)
                 {
                     ServerLogger.LogInformation("Game ending...");
 
@@ -701,12 +691,12 @@ namespace IW4MAdmin
                     }
                 }
 
-                else if (E.Type == GameEvent.EventType.Tell)
+                if (E.Type == GameEvent.EventType.Tell)
                 {
                     await Tell(E.Message, E.Target);
                 }
 
-                else if (E.Type == GameEvent.EventType.Broadcast)
+                if (E.Type == GameEvent.EventType.Broadcast)
                 {
                     if (!Utilities.IsDevelopment && E.Data != null) // hides broadcast when in development mode
                     {
@@ -735,11 +725,11 @@ namespace IW4MAdmin
 
         private async Task OnClientUpdate(EFClient origin)
         {
-            var client = Manager.GetActiveClients().FirstOrDefault(c => c.NetworkId == origin.NetworkId);
+            var client = GetClientsAsList().FirstOrDefault(_client => _client.Equals(origin));
 
             if (client == null)
             {
-                ServerLogger.LogWarning("{Origin} expected to exist in client list for update, but they do not", origin.ToString());
+                ServerLogger.LogWarning("{origin} expected to exist in client list for update, but they do not", origin.ToString());
                 return;
             }
 
@@ -765,10 +755,10 @@ namespace IW4MAdmin
                 }
             }
 
-            else if (client.IPAddress != null && client.State == ClientState.Disconnecting ||
+            else if ((client.IPAddress != null && client.State == ClientState.Disconnecting) ||
                 client.Level == Permission.Banned)
             {
-                ServerLogger.LogWarning("{Client} state is Unknown (probably kicked), but they are still connected. trying to kick again...", origin.ToString());
+                ServerLogger.LogWarning("{client} state is Unknown (probably kicked), but they are still connected. trying to kick again...", origin.ToString());
                 await client.CanConnect(client.IPAddress, Manager.GetApplicationSettings().Configuration().EnableImplicitAccountLinking);
             }
         }
@@ -1082,26 +1072,19 @@ namespace IW4MAdmin
         {
             try
             {
-                ResolvedIpEndPoint =
+                ResolvedIpEndPoint = new IPEndPoint((await Dns.GetHostAddressesAsync(IP)).First(), Port);
-                    new IPEndPoint(
-                        (await Dns.GetHostAddressesAsync(IP)).First(address =>
-                            address.AddressFamily == AddressFamily.InterNetwork), Port);
             }
             catch (Exception ex)
             {
                 ServerLogger.LogWarning(ex, "Could not resolve hostname or IP for RCon connection {IP}:{Port}", IP, Port);
                 ResolvedIpEndPoint = new IPEndPoint(IPAddress.Parse(IP), Port);
             }
-
+            
             RconParser = Manager.AdditionalRConParsers
-                .FirstOrDefault(parser =>
+                .FirstOrDefault(_parser => _parser.Version == ServerConfig.RConParserVersion);
-                    parser.Version == ServerConfig.RConParserVersion ||
-                    parser.Name == ServerConfig.RConParserVersion);
 
             EventParser = Manager.AdditionalEventParsers
-                .FirstOrDefault(parser =>
+                .FirstOrDefault(_parser => _parser.Version == ServerConfig.EventParserVersion);
-                    parser.Version == ServerConfig.EventParserVersion ||
-                    parser.Name == ServerConfig.RConParserVersion);
 
             RconParser ??= Manager.AdditionalRConParsers[0];
             EventParser ??= Manager.AdditionalEventParsers[0];
@@ -1118,7 +1101,7 @@ namespace IW4MAdmin
                 GameName = RconParser.GameName;
             }
 
-            if (version.Value?.Length != 0)
+            if (version?.Value?.Length != 0)
             {
                 var matchedRconParser = Manager.AdditionalRConParsers.FirstOrDefault(_parser => _parser.Version == version.Value);
                 RconParser.Configuration = matchedRconParser != null ? matchedRconParser.Configuration : RconParser.Configuration;
@@ -1338,9 +1321,12 @@ namespace IW4MAdmin
         public override async Task Warn(string reason, EFClient targetClient, EFClient targetOrigin)
         {
             // ensure player gets warned if command not performed on them in game
-            var activeClient = Manager.FindActiveClient(targetClient);
+            targetClient = targetClient.ClientNumber < 0 ?
+                Manager.GetActiveClients()
+                .FirstOrDefault(c => c.ClientId == targetClient?.ClientId) ?? targetClient :
+                targetClient;
 
-            var newPenalty = new EFPenalty
+            var newPenalty = new EFPenalty()
             {
                 Type = EFPenalty.PenaltyType.Warning,
                 Expires = DateTime.UtcNow,
@@ -1350,28 +1336,31 @@ namespace IW4MAdmin
                 Link = targetClient.AliasLink
             };
 
-            ServerLogger.LogDebug("Creating warn penalty for {TargetClient}", targetClient.ToString());
+            ServerLogger.LogDebug("Creating warn penalty for {targetClient}", targetClient.ToString());
             await newPenalty.TryCreatePenalty(Manager.GetPenaltyService(), ServerLogger);
 
-            if (activeClient.IsIngame)
+            if (targetClient.IsIngame)
             {
-                if (activeClient.Warnings >= 4)
+                if (targetClient.Warnings >= 4)
                 {
-                    activeClient.Kick(loc["SERVER_WARNLIMT_REACHED"], Utilities.IW4MAdminClient(this));
+                    targetClient.Kick(loc["SERVER_WARNLIMT_REACHED"], Utilities.IW4MAdminClient(this));
                     return;
                 }
 
-                var message = loc["COMMANDS_WARNING_FORMAT_V2"]
+                // todo: move to translation sheet
-                    .FormatExt(activeClient.Warnings, activeClient.Name, reason);
+                string message = $"^1{loc["SERVER_WARNING"]} ^7[^3{targetClient.Warnings}^7]: ^3{targetClient.Name}^7, {reason}";
-                activeClient.CurrentServer.Broadcast(message);
+                targetClient.CurrentServer.Broadcast(message);
             }
         }
 
         public override async Task Kick(string reason, EFClient targetClient, EFClient originClient, EFPenalty previousPenalty)
         {
-            var activeClient = Manager.FindActiveClient(targetClient);
+            targetClient = targetClient.ClientNumber < 0 ?
+                Manager.GetActiveClients()
+                .FirstOrDefault(c => c.ClientId == targetClient?.ClientId) ?? targetClient :
+                targetClient;
 
-            var newPenalty = new EFPenalty
+            var newPenalty = new EFPenalty()
             {
                 Type = EFPenalty.PenaltyType.Kick,
                 Expires = DateTime.UtcNow,
@@ -1381,115 +1370,132 @@ namespace IW4MAdmin
                 Link = targetClient.AliasLink
             };
 
-            ServerLogger.LogDebug("Creating kick penalty for {TargetClient}", targetClient.ToString());
+            ServerLogger.LogDebug("Creating kick penalty for {targetClient}", targetClient.ToString());
             await newPenalty.TryCreatePenalty(Manager.GetPenaltyService(), ServerLogger);
 
-            if (activeClient.IsIngame)
+            if (targetClient.IsIngame)
             {
-                var gameEvent = new GameEvent
+                var e = new GameEvent()
                 {
                     Type = GameEvent.EventType.PreDisconnect,
-                    Origin = activeClient,
+                    Origin = targetClient,
                     Owner = this
                 };
 
-                Manager.AddEvent(gameEvent);
+                Manager.AddEvent(e);
+
+                var temporalClientId = targetClient.GetAdditionalProperty<string>("ConnectionClientId");
+                var parsedClientId = string.IsNullOrEmpty(temporalClientId) ? (int?)null : int.Parse(temporalClientId);
+                var clientNumber = parsedClientId ?? targetClient.ClientNumber;
 
                 var formattedKick = string.Format(RconParser.Configuration.CommandPrefixes.Kick, 
-                    activeClient.TemporalClientNumber, 
+                    clientNumber, 
                     _messageFormatter.BuildFormattedMessage(RconParser.Configuration, 
                         newPenalty, 
                         previousPenalty));
-                ServerLogger.LogDebug("Executing tempban kick command for {ActiveClient}", activeClient.ToString());
+                await targetClient.CurrentServer.ExecuteCommandAsync(formattedKick);
-                await activeClient.CurrentServer.ExecuteCommandAsync(formattedKick);
             }
         }
 
-        public override async Task TempBan(string reason, TimeSpan length, EFClient targetClient, EFClient originClient)
+        public override async Task TempBan(string Reason, TimeSpan length, EFClient targetClient, EFClient originClient)
         {
             // ensure player gets kicked if command not performed on them in the same server
-            var activeClient = Manager.FindActiveClient(targetClient);
+            targetClient = targetClient.ClientNumber < 0 ?
+                Manager.GetActiveClients()
+                .FirstOrDefault(c => c.ClientId == targetClient?.ClientId) ?? targetClient :
+                targetClient;
 
-            var newPenalty = new EFPenalty
+            var newPenalty = new EFPenalty()
             {
                 Type = EFPenalty.PenaltyType.TempBan,
                 Expires = DateTime.UtcNow + length,
                 Offender = targetClient,
-                Offense = reason,
+                Offense = Reason,
                 Punisher = originClient,
                 Link = targetClient.AliasLink
             };
 
-            ServerLogger.LogDebug("Creating tempban penalty for {TargetClient}", targetClient.ToString());
+            ServerLogger.LogDebug("Creating tempban penalty for {targetClient}", targetClient.ToString());
             await newPenalty.TryCreatePenalty(Manager.GetPenaltyService(), ServerLogger);
 
-            if (activeClient.IsIngame)
+            if (targetClient.IsIngame)
             {
+                var temporalClientId = targetClient.GetAdditionalProperty<string>("ConnectionClientId");
+                var parsedClientId = string.IsNullOrEmpty(temporalClientId) ? (int?)null : int.Parse(temporalClientId);
+                var clientNumber = parsedClientId ?? targetClient.ClientNumber;
+                
                 var formattedKick = string.Format(RconParser.Configuration.CommandPrefixes.Kick,
-                    activeClient.TemporalClientNumber,
+                    clientNumber,
                     _messageFormatter.BuildFormattedMessage(RconParser.Configuration, newPenalty));
-                ServerLogger.LogDebug("Executing tempban kick command for {ActiveClient}", activeClient.ToString());
+                ServerLogger.LogDebug("Executing tempban kick command for {targetClient}", targetClient.ToString());
-                await activeClient.CurrentServer.ExecuteCommandAsync(formattedKick);
+                await targetClient.CurrentServer.ExecuteCommandAsync(formattedKick);
             }
         }
 
         public override async Task Ban(string reason, EFClient targetClient, EFClient originClient, bool isEvade = false)
         {
             // ensure player gets kicked if command not performed on them in the same server
-            var activeClient = Manager.FindActiveClient(targetClient);
+            targetClient = targetClient.ClientNumber < 0 ?
+                Manager.GetActiveClients()
+                .FirstOrDefault(c => c.ClientId == targetClient?.ClientId) ?? targetClient :
+                targetClient;
 
-            var newPenalty = new EFPenalty
+            EFPenalty newPenalty = new EFPenalty()
             {
                 Type = EFPenalty.PenaltyType.Ban,
                 Expires = null,
                 Offender = targetClient,
                 Offense = reason,
                 Punisher = originClient,
+                Link = targetClient.AliasLink,
                 IsEvadedOffense = isEvade
             };
 
-            ServerLogger.LogDebug("Creating ban penalty for {TargetClient}", targetClient.ToString());
+            ServerLogger.LogDebug("Creating ban penalty for {targetClient}", targetClient.ToString());
-            activeClient.SetLevel(Permission.Banned, originClient);
+            targetClient.SetLevel(Permission.Banned, originClient);
             await newPenalty.TryCreatePenalty(Manager.GetPenaltyService(), ServerLogger);
 
-            if (activeClient.IsIngame)
+            if (targetClient.IsIngame)
             {
-                ServerLogger.LogDebug("Attempting to kicking newly banned client {ActiveClient}", activeClient.ToString());
+                ServerLogger.LogDebug("Attempting to kicking newly banned client {targetClient}", targetClient.ToString());
+                
+                var temporalClientId = targetClient.GetAdditionalProperty<string>("ConnectionClientId");
+                var parsedClientId = string.IsNullOrEmpty(temporalClientId) ? (int?)null : int.Parse(temporalClientId);
+                var clientNumber = parsedClientId ?? targetClient.ClientNumber;
                 
                 var formattedString = string.Format(RconParser.Configuration.CommandPrefixes.Kick, 
-                    activeClient.TemporalClientNumber, 
+                    clientNumber, 
                     _messageFormatter.BuildFormattedMessage(RconParser.Configuration, newPenalty));
-                await activeClient.CurrentServer.ExecuteCommandAsync(formattedString);
+                await targetClient.CurrentServer.ExecuteCommandAsync(formattedString);
             }
         }
 
-        public override async Task Unban(string reason, EFClient targetClient, EFClient originClient)
+        override public async Task Unban(string reason, EFClient Target, EFClient Origin)
         {
-            var unbanPenalty = new EFPenalty
+            var unbanPenalty = new EFPenalty()
             {
                 Type = EFPenalty.PenaltyType.Unban,
                 Expires = DateTime.Now,
-                Offender = targetClient,
+                Offender = Target,
                 Offense = reason,
-                Punisher = originClient,
+                Punisher = Origin,
                 When = DateTime.UtcNow,
                 Active = true,
-                Link = targetClient.AliasLink
+                Link = Target.AliasLink
             };
 
-            ServerLogger.LogDebug("Creating unban penalty for {targetClient}", targetClient.ToString());
+            ServerLogger.LogDebug("Creating unban penalty for {targetClient}", Target.ToString());
-            targetClient.SetLevel(Permission.User, originClient);
+            Target.SetLevel(Permission.User, Origin);
-            await Manager.GetPenaltyService().RemoveActivePenalties(targetClient.AliasLink.AliasLinkId,
+            await Manager.GetPenaltyService().RemoveActivePenalties(Target.AliasLink.AliasLinkId);
-                targetClient.NetworkId, targetClient.CurrentAlias?.IPAddress);
             await Manager.GetPenaltyService().Create(unbanPenalty);
         }
 
-        public override void InitializeTokens()
+        override public void InitializeTokens()
         {
             Manager.GetMessageTokens().Add(new MessageToken("TOTALPLAYERS", (Server s) => Task.Run(async () => (await Manager.GetClientService().GetTotalClientsAsync()).ToString())));
             Manager.GetMessageTokens().Add(new MessageToken("VERSION", (Server s) => Task.FromResult(Application.Program.Version.ToString())));
             Manager.GetMessageTokens().Add(new MessageToken("NEXTMAP", (Server s) => SharedLibraryCore.Commands.NextMapCommand.GetNextMap(s, _translationLookup)));
-            Manager.GetMessageTokens().Add(new MessageToken("ADMINS", (Server s) => Task.FromResult(ListAdminsCommand.OnlineAdmins(s, _translationLookup))));
+            Manager.GetMessageTokens().Add(new MessageToken("ADMINS", (Server s) => Task.FromResult(SharedLibraryCore.Commands.ListAdminsCommand.OnlineAdmins(s, _translationLookup))));
         }
     }
 }

Application/Main.cs

@@ -18,9 +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;
 using System.Threading;
 using System.Threading.Tasks;
@@ -35,17 +33,16 @@ using IW4MAdmin.Plugins.Stats.Client.Abstractions;
 using IW4MAdmin.Plugins.Stats.Client;
 using Stats.Client.Abstractions;
 using Stats.Client;
-using Stats.Config;
 using Stats.Helpers;
 
 namespace IW4MAdmin.Application
 {
     public class Program
     {
-        public static BuildNumber Version { get; } = BuildNumber.Parse(Utilities.GetVersionAsString());
+        public static BuildNumber Version { get; private set; } = BuildNumber.Parse(Utilities.GetVersionAsString());
-        private static ApplicationManager _serverManager;
+        public static ApplicationManager ServerManager;
-        private static Task _applicationTask;
+        private static Task ApplicationTask;
-        private static ServiceProvider _serviceProvider;
+        private static ServiceProvider serviceProvider;
 
         /// <summary>
         /// entrypoint of the application
@@ -58,7 +55,7 @@ namespace IW4MAdmin.Application
             Console.OutputEncoding = Encoding.UTF8;
             Console.ForegroundColor = ConsoleColor.Gray;
 
-            Console.CancelKeyPress += OnCancelKey;
+            Console.CancelKeyPress += new ConsoleCancelEventHandler(OnCancelKey);
 
             Console.WriteLine("=====================================================");
             Console.WriteLine(" IW4MAdmin");
@@ -77,10 +74,10 @@ namespace IW4MAdmin.Application
         /// <param name="e"></param>
         private static async void OnCancelKey(object sender, ConsoleCancelEventArgs e)
         {
-            _serverManager?.Stop();
+            ServerManager?.Stop();
-            if (_applicationTask != null)
+            if (ApplicationTask != null)
             {
-                await _applicationTask;
+                await ApplicationTask;
             }
         }
 
@@ -94,8 +91,9 @@ namespace IW4MAdmin.Application
             ITranslationLookup translationLookup = null;
             var logger = BuildDefaultLogger<Program>(new ApplicationConfiguration());
             Utilities.DefaultLogger = logger;
-            logger.LogInformation("Begin IW4MAdmin startup. Version is {Version} {@Args}", Version, args);
+            IServiceCollection services = null;
-            
+            logger.LogInformation("Begin IW4MAdmin startup. Version is {version} {@args}", Version, args);
+
             try
             {
                 // do any needed housekeeping file/folder migrations
@@ -103,30 +101,22 @@ namespace IW4MAdmin.Application
                 ConfigurationMigration.CheckDirectories();
                 ConfigurationMigration.RemoveObsoletePlugins20210322();
                 logger.LogDebug("Configuring services...");
-                var services = await ConfigureServices(args);
+                services = ConfigureServices(args);
-                _serviceProvider = services.BuildServiceProvider();
+                serviceProvider = services.BuildServiceProvider();
-                var versionChecker = _serviceProvider.GetRequiredService<IMasterCommunication>();
+                var versionChecker = serviceProvider.GetRequiredService<IMasterCommunication>();
-                _serverManager = (ApplicationManager) _serviceProvider.GetRequiredService<IManager>();
+                ServerManager = (ApplicationManager) serviceProvider.GetRequiredService<IManager>();
-                translationLookup = _serviceProvider.GetRequiredService<ITranslationLookup>();
+                translationLookup = serviceProvider.GetRequiredService<ITranslationLookup>();
 
-                _applicationTask = RunApplicationTasksAsync(logger, services);
+                await versionChecker.CheckVersion();
-                var tasks = new[]
+                await ServerManager.Init();
-                {
-                    versionChecker.CheckVersion(),
-                    _applicationTask
-                };
-
-                await _serverManager.Init();
-
-                await Task.WhenAll(tasks);
             }
 
             catch (Exception e)
             {
-                var failMessage = translationLookup == null
+                string failMessage = translationLookup == null
                     ? "Failed to initialize IW4MAdmin"
                     : translationLookup["MANAGER_INIT_FAIL"];
-                var exitMessage = translationLookup == null
+                string exitMessage = translationLookup == null
                     ? "Press enter to exit..."
                     : translationLookup["MANAGER_EXIT"];
 
@@ -140,10 +130,13 @@ namespace IW4MAdmin.Application
 
                 if (e is ConfigurationException configException)
                 {
-                    Console.WriteLine("{{fileName}} contains an error."
+                    if (translationLookup != null)
-                        .FormatExt(Path.GetFileName(configException.ConfigurationFileName)));
+                    {
+                        Console.WriteLine(translationLookup[configException.Message]
+                            .FormatExt(configException.ConfigurationFileName));
+                    }
 
-                    foreach (var error in configException.Errors)
+                    foreach (string error in configException.Errors)
                     {
                         Console.WriteLine(error);
                     }
@@ -159,12 +152,27 @@ namespace IW4MAdmin.Application
                 return;
             }
 
-            if (_serverManager.IsRestartRequested)
+            try
+            {
+                ApplicationTask = RunApplicationTasksAsync(logger, services);
+                await ApplicationTask;
+            }
+
+            catch (Exception e)
+            {
+                logger.LogCritical(e, "Failed to launch IW4MAdmin");
+                string failMessage = translationLookup == null
+                    ? "Failed to launch IW4MAdmin"
+                    : translationLookup["MANAGER_INIT_FAIL"];
+                Console.WriteLine($"{failMessage}: {e.GetExceptionInfo()}");
+            }
+
+            if (ServerManager.IsRestartRequested)
             {
                 goto restart;
             }
 
-            await _serviceProvider.DisposeAsync();
+            serviceProvider.Dispose();
         }
 
         /// <summary>
@@ -173,26 +181,24 @@ namespace IW4MAdmin.Application
         /// <returns></returns>
         private static async Task RunApplicationTasksAsync(ILogger logger, IServiceCollection services)
         {
-            var webfrontTask = _serverManager.GetApplicationSettings().Configuration().EnableWebFront
+            var webfrontTask = ServerManager.GetApplicationSettings().Configuration().EnableWebFront
-                ? WebfrontCore.Program.Init(_serverManager, _serviceProvider, services, _serverManager.CancellationToken)
+                ? WebfrontCore.Program.Init(ServerManager, serviceProvider, services, ServerManager.CancellationToken)
                 : Task.CompletedTask;
 
-            var collectionService = _serviceProvider.GetRequiredService<IServerDataCollector>();
+            var collectionService = serviceProvider.GetRequiredService<IServerDataCollector>();
 
             // we want to run this one on a manual thread instead of letting the thread pool handle it,
             // because we can't exit early from waiting on console input, and it prevents us from restarting
-            async void ReadInput() => await ReadConsoleInput(logger);
+            var inputThread = new Thread(async () => await ReadConsoleInput(logger));
-
-            var inputThread = new Thread(ReadInput);
             inputThread.Start();
 
             var tasks = new[]
             {
+                ServerManager.Start(),
                 webfrontTask,
-                _serverManager.Start(),
+                serviceProvider.GetRequiredService<IMasterCommunication>()
-                _serviceProvider.GetRequiredService<IMasterCommunication>()
+                    .RunUploadStatus(ServerManager.CancellationToken),
-                    .RunUploadStatus(_serverManager.CancellationToken),
+                collectionService.BeginCollectionAsync(cancellationToken: ServerManager.CancellationToken)
-                collectionService.BeginCollectionAsync(cancellationToken: _serverManager.CancellationToken)
             };
 
             logger.LogDebug("Starting webfront and input tasks");
@@ -201,7 +207,8 @@ namespace IW4MAdmin.Application
             logger.LogInformation("Shutdown completed successfully");
             Console.WriteLine(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_SHUTDOWN_SUCCESS"]);
         }
-        
+
+
         /// <summary>
         /// reads input from the console and executes entered commands on the default server
         /// </summary>
@@ -214,41 +221,32 @@ namespace IW4MAdmin.Application
                 return;
             }
 
-            EFClient origin = null;
+            string lastCommand;
+            var Origin = Utilities.IW4MAdminClient(ServerManager.Servers[0]);
 
             try
             {
-                while (!_serverManager.CancellationToken.IsCancellationRequested)
+                while (!ServerManager.CancellationToken.IsCancellationRequested)
                 {
-                    if (!_serverManager.IsInitialized)
+                    lastCommand = await Console.In.ReadLineAsync();
+
+                    if (lastCommand?.Length > 0)
                     {
-                        await Task.Delay(1000);
+                        if (lastCommand?.Length > 0)
-                        continue;
+                        {
+                            GameEvent E = new GameEvent()
+                            {
+                                Type = GameEvent.EventType.Command,
+                                Data = lastCommand,
+                                Origin = Origin,
+                                Owner = ServerManager.Servers[0]
+                            };
+
+                            ServerManager.AddEvent(E);
+                            await E.WaitAsync(Utilities.DefaultCommandTimeout, ServerManager.CancellationToken);
+                            Console.Write('>');
+                        }
                     }
-                    
-                    var lastCommand = await Console.In.ReadLineAsync();
-
-                    if (lastCommand == null)
-                    {
-                        continue;
-                    }
-
-                    if (!lastCommand.Any())
-                    {
-                        continue;
-                    }
-
-                    var gameEvent = new GameEvent
-                    {
-                        Type = GameEvent.EventType.Command,
-                        Data = lastCommand,
-                        Origin = origin ??= Utilities.IW4MAdminClient(_serverManager.Servers.FirstOrDefault()),
-                        Owner = _serverManager.Servers[0]
-                    };
-
-                    _serverManager.AddEvent(gameEvent);
-                    await gameEvent.WaitAsync(Utilities.DefaultCommandTimeout, _serverManager.CancellationToken);
-                    Console.Write('>');
                 }
             }
             catch (OperationCanceledException)
@@ -277,9 +275,9 @@ 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"))
-                .Where(command => command.BaseType == typeof(Command)))
+                .Where(_command => _command.BaseType == typeof(Command)))
             {
-                defaultLogger.LogDebug("Registered native command type {Name}", commandType.Name);
+                defaultLogger.LogDebug("Registered native command type {name}", commandType.Name);
                 serviceCollection.AddSingleton(typeof(IManagerCommand), commandType);
             }
 
@@ -287,40 +285,40 @@ namespace IW4MAdmin.Application
             var (plugins, commands, configurations) = pluginImporter.DiscoverAssemblyPluginImplementations();
             foreach (var pluginType in plugins)
             {
-                defaultLogger.LogDebug("Registered plugin type {Name}", pluginType.FullName);
+                defaultLogger.LogDebug("Registered plugin type {name}", pluginType.FullName);
                 serviceCollection.AddSingleton(typeof(IPlugin), pluginType);
             }
 
             // register the plugin commands
             foreach (var commandType in commands)
             {
-                defaultLogger.LogDebug("Registered plugin command type {Name}", commandType.FullName);
+                defaultLogger.LogDebug("Registered plugin command type {name}", commandType.FullName);
                 serviceCollection.AddSingleton(typeof(IManagerCommand), commandType);
             }
 
             foreach (var configurationType in configurations)
             {
-                defaultLogger.LogDebug("Registered plugin config type {Name}", configurationType.Name);
+                defaultLogger.LogDebug("Registered plugin config type {name}", configurationType.Name);
                 var configInstance = (IBaseConfiguration) Activator.CreateInstance(configurationType);
                 var handlerType = typeof(BaseConfigurationHandler<>).MakeGenericType(configurationType);
-                var handlerInstance = Activator.CreateInstance(handlerType, configInstance.Name());
+                var handlerInstance = Activator.CreateInstance(handlerType, new[] {configInstance.Name()});
                 var genericInterfaceType = typeof(IConfigurationHandler<>).MakeGenericType(configurationType);
                 
                 serviceCollection.AddSingleton(genericInterfaceType, handlerInstance);
             }
 
             // register any script plugins
-            foreach (var plugin in pluginImporter.DiscoverScriptPlugins())
+            foreach (var scriptPlugin in pluginImporter.DiscoverScriptPlugins())
             {
-                serviceCollection.AddSingleton(plugin);
+                serviceCollection.AddSingleton(scriptPlugin);
             }
 
             // register any eventable types
             foreach (var assemblyType in typeof(Program).Assembly.GetTypes()
-                .Where(asmType => typeof(IRegisterEvent).IsAssignableFrom(asmType))
+                .Where(_asmType => typeof(IRegisterEvent).IsAssignableFrom(_asmType))
-                .Union(plugins.SelectMany(asm => asm.Assembly.GetTypes())
+                .Union(plugins.SelectMany(_asm => _asm.Assembly.GetTypes())
                     .Distinct()
-                    .Where(asmType => typeof(IRegisterEvent).IsAssignableFrom(asmType))))
+                    .Where(_asmType => typeof(IRegisterEvent).IsAssignableFrom(_asmType))))
             {
                 var instance = Activator.CreateInstance(assemblyType) as IRegisterEvent;
                 serviceCollection.AddSingleton(instance);
@@ -333,39 +331,25 @@ namespace IW4MAdmin.Application
         /// <summary>
         /// Configures the dependency injection services
         /// </summary>
-        private static async Task<IServiceCollection> ConfigureServices(string[] args)
+        private static IServiceCollection ConfigureServices(string[] args)
         {
-            // todo: this is a quick fix
-            AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
-
             // setup the static resources (config/master api/translations)
             var serviceCollection = new ServiceCollection();
             var appConfigHandler = new BaseConfigurationHandler<ApplicationConfiguration>("IW4MAdminSettings");
-            await appConfigHandler.BuildAsync();
             var defaultConfigHandler = new BaseConfigurationHandler<DefaultSettings>("DefaultSettings");
-            await defaultConfigHandler.BuildAsync();
-            var commandConfigHandler = new BaseConfigurationHandler<CommandConfiguration>("CommandConfiguration");
-            await commandConfigHandler.BuildAsync();
-            var statsCommandHandler = new BaseConfigurationHandler<StatsConfiguration>();
-            await statsCommandHandler.BuildAsync();
             var defaultConfig = defaultConfigHandler.Configuration();
             var appConfig = appConfigHandler.Configuration();
             var masterUri = Utilities.IsDevelopment
                 ? new Uri("http://127.0.0.1:8080")
                 : appConfig?.MasterUrl ?? new ApplicationConfiguration().MasterUrl;
-            var httpClient = new HttpClient
+            var masterRestClient = RestClient.For<IMasterApi>(masterUri);
-            {
-                BaseAddress = masterUri,
-                Timeout = TimeSpan.FromSeconds(15)
-            };
-            var masterRestClient = RestClient.For<IMasterApi>(httpClient);
             var translationLookup = Configure.Initialize(Utilities.DefaultLogger, masterRestClient, appConfig);
 
             if (appConfig == null)
             {
                 appConfig = (ApplicationConfiguration) new ApplicationConfiguration().Generate();
                 appConfigHandler.Set(appConfig);
-                await appConfigHandler.Save();
+                appConfigHandler.Save();
             }
 
             // register override level names
@@ -383,14 +367,15 @@ namespace IW4MAdmin.Application
             serviceCollection
                 .AddBaseLogger(appConfig)
                 .AddSingleton(defaultConfig)
-                .AddSingleton<IServiceCollection>(serviceCollection)
+                .AddSingleton<IServiceCollection>(_serviceProvider => serviceCollection)
                 .AddSingleton<IConfigurationHandler<DefaultSettings>, BaseConfigurationHandler<DefaultSettings>>()
                 .AddSingleton((IConfigurationHandler<ApplicationConfiguration>) appConfigHandler)
-                .AddSingleton<IConfigurationHandler<CommandConfiguration>>(commandConfigHandler)
+                .AddSingleton(
+                    new BaseConfigurationHandler<CommandConfiguration>("CommandConfiguration") as
+                        IConfigurationHandler<CommandConfiguration>)
                 .AddSingleton(appConfig)
-                .AddSingleton(statsCommandHandler.Configuration() ?? new StatsConfiguration())
+                .AddSingleton(_serviceProvider =>
-                .AddSingleton(serviceProvider =>
+                    _serviceProvider.GetRequiredService<IConfigurationHandler<CommandConfiguration>>()
-                    serviceProvider.GetRequiredService<IConfigurationHandler<CommandConfiguration>>()
                         .Configuration() ?? new CommandConfiguration())
                 .AddSingleton<IPluginImporter, PluginImporter>()
                 .AddSingleton<IMiddlewareActionHandler, MiddlewareActionHandler>()
@@ -417,14 +402,11 @@ 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>()
                 .AddSingleton<IManager, ApplicationManager>()
-#pragma warning disable CS0612
                 .AddSingleton<SharedLibraryCore.Interfaces.ILogger, Logger>()
-#pragma warning restore CS0612
                 .AddSingleton<IClientNoticeMessageFormatter, ClientNoticeMessageFormatter>()
                 .AddSingleton<IClientStatisticCalculator, HitCalculator>()
                 .AddSingleton<IServerDistributionCalculator, ServerDistributionCalculator>()
@@ -435,7 +417,6 @@ namespace IW4MAdmin.Application
                 .AddSingleton<IServerDataViewer, ServerDataViewer>()
                 .AddSingleton<IServerDataCollector, ServerDataCollector>()
                 .AddSingleton<IEventPublisher, EventPublisher>()
-                .AddTransient<IScriptPluginTimerHelper, ScriptPluginTimerHelper>()
                 .AddSingleton(translationLookup)
                 .AddDatabaseContextOptions(appConfig);
 
@@ -462,4 +443,4 @@ namespace IW4MAdmin.Application
             return collection.GetRequiredService<ILogger<T>>();
         }
     }
-}
+}

Application/Meta/MetaRegistration.cs

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

Application/Meta/PermissionLevelChangedResourceQueryHelper.cs

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

Application/Meta/ReceivedPenaltyResourceQueryHelper.cs

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

Application/Misc/BaseConfigurationHandler.cs

@@ -1,13 +1,10 @@
-using SharedLibraryCore;
+using Newtonsoft.Json;
+using SharedLibraryCore;
 using SharedLibraryCore.Exceptions;
 using SharedLibraryCore.Interfaces;
 using System;
 using System.IO;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using System.Threading;
 using System.Threading.Tasks;
-using JsonSerializer = System.Text.Json.JsonSerializer;
 
 namespace IW4MAdmin.Application.Misc
 {
@@ -17,39 +14,27 @@ namespace IW4MAdmin.Application.Misc
     /// <typeparam name="T">base configuration type</typeparam>
     public class BaseConfigurationHandler<T> : IConfigurationHandler<T> where T : IBaseConfiguration
     {
-        private T _configuration;
+        T _configuration;
-        private readonly SemaphoreSlim _onSaving;
-        private readonly JsonSerializerOptions _serializerOptions;
 
-
+        public BaseConfigurationHandler(string fn)
-        public BaseConfigurationHandler(string fileName)
         {
-            _serializerOptions = new JsonSerializerOptions
+            FileName = Path.Join(Utilities.OperatingDirectory, "Configuration", $"{fn}.json");
-            {
+            Build();
-                WriteIndented = true,
-            };
-            _serializerOptions.Converters.Add(new JsonStringEnumConverter());
-            _onSaving = new SemaphoreSlim(1, 1);
-            FileName = Path.Join(Utilities.OperatingDirectory, "Configuration", $"{fileName}.json");
         }
 
         public BaseConfigurationHandler() : this(typeof(T).Name)
         {
-        }
+            
-
-        ~BaseConfigurationHandler()
-        {
-            _onSaving.Dispose();
         }
 
         public string FileName { get; }
 
-        public async Task BuildAsync()
+        public void Build()
         {
             try
             {
-                await using var fileStream = File.OpenRead(FileName);
+                var configContent = File.ReadAllText(FileName);
-                _configuration = await JsonSerializer.DeserializeAsync<T>(fileStream, _serializerOptions);
+                _configuration = JsonConvert.DeserializeObject<T>(configContent);
             }
 
             catch (FileNotFoundException)
@@ -59,7 +44,7 @@ namespace IW4MAdmin.Application.Misc
 
             catch (Exception e)
             {
-                throw new ConfigurationException("Could not load configuration")
+                throw new ConfigurationException("MANAGER_CONFIGURATION_ERROR")
                 {
                     Errors = new[] { e.Message },
                     ConfigurationFileName = FileName
@@ -67,23 +52,16 @@ namespace IW4MAdmin.Application.Misc
             }
         }
 
-        public async Task Save()
+        public Task Save()
         {
-            try
+            var settings = new JsonSerializerSettings()
             {
-                await _onSaving.WaitAsync();
+                Formatting = Formatting.Indented
+            };
+            settings.Converters.Add(new Newtonsoft.Json.Converters.StringEnumConverter());
 
-                await using var fileStream = File.Create(FileName);
+            var appConfigJSON = JsonConvert.SerializeObject(_configuration, settings);
-                await JsonSerializer.SerializeAsync(fileStream, _configuration, _serializerOptions);
+            return File.WriteAllTextAsync(FileName, appConfigJSON);
-            }
-
-            finally
-            {
-                if (_onSaving.CurrentCount == 0)
-                {
-                    _onSaving.Release(1);
-                }
-            }
         }
 
         public T Configuration()

Application/Misc/MasterCommunication.cs

@@ -26,8 +26,7 @@ namespace IW4MAdmin.Application.Misc
         private readonly ApplicationConfiguration _appConfig;
         private readonly BuildNumber _fallbackVersion = BuildNumber.Parse("99.99.99.99");
         private readonly int _apiVersion = 1;
-        private bool _firstHeartBeat = true;
+        private bool firstHeartBeat = true;
-        private static readonly TimeSpan Interval = TimeSpan.FromSeconds(30);
 
         public MasterCommunication(ILogger<MasterCommunication> logger, ApplicationConfiguration appConfig, ITranslationLookup translationLookup, IMasterApi apiInstance, IManager manager)
         {
@@ -94,24 +93,53 @@ namespace IW4MAdmin.Application.Misc
 
         public async Task RunUploadStatus(CancellationToken token)
         {
+            // todo: clean up this logic
+            bool connected;
+
             while (!token.IsCancellationRequested)
             {
                 try
                 {
-                    if (_manager.IsRunning)
+                    await UploadStatus();
+                }
+
+                catch (System.Net.Http.HttpRequestException e)
+                {
+                    _logger.LogWarning(e, "Could not send heartbeat");
+                }
+
+                catch (AggregateException e)
+                {
+                    _logger.LogWarning(e, "Could not send heartbeat");
+                    var exceptions = e.InnerExceptions.Where(ex => ex.GetType() == typeof(ApiException));
+
+                    foreach (var ex in exceptions)
                     {
-                        await UploadStatus();
+                        if (((ApiException)ex).StatusCode == System.Net.HttpStatusCode.Unauthorized)
+                        {
+                            connected = false;
+                        }
                     }
                 }
 
-                catch (Exception ex)
+                catch (ApiException e)
                 {
-                    _logger.LogWarning(ex, "Could not send heartbeat");
+                    _logger.LogWarning(e, "Could not send heartbeat");
+                    if (e.StatusCode == System.Net.HttpStatusCode.Unauthorized)
+                    {
+                        connected = false;
+                    }
                 }
 
+                catch (Exception e)
+                {
+                    _logger.LogWarning(e, "Could not send heartbeat");
+                }
+
+
                 try
                 {
-                    await Task.Delay(Interval, token);
+                    await Task.Delay(30000, token);
                 }
 
                 catch
@@ -123,7 +151,7 @@ namespace IW4MAdmin.Application.Misc
 
         private async Task UploadStatus()
         {
-            if (_firstHeartBeat)
+            if (firstHeartBeat)
             {
                 var token = await _apiInstance.Authenticate(new AuthenticationId
                 {
@@ -157,7 +185,7 @@ namespace IW4MAdmin.Application.Misc
 
             Response<ResultMessage> response = null;
 
-            if (_firstHeartBeat)
+            if (firstHeartBeat)
             {
                 response = await _apiInstance.AddInstance(instance);
             }
@@ -165,7 +193,7 @@ namespace IW4MAdmin.Application.Misc
             else
             {
                 response = await _apiInstance.UpdateInstance(instance.Id, instance);
-                _firstHeartBeat = false;
+                firstHeartBeat = false;
             }
 
             if (response.ResponseMessage.StatusCode != System.Net.HttpStatusCode.OK)

Application/Misc/MetaService.cs

@@ -68,29 +68,6 @@ namespace IW4MAdmin.Application.Misc
             await ctx.SaveChangesAsync();
         }
 
-        public async Task SetPersistentMeta(string metaKey, string metaValue, int clientId)
-        {
-            await AddPersistentMeta(metaKey, metaValue, new EFClient { ClientId = clientId });
-        }
-
-        public async Task IncrementPersistentMeta(string metaKey, int incrementAmount, int clientId)
-        {
-            var existingMeta = await GetPersistentMeta(metaKey, new EFClient { ClientId = clientId });
-            
-            if (!long.TryParse(existingMeta?.Value ?? "0", out var existingValue))
-            {
-                existingValue = 0;
-            }
-
-            var newValue = existingValue + incrementAmount;
-            await SetPersistentMeta(metaKey, newValue.ToString(), clientId);
-        }
-
-        public async Task DecrementPersistentMeta(string metaKey, int decrementAmount, int clientId)
-        {
-            await IncrementPersistentMeta(metaKey, -decrementAmount, clientId);
-        }
-
         public async Task AddPersistentMeta(string metaKey, string metaValue)
         {
             await using var ctx = _contextFactory.CreateContext();
@@ -230,30 +207,42 @@ namespace IW4MAdmin.Application.Misc
 
         public async Task<IEnumerable<IClientMeta>> GetRuntimeMeta(ClientPaginationRequest request)
         {
-            var metas = await Task.WhenAll(_metaActions.Where(kvp => kvp.Key != MetaType.Information)
+            var meta = new List<IClientMeta>();
-                .Select(async kvp => await kvp.Value[0](request)));
 
-            return metas.SelectMany(m => (IEnumerable<IClientMeta>)m)
+            foreach (var (type, actions) in _metaActions)
-                .OrderByDescending(m => m.When)
+            {
+                // information is not listed chronologically
+                if (type != MetaType.Information)
+                {
+                    var metaItems = await actions[0](request);
+                    meta.AddRange(metaItems);
+                }
+            }
+
+            return meta.OrderByDescending(_meta => _meta.When)
                 .Take(request.Count)
                 .ToList();
         }
 
         public async Task<IEnumerable<T>> GetRuntimeMeta<T>(ClientPaginationRequest request, MetaType metaType) where T : IClientMeta
         {
+            IEnumerable<T> meta;
             if (metaType == MetaType.Information)
             {
                 var allMeta = new List<T>();
 
-                var completedMeta = await Task.WhenAll(_metaActions[metaType].Select(async individualMetaRegistration =>
+                foreach (var individualMetaRegistration in _metaActions[metaType])
-                    (IEnumerable<T>)await individualMetaRegistration(request)));
+                {
-                
+                    allMeta.AddRange(await individualMetaRegistration(request));
-                allMeta.AddRange(completedMeta.SelectMany(meta => meta));
+                }
-                
+
                 return ProcessInformationMeta(allMeta);
             }
 
-            var meta = await _metaActions[metaType][0](request) as IEnumerable<T>;
+            else
+            {
+                meta = await _metaActions[metaType][0](request) as IEnumerable<T>;
+            }
 
             return meta;
         }

Application/Misc/PluginImporter.cs

@@ -6,7 +6,6 @@ using SharedLibraryCore.Interfaces;
 using System.Linq;
 using SharedLibraryCore;
 using IW4MAdmin.Application.API.Master;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using SharedLibraryCore.Configuration;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
@@ -40,23 +39,24 @@ namespace IW4MAdmin.Application.Misc
         /// <returns></returns>
         public IEnumerable<IPlugin> DiscoverScriptPlugins()
         {
-            var pluginDir = $"{Utilities.OperatingDirectory}{PLUGIN_DIR}{Path.DirectorySeparatorChar}";
+            string pluginDir = $"{Utilities.OperatingDirectory}{PLUGIN_DIR}{Path.DirectorySeparatorChar}";
 
-            if (!Directory.Exists(pluginDir))
+            if (Directory.Exists(pluginDir))
             {
-                return Enumerable.Empty<IPlugin>();
+                var scriptPluginFiles = Directory.GetFiles(pluginDir, "*.js").AsEnumerable().Union(GetRemoteScripts());
+
+                _logger.LogDebug("Discovered {count} potential script plugins", scriptPluginFiles.Count());
+
+                if (scriptPluginFiles.Count() > 0)
+                {
+                    foreach (string fileName in scriptPluginFiles)
+                    {
+                        _logger.LogDebug("Discovered script plugin {fileName}", fileName);
+                        var plugin = new ScriptPlugin(_logger, fileName);
+                        yield return plugin;
+                    }
+                }
             }
-
-            var scriptPluginFiles =
-                Directory.GetFiles(pluginDir, "*.js").AsEnumerable().Union(GetRemoteScripts()).ToList();
-
-            _logger.LogDebug("Discovered {count} potential script plugins", scriptPluginFiles.Count);
-
-            return scriptPluginFiles.Select(fileName =>
-            {
-                _logger.LogDebug("Discovered script plugin {fileName}", fileName);
-                return new ScriptPlugin(_logger, fileName);
-            }).ToList();
         }
 
         /// <summary>
@@ -83,47 +83,19 @@ namespace IW4MAdmin.Application.Misc
                         .GroupBy(_assembly => _assembly.FullName).Select(_assembly => _assembly.OrderByDescending(_assembly => _assembly.GetName().Version).First());
 
                     pluginTypes = assemblies
-                        .SelectMany(_asm =>
+                        .SelectMany(_asm => _asm.GetTypes())
-                        {
-                            try
-                            {
-                                return _asm.GetTypes();
-                            }
-                            catch
-                            {
-                                return Enumerable.Empty<Type>();
-                            }
-                        })
                         .Where(_assemblyType => _assemblyType.GetInterface(nameof(IPlugin), false) != null);
 
                     _logger.LogDebug("Discovered {count} plugin implementations", pluginTypes.Count());
 
                     commandTypes = assemblies
-                        .SelectMany(_asm =>{
+                        .SelectMany(_asm => _asm.GetTypes())
-                            try
-                            {
-                                return _asm.GetTypes();
-                            }
-                            catch
-                            {
-                                return Enumerable.Empty<Type>();
-                            }
-                        })
                         .Where(_assemblyType => _assemblyType.IsClass && _assemblyType.BaseType == typeof(Command));
 
                     _logger.LogDebug("Discovered {count} plugin commands", commandTypes.Count());
 
                     configurationTypes = assemblies
-                        .SelectMany(asm => {
+                        .SelectMany(asm => asm.GetTypes())
-                            try
-                            {
-                                return asm.GetTypes();
-                            }
-                            catch
-                            {
-                                return Enumerable.Empty<Type>();
-                            }
-                        })
                         .Where(asmType =>
                             asmType.IsClass && asmType.GetInterface(nameof(IBaseConfiguration), false) != null);
 

Application/Misc/ScriptCommand.cs

@@ -6,6 +6,7 @@ using System;
 using System.Threading.Tasks;
 using Data.Models.Client;
 using Microsoft.Extensions.Logging;
+using static SharedLibraryCore.Database.Models.EFClient;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application.Misc
@@ -15,15 +16,14 @@ namespace IW4MAdmin.Application.Misc
     /// </summary>
     public class ScriptCommand : Command
     {
-        private readonly Func<GameEvent, Task> _executeAction;
+        private readonly Action<GameEvent> _executeAction;
         private readonly ILogger _logger;
 
-        public ScriptCommand(string name, string alias, string description, bool isTargetRequired,
+        public ScriptCommand(string name, string alias, string description, bool isTargetRequired, EFClient.Permission permission,
-            EFClient.Permission permission,
+            CommandArgument[] args, Action<GameEvent> executeAction, CommandConfiguration config, ITranslationLookup layout, ILogger<ScriptCommand> logger)
-            CommandArgument[] args, Func<GameEvent, Task> executeAction, CommandConfiguration config,
-            ITranslationLookup layout, ILogger<ScriptCommand> logger, Server.Game[] supportedGames)
             : base(config, layout)
         {
+
             _executeAction = executeAction;
             _logger = logger;
             Name = name;
@@ -32,7 +32,6 @@ namespace IW4MAdmin.Application.Misc
             RequiresTarget = isTargetRequired;
             Permission = permission;
             Arguments = args;
-            SupportedGames = supportedGames;
         }
 
         public override async Task ExecuteAsync(GameEvent e)
@@ -44,7 +43,7 @@ namespace IW4MAdmin.Application.Misc
 
             try
             {
-                await _executeAction(e);
+                await Task.Run(() => _executeAction(e));
             }
             catch (Exception ex)
             {

Application/Misc/ScriptPlugin.cs

@@ -13,7 +13,6 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Jint.Runtime.Interop;
 using Microsoft.Extensions.Logging;
 using Serilog.Context;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
@@ -37,12 +36,12 @@ namespace IW4MAdmin.Application.Misc
         /// </summary>
         public bool IsParser { get; private set; }
 
-        public FileSystemWatcher Watcher { get; }
+        public FileSystemWatcher Watcher { get; private set; }
 
         private Engine _scriptEngine;
         private readonly string _fileName;
-        private readonly SemaphoreSlim _onProcessing = new(1, 1);
+        private readonly SemaphoreSlim _onProcessing;
-        private bool _successfullyLoaded;
+        private bool successfullyLoaded;
         private readonly List<string> _registeredCommandNames;
         private readonly ILogger _logger;
 
@@ -50,14 +49,15 @@ namespace IW4MAdmin.Application.Misc
         {
             _logger = logger;
             _fileName = filename;
-            Watcher = new FileSystemWatcher
+            Watcher = new FileSystemWatcher()
             {
-                Path = workingDirectory ?? $"{Utilities.OperatingDirectory}Plugins{Path.DirectorySeparatorChar}",
+                Path = workingDirectory == null ? $"{Utilities.OperatingDirectory}Plugins{Path.DirectorySeparatorChar}" : workingDirectory,
                 NotifyFilter = NotifyFilters.Size,
                 Filter = _fileName.Split(Path.DirectorySeparatorChar).Last()
             };
 
             Watcher.EnableRaisingEvents = true;
+            _onProcessing = new SemaphoreSlim(1, 1);
             _registeredCommandNames = new List<string>();
         }
 
@@ -67,13 +67,12 @@ namespace IW4MAdmin.Application.Misc
             _onProcessing.Dispose();
         }
 
-        public async Task Initialize(IManager manager, IScriptCommandFactory scriptCommandFactory,
+        public async Task Initialize(IManager manager, IScriptCommandFactory scriptCommandFactory, IScriptPluginServiceResolver serviceResolver)
-            IScriptPluginServiceResolver serviceResolver)
         {
+            await _onProcessing.WaitAsync();
+
             try
             {
-                await _onProcessing.WaitAsync();
-
                 // for some reason we get an event trigger when the file is not finished being modified.
                 // this must have been a change in .NET CORE 3.x
                 // so if the new file is empty we can't process it yet
@@ -82,27 +81,26 @@ namespace IW4MAdmin.Application.Misc
                     return;
                 }
 
-                var firstRun = _scriptEngine == null;
+                bool firstRun = _scriptEngine == null;
 
                 // it's been loaded before so we need to call the unload event
                 if (!firstRun)
                 {
                     await OnUnloadAsync();
 
-                    foreach (var commandName in _registeredCommandNames)
+                    foreach (string commandName in _registeredCommandNames)
                     {
-                        _logger.LogDebug("Removing plugin registered command {Command}", commandName);
+                        _logger.LogDebug("Removing plugin registered command {command}", commandName);
                         manager.RemoveCommandByName(commandName);
                     }
 
                     _registeredCommandNames.Clear();
                 }
 
-                _successfullyLoaded = false;
+                successfullyLoaded = false;
                 string script;
 
-                await using (var stream =
+                using (var stream = new FileStream(_fileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
-                             new FileStream(_fileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
                 {
                     using (var reader = new StreamReader(stream, Encoding.Default))
                     {
@@ -112,34 +110,45 @@ namespace IW4MAdmin.Application.Misc
 
                 _scriptEngine = new Engine(cfg =>
                     cfg.AllowClr(new[]
-                        {
+                    {
-                            typeof(System.Net.Http.HttpClient).Assembly,
+                    typeof(System.Net.Http.HttpClient).Assembly,
-                            typeof(EFClient).Assembly,
+                    typeof(EFClient).Assembly,
-                            typeof(Utilities).Assembly,
+                    typeof(Utilities).Assembly,
-                            typeof(Encoding).Assembly
+                    typeof(Encoding).Assembly
-                        })
+                    })
-                        .CatchClrExceptions()
+                    .CatchClrExceptions());
-                        .AddObjectConverter(new PermissionLevelToStringConverter()));
+
+                try
+                {
+                    _scriptEngine.Execute(script);
+                }
+                catch (JavaScriptException ex)
+                {
+                
+                    _logger.LogError(ex,
+                        "Encountered JavaScript runtime error while executing {methodName} for script plugin {plugin} at {@locationInfo}",
+                        nameof(Initialize), _fileName, ex.Location);
+                    throw new PluginException($"A JavaScript parsing error occured while initializing script plugin");
+                }
+
+                catch (Exception e)
+                {
+
+                        _logger.LogError(e,
+                            "Encountered unexpected error while running {methodName} for script plugin {plugin}",
+                            nameof(Initialize), _fileName);
+                    throw new PluginException($"An unexpected error occured while initialization script plugin");
+                }
 
-                _scriptEngine.Execute(script);
                 _scriptEngine.SetValue("_localization", Utilities.CurrentLocalization);
                 _scriptEngine.SetValue("_serviceResolver", serviceResolver);
-                _scriptEngine.SetValue("_lock", _onProcessing);
+                dynamic pluginObject = _scriptEngine.GetValue("plugin").ToObject();
-                dynamic pluginObject = _scriptEngine.Evaluate("plugin").ToObject();
 
                 Author = pluginObject.author;
                 Name = pluginObject.name;
                 Version = (float)pluginObject.version;
 
-                var commands = JsValue.Undefined;
+                var commands = _scriptEngine.GetValue("commands");
-                try
-                {
-                    commands = _scriptEngine.Evaluate("commands");
-                }
-                catch (JavaScriptException)
-                {
-                    // ignore because commands aren't defined;
-                }
 
                 if (commands != JsValue.Undefined)
                 {
@@ -147,7 +156,7 @@ namespace IW4MAdmin.Application.Misc
                     {
                         foreach (var command in GenerateScriptCommands(commands, scriptCommandFactory))
                         {
-                            _logger.LogDebug("Adding plugin registered command {CommandName}", command.Name);
+                            _logger.LogDebug("Adding plugin registered command {commandName}", command.Name);
                             manager.AddAdditionalCommand(command);
                             _registeredCommandNames.Add(command.Name);
                         }
@@ -155,63 +164,53 @@ namespace IW4MAdmin.Application.Misc
 
                     catch (RuntimeBinderException e)
                     {
-                        throw new PluginException($"Not all required fields were found: {e.Message}")
+                        throw new PluginException($"Not all required fields were found: {e.Message}") { PluginFile = _fileName };
-                            { PluginFile = _fileName };
                     }
                 }
 
+                _scriptEngine.SetValue("_configHandler", new ScriptPluginConfigurationWrapper(Name, _scriptEngine));
+                await OnLoadAsync(manager);
+
                 try
                 {
                     if (pluginObject.isParser)
                     {
-                        await OnLoadAsync(manager);
                         IsParser = true;
-                        var eventParser = (IEventParser)_scriptEngine.Evaluate("eventParser").ToObject();
+                        IEventParser eventParser = (IEventParser)_scriptEngine.GetValue("eventParser").ToObject();
-                        var rconParser = (IRConParser)_scriptEngine.Evaluate("rconParser").ToObject();
+                        IRConParser rconParser = (IRConParser)_scriptEngine.GetValue("rconParser").ToObject();
                         manager.AdditionalEventParsers.Add(eventParser);
                         manager.AdditionalRConParsers.Add(rconParser);
                     }
                 }
 
-                catch (RuntimeBinderException)
+                catch (RuntimeBinderException) { }
-                {
-                    var configWrapper = new ScriptPluginConfigurationWrapper(Name, _scriptEngine);
-                    await configWrapper.InitializeAsync();
-                    _scriptEngine.SetValue("_configHandler", configWrapper);
-                    await OnLoadAsync(manager);
-                }
 
                 if (!firstRun)
                 {
                     await OnLoadAsync(manager);
                 }
 
-                _successfullyLoaded = true;
+                successfullyLoaded = true;
             }
+
             catch (JavaScriptException ex)
             {
                 _logger.LogError(ex,
-                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} at {@LocationInfo}",
+                    "Encountered JavaScript runtime error while executing {methodName} for script plugin {plugin} initialization {@locationInfo}",
-                    nameof(Initialize), Path.GetFileName(_fileName), ex.Location);
+                    nameof(OnLoadAsync), _fileName, ex.Location);
-
+                
-                throw new PluginException("An error occured while initializing script plugin");
-            }
-            catch (Exception ex) when (ex.InnerException is JavaScriptException jsEx)
-            {
-                _logger.LogError(ex,
-                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} initialization {@LocationInfo}",
-                    nameof(Initialize), _fileName, jsEx.Location);
-
                 throw new PluginException("An error occured while initializing script plugin");
             }
+            
             catch (Exception ex)
             {
                 _logger.LogError(ex,
-                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin}",
+                    "Encountered unexpected error while running {methodName} for script plugin {plugin}",
-                    nameof(OnLoadAsync), Path.GetFileName(_fileName));
+                    nameof(OnLoadAsync), _fileName);
-
+                
-                throw new PluginException("An error occured while executing action for script plugin");
+                throw new PluginException("An unexpected error occured while initializing script plugin");
             }
+
             finally
             {
                 if (_onProcessing.CurrentCount == 0)
@@ -221,118 +220,73 @@ namespace IW4MAdmin.Application.Misc
             }
         }
 
-        public async Task OnEventAsync(GameEvent gameEvent, Server server)
+        public async Task OnEventAsync(GameEvent E, Server S)
         {
-            if (!_successfullyLoaded)
+            if (successfullyLoaded)
-            {
-                return;
-            }
-
-            try
             {
                 await _onProcessing.WaitAsync();
-                _scriptEngine.SetValue("_gameEvent", gameEvent);
-                _scriptEngine.SetValue("_server", server);
-                _scriptEngine.SetValue("_IW4MAdminClient", Utilities.IW4MAdminClient(server));
-                _scriptEngine.Evaluate("plugin.onEventAsync(_gameEvent, _server)");
-            }
 
-            catch (JavaScriptException ex)
+                try
-            {
-                using (LogContext.PushProperty("Server", server.ToString()))
                 {
-                    _logger.LogError(ex,
+                    _scriptEngine.SetValue("_gameEvent", E);
-                        "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} with event type {EventType} {@LocationInfo}",
+                    _scriptEngine.SetValue("_server", S);
-                        nameof(OnEventAsync), Path.GetFileName(_fileName), gameEvent.Type, ex.Location);
+                    _scriptEngine.SetValue("_IW4MAdminClient", Utilities.IW4MAdminClient(S));
+                    _scriptEngine.Execute("plugin.onEventAsync(_gameEvent, _server)").GetCompletionValue();
+                }
+                
+                catch (JavaScriptException ex)
+                {
+                    using (LogContext.PushProperty("Server", S.ToString()))
+                    {
+                        _logger.LogError(ex,
+                            "Encountered JavaScript runtime error while executing {methodName} for script plugin {plugin} with event type {eventType} {@locationInfo}",
+                            nameof(OnEventAsync), _fileName, E.Type, ex.Location);
+                    }
+
+                    throw new PluginException($"An error occured while executing action for script plugin");
                 }
 
-                throw new PluginException("An error occured while executing action for script plugin");
+                catch (Exception e)
-            }
-
-            catch (Exception ex)
-            {
-                using (LogContext.PushProperty("Server", server.ToString()))
                 {
-                    _logger.LogError(ex,
+                    using (LogContext.PushProperty("Server", S.ToString()))
-                        "Encountered error while running {MethodName} for script plugin {Plugin} with event type {EventType}",
+                    {
-                        nameof(OnEventAsync), _fileName, gameEvent.Type);
+                        _logger.LogError(e,
+                            "Encountered unexpected error while running {methodName} for script plugin {plugin} with event type {eventType}",
+                            nameof(OnEventAsync), _fileName, E.Type);
+                    }
+
+                    throw new PluginException($"An error occured while executing action for script plugin");
                 }
 
-                throw new PluginException("An error occured while executing action for script plugin");
+                finally
-            }
-
-            finally
-            {
-                if (_onProcessing.CurrentCount == 0)
                 {
-                    _onProcessing.Release(1);
+                    if (_onProcessing.CurrentCount == 0)
+                    {
+                        _onProcessing.Release(1);
+                    }
                 }
             }
         }
 
         public Task OnLoadAsync(IManager manager)
         {
-            try
+            _logger.LogDebug("OnLoad executing for {name}", Name);
-            {
+            _scriptEngine.SetValue("_manager", manager);
-                _logger.LogDebug("OnLoad executing for {Name}", Name);
+            return Task.FromResult(_scriptEngine.Execute("plugin.onLoadAsync(_manager)").GetCompletionValue());
-                _scriptEngine.SetValue("_manager", manager);
-                _scriptEngine.Evaluate("plugin.onLoadAsync(_manager)");
-
-                return Task.CompletedTask;
-            }
-            catch (JavaScriptException ex)
-            {
-                _logger.LogError(ex,
-                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} at {@LocationInfo}",
-                    nameof(OnLoadAsync), Path.GetFileName(_fileName), ex.Location);
-
-                throw new PluginException("A runtime error occured while executing action for script plugin");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex,
-                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin}",
-                    nameof(OnLoadAsync), Path.GetFileName(_fileName));
-
-                throw new PluginException("An error occured while executing action for script plugin");
-            }
         }
 
-        public async Task OnTickAsync(Server server)
+        public Task OnTickAsync(Server S)
         {
-            _scriptEngine.SetValue("_server", server);
+            _scriptEngine.SetValue("_server", S);
-            await Task.FromResult(_scriptEngine.Evaluate("plugin.onTickAsync(_server)"));
+            return Task.FromResult(_scriptEngine.Execute("plugin.onTickAsync(_server)").GetCompletionValue());
         }
 
-        public Task OnUnloadAsync()
+        public async Task OnUnloadAsync()
         {
-            if (!_successfullyLoaded)
+            if (successfullyLoaded)
             {
-                return Task.CompletedTask;
+                await Task.FromResult(_scriptEngine.Execute("plugin.onUnloadAsync()").GetCompletionValue());
             }
-
-            try
-            {
-                _scriptEngine.Evaluate("plugin.onUnloadAsync()");
-            }
-            catch (JavaScriptException ex)
-            {
-                _logger.LogError(ex,
-                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} at {@LocationInfo}",
-                    nameof(OnUnloadAsync), Path.GetFileName(_fileName), ex.Location);
-
-                throw new PluginException("A runtime error occured while executing action for script plugin");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex,
-                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin}",
-                    nameof(OnUnloadAsync), Path.GetFileName(_fileName));
-
-                throw new PluginException("An error occured while executing action for script plugin");
-            }
-
-            return Task.CompletedTask;
         }
 
         /// <summary>
@@ -341,9 +295,9 @@ namespace IW4MAdmin.Application.Misc
         /// <param name="commands">commands value from jint parser</param>
         /// <param name="scriptCommandFactory">factory to create the command from</param>
         /// <returns></returns>
-        private IEnumerable<IManagerCommand> GenerateScriptCommands(JsValue commands, IScriptCommandFactory scriptCommandFactory)
+        public IEnumerable<IManagerCommand> GenerateScriptCommands(JsValue commands, IScriptCommandFactory scriptCommandFactory)
         {
-            var commandList = new List<IManagerCommand>();
+            List<IManagerCommand> commandList = new List<IManagerCommand>();
 
             // go through each defined command
             foreach (var command in commands.AsArray())
@@ -353,10 +307,9 @@ namespace IW4MAdmin.Application.Misc
                 string alias = dynamicCommand.alias;
                 string description = dynamicCommand.description;
                 string permission = dynamicCommand.permission;
-                List<Server.Game> supportedGames = null;
+                bool targetRequired = false;
-                var targetRequired = false;
 
-                var args = new List<(string, bool)>();
+                List<(string, bool)> args = new List<(string, bool)>();
                 dynamic arguments = null;
 
                 try
@@ -387,85 +340,26 @@ namespace IW4MAdmin.Application.Misc
                     }
                 }
 
-                try
+                void execute(GameEvent e)
                 {
-                    foreach (var game in dynamicCommand.supportedGames)
+                    _scriptEngine.SetValue("_event", e);
-                    {
+                    var jsEventObject = _scriptEngine.GetValue("_event");
-                        supportedGames ??= new List<Server.Game>();
-                        supportedGames.Add(Enum.Parse(typeof(Server.Game), game.ToString()));
-                    }
-                }
-                catch (RuntimeBinderException)
-                {
-                    // supported games is optional
-                }
 
-                async Task Execute(GameEvent gameEvent)
-                {
                     try
                     {
-                        await _onProcessing.WaitAsync();
+                        dynamicCommand.execute.Target.Invoke(jsEventObject);
-
-                        _scriptEngine.SetValue("_event", gameEvent);
-                        var jsEventObject = _scriptEngine.Evaluate("_event");
-                        
-                        dynamicCommand.execute.Target.Invoke(_scriptEngine, jsEventObject);
                     }
 
                     catch (JavaScriptException ex)
                     {
-                        using (LogContext.PushProperty("Server", gameEvent.Owner?.ToString()))
+                        throw new PluginException($"An error occured while executing action for script plugin: {ex.Error} (Line: {ex.Location.Start.Line}, Character: {ex.Location.Start.Column})") { PluginFile = _fileName };
-                        {
-                            _logger.LogError(ex, "Could not execute command action for {Filename} {@Location}",
-                                Path.GetFileName(_fileName), ex.Location);
-                        }
-
-                        throw new PluginException("A runtime error occured while executing action for script plugin");
-                    }
-                    
-                    catch (Exception ex)
-                    {
-                        using (LogContext.PushProperty("Server", gameEvent.Owner?.ToString()))
-                        {
-                            _logger.LogError(ex,
-                                "Could not execute command action for script plugin {FileName}",
-                                Path.GetFileName(_fileName));
-                        }
-
-                        throw new PluginException("An error occured while executing action for script plugin");
-                    }
-
-
-                    finally
-                    {
-                        if (_onProcessing.CurrentCount == 0)
-                        {
-                            _onProcessing.Release(1);
-                        }
                     }
                 }
 
-                commandList.Add(scriptCommandFactory.CreateScriptCommand(name, alias, description, permission,
+                commandList.Add(scriptCommandFactory.CreateScriptCommand(name, alias, description, permission, targetRequired, args, execute));
-                    targetRequired, args, Execute, supportedGames?.ToArray()));
             }
 
             return commandList;
         }
     }
-
-    public class PermissionLevelToStringConverter : IObjectConverter
-    {
-        public bool TryConvert(Engine engine, object value, out JsValue result)
-        {
-            if (value is Data.Models.Client.EFClient.Permission)
-            {
-                result = value.ToString();
-                return true;
-            }
-
-
-            result = JsValue.Null;
-            return false;
-        }
-    }
 }

Application/Misc/ScriptPluginConfigurationWrapper.cs

@@ -12,22 +12,17 @@ namespace IW4MAdmin.Application.Misc
     public class ScriptPluginConfigurationWrapper
     {
         private readonly BaseConfigurationHandler<ScriptPluginConfiguration> _handler;
-        private ScriptPluginConfiguration _config;
+        private readonly ScriptPluginConfiguration _config;
         private readonly string _pluginName;
         private readonly Engine _scriptEngine;
 
         public ScriptPluginConfigurationWrapper(string pluginName, Engine scriptEngine)
         {
             _handler = new BaseConfigurationHandler<ScriptPluginConfiguration>("ScriptPluginSettings");
-            _pluginName = pluginName;
-            _scriptEngine = scriptEngine;
-        }
-
-        public async Task InitializeAsync()
-        {
-            await _handler.BuildAsync();
             _config = _handler.Configuration() ??
                       (ScriptPluginConfiguration) new ScriptPluginConfiguration().Generate();
+            _pluginName = pluginName;
+            _scriptEngine = scriptEngine;
         }
 
         private static int? AsInteger(double d)
@@ -92,4 +87,4 @@ namespace IW4MAdmin.Application.Misc
             return JsValue.FromObject(_scriptEngine, item);
         }
     }
-}
+}

Application/Misc/ScriptPluginTimerHelper.cs

@@ -1,159 +0,0 @@
-using System;
-using System.Threading;
-using Jint.Native;
-using Jint.Runtime;
-using Microsoft.Extensions.Logging;
-using SharedLibraryCore.Interfaces;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
-
-namespace IW4MAdmin.Application.Misc;
-
-public class ScriptPluginTimerHelper : IScriptPluginTimerHelper
-{
-    private Timer _timer;
-    private Action _actions;
-    private Delegate _jsAction;
-    private string _actionName;
-    private const int DefaultDelay = 0;
-    private const int DefaultInterval = 1000;
-    private readonly ILogger _logger;
-    private readonly ManualResetEventSlim _onRunningTick = new();
-    private SemaphoreSlim _onDependentAction;
-
-    public ScriptPluginTimerHelper(ILogger<ScriptPluginTimerHelper> logger)
-    {
-        _logger = logger;
-    }
-
-    ~ScriptPluginTimerHelper()
-    {
-        if (_timer != null)
-        {
-            Stop();
-        }
-        _onRunningTick.Dispose();
-    }
-
-    public void Start(int delay, int interval)
-    {
-        if (_actions is null)
-        {
-            throw new InvalidOperationException("Timer action must be defined before starting");
-        }
-
-        if (delay < 0)
-        {
-            throw new ArgumentException("Timer delay must be >= 0");
-        }
-
-        if (interval < 20)
-        {
-            throw new ArgumentException("Timer interval must be at least 20ms");
-        }
-        
-        Stop();
-        
-        _logger.LogDebug("Starting script timer...");
-
-        _onRunningTick.Set();
-        _timer ??= new Timer(callback => _actions(), null, delay, interval);
-        IsRunning = true;
-    }
-
-    public void Start(int interval)
-    {
-        Start(DefaultDelay, interval);
-    }
-
-    public void Start()
-    {
-        Start(DefaultDelay, DefaultInterval);
-    }
-
-    public void Stop()
-    {
-        if (_timer == null)
-        {
-            return;
-        }
-        
-        _logger.LogDebug("Stopping script timer...");
-        _timer.Change(Timeout.Infinite, Timeout.Infinite);
-        _timer.Dispose();
-        _timer = null;
-        IsRunning = false;
-    }
-
-    public void OnTick(Delegate action, string actionName)
-    {
-        if (string.IsNullOrEmpty(actionName))
-        {
-            throw new ArgumentException("actionName must be provided", nameof(actionName));
-        }
-
-        if (action is null)
-        {
-            throw new ArgumentException("action must be provided", nameof(action));
-        }
-
-        _logger.LogDebug("Adding new action with name {ActionName}", actionName);
-
-        _jsAction = action;
-        _actionName = actionName;
-        _actions = OnTick;
-    }
-
-    private void ReleaseThreads()
-    {
-        _onRunningTick.Set();
-
-        if (_onDependentAction?.CurrentCount != 0)
-        {
-            return;
-        }
-
-        _onDependentAction?.Release(1);
-    }
-    private void OnTick()
-    {
-        try
-        {
-            if (!_onRunningTick.IsSet)
-            {
-                _logger.LogDebug("Previous {OnTick} is still running, so we are skipping this one",
-                    nameof(OnTick));
-                return;
-            }
-
-            _onRunningTick.Reset();
-
-            // the js engine is not thread safe so we need to ensure we're not executing OnTick and OnEventAsync simultaneously
-            _onDependentAction?.WaitAsync().Wait();
-            var start = DateTime.Now;
-            _jsAction.DynamicInvoke(JsValue.Undefined, new[] { JsValue.Undefined });
-            _logger.LogDebug("OnTick took {Time}ms", (DateTime.Now - start).TotalMilliseconds);
-            ReleaseThreads();
-        }
-
-        catch (Exception ex) when (ex.InnerException is JavaScriptException jsex)
-        {
-            _logger.LogError(jsex,
-                "Could not execute timer tick for script action {ActionName} [@{LocationInfo}]", _actionName,
-                jsex.Location);
-            ReleaseThreads();
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Could not execute timer tick for script action {ActionName}", _actionName);
-            _onRunningTick.Set();
-            ReleaseThreads();
-        }
-    }
-
-    public void SetDependency(SemaphoreSlim dependentSemaphore)
-    {
-        _onDependentAction = dependentSemaphore;
-    }
-
-    public bool IsRunning { get; private set; }
-}

Application/Misc/ServerDataViewer.cs

@@ -24,7 +24,7 @@ namespace IW4MAdmin.Application.Misc
         private readonly IDataValueCache<EFServerSnapshot, List<ClientHistoryInfo>> _clientHistoryCache;
 
         private readonly TimeSpan? _cacheTimeSpan =
-            Utilities.IsDevelopment ? TimeSpan.FromSeconds(30) : (TimeSpan?) TimeSpan.FromMinutes(10);
+            Utilities.IsDevelopment ? TimeSpan.FromSeconds(1) : (TimeSpan?) TimeSpan.FromMinutes(1);
 
         public ServerDataViewer(ILogger<ServerDataViewer> logger, IDataValueCache<EFServerSnapshot, (int?, DateTime?)> snapshotCache,
             IDataValueCache<EFClient, (int, int)> serverStatsCache,
@@ -36,8 +36,7 @@ namespace IW4MAdmin.Application.Misc
             _clientHistoryCache = clientHistoryCache;
         }
 
-        public async Task<(int?, DateTime?)> 
+        public async Task<(int?, DateTime?)> MaxConcurrentClientsAsync(long? serverId = null, TimeSpan? overPeriod = null,
-            MaxConcurrentClientsAsync(long? serverId = null, TimeSpan? overPeriod = null,
             CancellationToken token = default)
         {
             _snapshotCache.SetCacheItem(async (snapshots, cancellationToken) =>
@@ -84,7 +83,7 @@ namespace IW4MAdmin.Application.Misc
                 _logger.LogDebug("Max concurrent clients since {Start} is {Clients}", oldestEntry, maxClients);
 
                 return (maxClients, maxClientsTime);
-            }, nameof(MaxConcurrentClientsAsync), _cacheTimeSpan, true);
+            }, nameof(MaxConcurrentClientsAsync), _cacheTimeSpan);
 
             try
             {
@@ -108,7 +107,7 @@ namespace IW4MAdmin.Application.Misc
                     cancellationToken);
 
                 return (count, recentCount);
-            }, nameof(_serverStatsCache), _cacheTimeSpan, true);
+            }, nameof(_serverStatsCache), _cacheTimeSpan);
 
             try
             {

Application/Misc/TokenAuthentication.cs

@@ -7,26 +7,26 @@ using System.Text;
 
 namespace IW4MAdmin.Application.Misc
 {
-    internal class TokenAuthentication : ITokenAuthentication
+    class TokenAuthentication : ITokenAuthentication
     {
         private readonly ConcurrentDictionary<long, TokenState> _tokens;
-        private readonly RandomNumberGenerator _random;
+        private readonly RNGCryptoServiceProvider _random;
-        private static readonly TimeSpan TimeoutPeriod = new TimeSpan(0, 0, 120);
+        private readonly static TimeSpan _timeoutPeriod = new TimeSpan(0, 0, 120);
-        private const short TokenLength = 4;
+        private const short TOKEN_LENGTH = 4;
 
         public TokenAuthentication()
         {
             _tokens = new ConcurrentDictionary<long, TokenState>();
-            _random = RandomNumberGenerator.Create();
+            _random = new RNGCryptoServiceProvider();
         }
 
         public bool AuthorizeToken(long networkId, string token)
         {
-            var authorizeSuccessful = _tokens.ContainsKey(networkId) && _tokens[networkId].Token == token;
+            bool authorizeSuccessful = _tokens.ContainsKey(networkId) && _tokens[networkId].Token == token;
 
             if (authorizeSuccessful)
             {
-                _tokens.TryRemove(networkId, out _);
+                _tokens.TryRemove(networkId, out TokenState _);
             }
 
             return authorizeSuccessful;
@@ -34,15 +34,15 @@ namespace IW4MAdmin.Application.Misc
 
         public TokenState GenerateNextToken(long networkId)
         {
-            TokenState state;
+            TokenState state = null;
 
             if (_tokens.ContainsKey(networkId))
             {
                 state = _tokens[networkId];
 
-                if ((DateTime.Now - state.RequestTime) > TimeoutPeriod)
+                if ((DateTime.Now - state.RequestTime) > _timeoutPeriod)
                 {
-                    _tokens.TryRemove(networkId, out _);
+                    _tokens.TryRemove(networkId, out TokenState _);
                 }
 
                 else
@@ -51,11 +51,11 @@ namespace IW4MAdmin.Application.Misc
                 }
             }
 
-            state = new TokenState
+            state = new TokenState()
             {
                 NetworkId = networkId,
                 Token = _generateToken(),
-                TokenDuration = TimeoutPeriod
+                TokenDuration = _timeoutPeriod
             };
 
             _tokens.TryAdd(networkId, state);
@@ -63,31 +63,31 @@ namespace IW4MAdmin.Application.Misc
             // perform some housekeeping so we don't have built up tokens if they're not ever used
             foreach (var (key, value) in _tokens)
             {
-                if ((DateTime.Now - value.RequestTime) > TimeoutPeriod)
+                if ((DateTime.Now - value.RequestTime) > _timeoutPeriod)
                 {
-                    _tokens.TryRemove(key, out _);
+                    _tokens.TryRemove(key, out TokenState _);
                 }
             }
 
             return state;
         }
 
-        private string _generateToken()
+        public string _generateToken()
         {
-            bool ValidCharacter(char c)
+            bool validCharacter(char c)
             {
                 // this ensure that the characters are 0-9, A-Z, a-z
                 return (c > 47 && c < 58) || (c > 64 && c < 91) || (c > 96 && c < 123);
             }
 
-            var token = new StringBuilder();
+            StringBuilder token = new StringBuilder();
 
-            var charSet = new byte[1];
+            while (token.Length < TOKEN_LENGTH)
-            while (token.Length < TokenLength)
             {
+                byte[] charSet = new byte[1];
                 _random.GetBytes(charSet);
 
-                if (ValidCharacter((char)charSet[0]))
+                if (validCharacter((char)charSet[0]))
                 {
                     token.Append((char)charSet[0]);
                 }

Application/RConParsers/DynamicRConParserConfiguration.cs

@@ -3,7 +3,6 @@ using SharedLibraryCore.Interfaces;
 using SharedLibraryCore.RCon;
 using System.Collections.Generic;
 using System.Globalization;
-using SharedLibraryCore.Formatting;
 
 namespace IW4MAdmin.Application.RConParsers
 {
@@ -29,25 +28,6 @@ namespace IW4MAdmin.Application.RConParsers
         public int NoticeMaximumLines { get; set; } = 8;
         public int NoticeMaxCharactersPerLine { get; set; } = 50;
         public string NoticeLineSeparator { get; set; } = Environment.NewLine;
-        public int? DefaultRConPort { get; set; }
-        public string DefaultInstallationDirectoryHint { get; set; }
-        public short FloodProtectInterval { get; set; } = 750;
-
-        public ColorCodeMapping ColorCodeMapping { get; set; } = new ColorCodeMapping
-        {
-            // this is the default mapping (IW4), but can be overridden as needed in the parsers
-            {ColorCodes.Black.ToString(), "^0"},
-            {ColorCodes.Red.ToString(), "^1"},
-            {ColorCodes.Green.ToString(), "^2"},
-            {ColorCodes.Yellow.ToString(), "^3"},
-            {ColorCodes.Blue.ToString(), "^4"},
-            {ColorCodes.Cyan.ToString(), "^5"},
-            {ColorCodes.Pink.ToString(), "^6"},
-            {ColorCodes.White.ToString(), "^7"},
-            {ColorCodes.Map.ToString(), "^8"},
-            {ColorCodes.Grey.ToString(), "^9"},
-            {ColorCodes.Wildcard.ToString(), ":^"},
-        };
 
         public DynamicRConParserConfiguration(IParserRegexFactory parserRegexFactory)
         {

Data/Abstractions/IDataValueCache.cs

@@ -5,10 +5,9 @@ using Microsoft.EntityFrameworkCore;
 
 namespace Data.Abstractions
 {
-    public interface IDataValueCache<TEntityType, TReturnType> where TEntityType : class
+    public interface IDataValueCache<T, V> where T : class
     {
-        void SetCacheItem(Func<DbSet<TEntityType>, CancellationToken, Task<TReturnType>> itemGetter, string keyName,
+        void SetCacheItem(Func<DbSet<T>, CancellationToken, Task<V>> itemGetter, string keyName, TimeSpan? expirationTime = null);
-            TimeSpan? expirationTime = null, bool autoRefresh = false);
+        Task<V> GetCacheItem(string keyName, CancellationToken token = default);
-        Task<TReturnType> GetCacheItem(string keyName, CancellationToken token = default);
     }
 }

Data/Context/ContextSeed.cs

@@ -23,7 +23,7 @@ namespace Data.Context
             {
                 var link = new EFAliasLink();
 
-                context.Clients.Add(new EFClient
+                context.Clients.Add(new EFClient()
                 {
                     Active = false,
                     Connections = 0,
@@ -33,7 +33,7 @@ namespace Data.Context
                     Masked = true,
                     NetworkId = 0,
                     AliasLink = link,
-                    CurrentAlias = new EFAlias
+                    CurrentAlias = new EFAlias()
                     {
                         Link = link,
                         Active = true,
@@ -46,4 +46,4 @@ namespace Data.Context
             }
         }
     }
-}
+}

Data/Context/DatabaseContext.cs

@@ -18,7 +18,6 @@ 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,7 +118,7 @@ namespace Data.Context
                 ent.HasIndex(a => a.Name);
                 ent.Property(_alias => _alias.SearchableName).HasMaxLength(24);
                 ent.HasIndex(_alias => _alias.SearchableName);
-                ent.HasIndex(_alias => new {_alias.Name, _alias.IPAddress});
+                ent.HasIndex(_alias => new {_alias.Name, _alias.IPAddress}).IsUnique();
             });
 
             modelBuilder.Entity<EFMeta>(ent =>
@@ -131,12 +130,6 @@ 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
@@ -144,7 +137,6 @@ 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));
 
@@ -153,4 +145,4 @@ namespace Data.Context
             base.OnModelCreating(modelBuilder);
         }
     }
-}
+}

Data/Data.csproj

@@ -1,27 +1,30 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Configurations>Debug;Release;Prerelease</Configurations>
     <Platforms>AnyCPU</Platforms>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageId>RaidMax.IW4MAdmin.Data</PackageId>
     <Title>RaidMax.IW4MAdmin.Data</Title>
     <Authors />
-    <PackageVersion>1.2.0</PackageVersion>
+    <PackageVersion>1.0.7</PackageVersion>
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.10">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Npgsql" Version="6.0.2" />
+    <PackageReference Include="Npgsql" Version="4.1.7" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.2" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.4" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.1" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.2.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.10" />
+  </ItemGroup>
+  
+  <ItemGroup Condition="'$(Configuration)'=='Debug'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.10" />
   </ItemGroup>
   
 </Project>

Data/Helpers/DataValueCache.cs

@@ -1,84 +1,58 @@
 using System;
-using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Data.Abstractions;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Timer = System.Timers.Timer;
 
 namespace Data.Helpers
 {
-    public class DataValueCache<TEntityType, TReturnType> : IDataValueCache<TEntityType, TReturnType>
+    public class DataValueCache<T, V> : IDataValueCache<T, V> where T : class
-        where TEntityType : class
     {
         private readonly ILogger _logger;
         private readonly IDatabaseContextFactory _contextFactory;
-
+        private readonly Dictionary<string, CacheState> _cacheStates = new Dictionary<string, CacheState>();
-        private readonly ConcurrentDictionary<string, CacheState<TReturnType>> _cacheStates =
-            new ConcurrentDictionary<string, CacheState<TReturnType>>();
-
-        private bool _autoRefresh;
         private const int DefaultExpireMinutes = 15;
-        private Timer _timer;
 
-        private class CacheState<TCacheType>
+        private class CacheState
         {
             public string Key { get; set; }
             public DateTime LastRetrieval { get; set; }
             public TimeSpan ExpirationTime { get; set; }
-            public Func<DbSet<TEntityType>, CancellationToken, Task<TCacheType>> Getter { get; set; }
+            public Func<DbSet<T>, CancellationToken, Task<V>> Getter { get; set; }
-            public TCacheType Value { get; set; }
+            public V Value { get; set; }
-            public bool IsSet { get; set; }
 
             public bool IsExpired => ExpirationTime != TimeSpan.MaxValue &&
                                      (DateTime.Now - LastRetrieval.Add(ExpirationTime)).TotalSeconds > 0;
         }
 
-        public DataValueCache(ILogger<DataValueCache<TEntityType, TReturnType>> logger,
+        public DataValueCache(ILogger<DataValueCache<T, V>> logger, IDatabaseContextFactory contextFactory)
-            IDatabaseContextFactory contextFactory)
         {
             _logger = logger;
             _contextFactory = contextFactory;
         }
 
-        ~DataValueCache()
+        public void SetCacheItem(Func<DbSet<T>, CancellationToken, Task<V>> getter, string key,
-        {
+            TimeSpan? expirationTime = null)
-            _timer?.Stop();
-            _timer?.Dispose();
-        }
-
-        public void SetCacheItem(Func<DbSet<TEntityType>, CancellationToken, Task<TReturnType>> getter, string key,
-            TimeSpan? expirationTime = null, bool autoRefresh = false)
         {
             if (_cacheStates.ContainsKey(key))
             {
-                _logger.LogDebug("Cache key {Key} is already added", key);
+                _logger.LogDebug("Cache key {key} is already added", key);
                 return;
             }
 
-            var state = new CacheState<TReturnType>
+            var state = new CacheState()
             {
                 Key = key,
                 Getter = getter,
                 ExpirationTime = expirationTime ?? TimeSpan.FromMinutes(DefaultExpireMinutes)
             };
 
-            _autoRefresh = autoRefresh;
+            _cacheStates.Add(key, state);
-
-            _cacheStates.TryAdd(key, state);
-
-            if (!_autoRefresh || expirationTime == TimeSpan.MaxValue)
-            {
-                return;
-            }
-
-            _timer = new Timer(state.ExpirationTime.TotalMilliseconds);
-            _timer.Elapsed += async (sender, args) => await RunCacheUpdate(state, CancellationToken.None);
-            _timer.Start();
         }
 
-        public async Task<TReturnType> GetCacheItem(string keyName, CancellationToken cancellationToken = default)
+        public async Task<V> GetCacheItem(string keyName, CancellationToken cancellationToken = default)
         {
             if (!_cacheStates.ContainsKey(keyName))
             {
@@ -87,9 +61,7 @@ namespace Data.Helpers
 
             var state = _cacheStates[keyName];
 
-            // when auto refresh is off we want to check the expiration and value
+            if (state.IsExpired || state.Value == null)
-            // when auto refresh is on, we want to only check the value, because it'll be refreshed automatically
-            if ((state.IsExpired || !state.IsSet) && !_autoRefresh || _autoRefresh && !state.IsSet)
             {
                 await RunCacheUpdate(state, cancellationToken);
             }
@@ -97,21 +69,19 @@ namespace Data.Helpers
             return state.Value;
         }
 
-        private async Task RunCacheUpdate(CacheState<TReturnType> state, CancellationToken token)
+        private async Task RunCacheUpdate(CacheState state, CancellationToken token)
         {
             try
             {
-                _logger.LogDebug("Running update for {ClassName} {@State}", GetType().Name, state);
                 await using var context = _contextFactory.CreateContext(false);
-                var set = context.Set<TEntityType>();
+                var set = context.Set<T>();
                 var value = await state.Getter(set, token);
                 state.Value = value;
-                state.IsSet = true;
                 state.LastRetrieval = DateTime.Now;
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Could not get cached value for {Key}", state.Key);
+                _logger.LogError(ex, "Could not get cached value for {key}", state.Key);
             }
         }
     }

Data/Helpers/LookupCache.cs

@@ -102,7 +102,7 @@ namespace Data.Helpers
         {
             try
             {
-                await using var context = _contextFactory.CreateContext(false);
+                await using var context = _contextFactory.CreateContext();
                 _cachedItems = await context.Set<T>().ToDictionaryAsync(item => item.Id);
             }
             catch (Exception ex)
@@ -111,4 +111,4 @@ namespace Data.Helpers
             }
         }
     }
-}
+}

Data/MigrationContext/MySqlDatabaseContext.cs

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

Data/MigrationContext/PostgresqlDatabaseContext.cs

@@ -23,13 +23,12 @@ 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")))
+                        options => options.SetPostgresVersion(new Version("9.4")))
                     .EnableDetailedErrors(true)
                     .EnableSensitiveDataLogging(true);
             }
         }
     }
-}
+}

Data/Migrations/MySql/20220102221729_RemoveUniqueAliasIndexConstraint.cs

@@ -1,32 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace Data.Migrations.MySql
-{
-    public partial class RemoveUniqueAliasIndexConstraint : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_EFAlias_Name_IPAddress",
-                table: "EFAlias");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_EFAlias_Name_IPAddress",
-                table: "EFAlias",
-                columns: new[] { "Name", "IPAddress" });
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_EFAlias_Name_IPAddress",
-                table: "EFAlias");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_EFAlias_Name_IPAddress",
-                table: "EFAlias",
-                columns: new[] { "Name", "IPAddress" },
-                unique: true);
-        }
-    }
-}

Data/Migrations/MySql/20220222215149_AddEFPenaltyIdentifier.cs

@@ -1,250 +0,0 @@
-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

@@ -1,56 +0,0 @@
-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

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

Data/Migrations/MySql/MySqlDatabaseContextModelSnapshot.cs

@@ -5,8 +5,6 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
-#nullable disable
-
 namespace Data.Migrations.MySql
 {
     [DbContext(typeof(MySqlDatabaseContext))]
@@ -16,7 +14,7 @@ namespace Data.Migrations.MySql
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.1")
+                .HasAnnotation("ProductVersion", "3.1.10")
                 .HasAnnotation("Relational:MaxIdentifierLength", 64);
 
             modelBuilder.Entity("Data.Models.Client.EFACSnapshotVector3", b =>
@@ -40,7 +38,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("Vector3Id");
 
-                    b.ToTable("EFACSnapshotVector3", (string)null);
+                    b.ToTable("EFACSnapshotVector3");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClient", b =>
@@ -77,10 +75,10 @@ namespace Data.Migrations.MySql
                         .HasColumnType("bigint");
 
                     b.Property<string>("Password")
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<string>("PasswordSalt")
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<int>("TotalConnectionTime")
                         .HasColumnType("int");
@@ -94,7 +92,7 @@ namespace Data.Migrations.MySql
                     b.HasIndex("NetworkId")
                         .IsUnique();
 
-                    b.ToTable("EFClients", (string)null);
+                    b.ToTable("EFClients");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientConnectionHistory", b =>
@@ -126,7 +124,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFClientConnectionHistory", (string)null);
+                    b.ToTable("EFClientConnectionHistory");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientKill", b =>
@@ -181,7 +179,7 @@ namespace Data.Migrations.MySql
                         .HasColumnType("int");
 
                     b.Property<string>("WeaponReference")
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<DateTime>("When")
                         .HasColumnType("datetime(6)");
@@ -200,7 +198,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ViewAnglesVector3Id");
 
-                    b.ToTable("EFClientKills", (string)null);
+                    b.ToTable("EFClientKills");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientMessage", b =>
@@ -216,7 +214,7 @@ namespace Data.Migrations.MySql
                         .HasColumnType("int");
 
                     b.Property<string>("Message")
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<bool>("SentIngame")
                         .HasColumnType("tinyint(1)");
@@ -235,7 +233,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("TimeSent");
 
-                    b.ToTable("EFClientMessages", (string)null);
+                    b.ToTable("EFClientMessages");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFACSnapshot", b =>
@@ -275,7 +273,7 @@ namespace Data.Migrations.MySql
                         .HasColumnType("int");
 
                     b.Property<string>("HitLocationReference")
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<int>("HitOriginId")
                         .HasColumnType("int");
@@ -323,7 +321,7 @@ namespace Data.Migrations.MySql
                         .HasColumnType("int");
 
                     b.Property<string>("WeaponReference")
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<DateTime>("When")
                         .HasColumnType("datetime(6)");
@@ -342,7 +340,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFACSnapshot", (string)null);
+                    b.ToTable("EFACSnapshot");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientHitStatistic", b =>
@@ -416,7 +414,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("WeaponId");
 
-                    b.ToTable("EFClientHitStatistics", (string)null);
+                    b.ToTable("EFClientHitStatistics");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientRankingHistory", b =>
@@ -461,7 +459,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ZScore");
 
-                    b.ToTable("EFClientRankingHistory", (string)null);
+                    b.ToTable("EFClientRankingHistory");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientRatingHistory", b =>
@@ -480,7 +478,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ClientId");
 
-                    b.ToTable("EFClientRatingHistory", (string)null);
+                    b.ToTable("EFClientRatingHistory");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientStatistics", b =>
@@ -538,7 +536,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ClientId", "TimePlayed", "ZScore");
 
-                    b.ToTable("EFClientStatistics", (string)null);
+                    b.ToTable("EFClientStatistics");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFHitLocationCount", b =>
@@ -551,12 +549,12 @@ namespace Data.Migrations.MySql
                         .HasColumnType("tinyint(1)");
 
                     b.Property<int>("EFClientStatisticsClientId")
-                        .HasColumnType("int")
+                        .HasColumnName("EFClientStatisticsClientId")
-                        .HasColumnName("EFClientStatisticsClientId");
+                        .HasColumnType("int");
 
                     b.Property<long>("EFClientStatisticsServerId")
-                        .HasColumnType("bigint")
+                        .HasColumnName("EFClientStatisticsServerId")
-                        .HasColumnName("EFClientStatisticsServerId");
+                        .HasColumnType("bigint");
 
                     b.Property<int>("HitCount")
                         .HasColumnType("int");
@@ -576,7 +574,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("EFClientStatisticsClientId", "EFClientStatisticsServerId");
 
-                    b.ToTable("EFHitLocationCounts", (string)null);
+                    b.ToTable("EFHitLocationCounts");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFRating", b =>
@@ -619,7 +617,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("When", "ServerId", "Performance", "ActivityAmount");
 
-                    b.ToTable("EFRating", (string)null);
+                    b.ToTable("EFRating");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFHitLocation", b =>
@@ -636,7 +634,7 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasColumnType("varchar(255)");
+                        .HasColumnType("varchar(255) CHARACTER SET utf8mb4");
 
                     b.Property<DateTime?>("UpdatedDateTime")
                         .HasColumnType("datetime(6)");
@@ -645,7 +643,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("Name");
 
-                    b.ToTable("EFHitLocations", (string)null);
+                    b.ToTable("EFHitLocations");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFMap", b =>
@@ -662,14 +660,14 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<DateTime?>("UpdatedDateTime")
                         .HasColumnType("datetime(6)");
 
                     b.HasKey("MapId");
 
-                    b.ToTable("EFMaps", (string)null);
+                    b.ToTable("EFMaps");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFMeansOfDeath", b =>
@@ -686,14 +684,14 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<DateTime?>("UpdatedDateTime")
                         .HasColumnType("datetime(6)");
 
                     b.HasKey("MeansOfDeathId");
 
-                    b.ToTable("EFMeansOfDeath", (string)null);
+                    b.ToTable("EFMeansOfDeath");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFWeapon", b =>
@@ -710,7 +708,7 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasColumnType("varchar(255)");
+                        .HasColumnType("varchar(255) CHARACTER SET utf8mb4");
 
                     b.Property<DateTime?>("UpdatedDateTime")
                         .HasColumnType("datetime(6)");
@@ -719,7 +717,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("Name");
 
-                    b.ToTable("EFWeapons", (string)null);
+                    b.ToTable("EFWeapons");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFWeaponAttachment", b =>
@@ -736,14 +734,14 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<DateTime?>("UpdatedDateTime")
                         .HasColumnType("datetime(6)");
 
                     b.HasKey("WeaponAttachmentId");
 
-                    b.ToTable("EFWeaponAttachments", (string)null);
+                    b.ToTable("EFWeaponAttachments");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFWeaponAttachmentCombo", b =>
@@ -778,7 +776,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("Attachment3Id");
 
-                    b.ToTable("EFWeaponAttachmentCombos", (string)null);
+                    b.ToTable("EFWeaponAttachmentCombos");
                 });
 
             modelBuilder.Entity("Data.Models.EFAlias", b =>
@@ -801,12 +799,12 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasMaxLength(24)
+                        .HasColumnType("varchar(24) CHARACTER SET utf8mb4")
-                        .HasColumnType("varchar(24)");
+                        .HasMaxLength(24);
 
                     b.Property<string>("SearchableName")
-                        .HasMaxLength(24)
+                        .HasColumnType("varchar(24) CHARACTER SET utf8mb4")
-                        .HasColumnType("varchar(24)");
+                        .HasMaxLength(24);
 
                     b.HasKey("AliasId");
 
@@ -818,9 +816,10 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("SearchableName");
 
-                    b.HasIndex("Name", "IPAddress");
+                    b.HasIndex("Name", "IPAddress")
+                        .IsUnique();
 
-                    b.ToTable("EFAlias", (string)null);
+                    b.ToTable("EFAlias");
                 });
 
             modelBuilder.Entity("Data.Models.EFAliasLink", b =>
@@ -834,7 +833,7 @@ namespace Data.Migrations.MySql
 
                     b.HasKey("AliasLinkId");
 
-                    b.ToTable("EFAliasLinks", (string)null);
+                    b.ToTable("EFAliasLinks");
                 });
 
             modelBuilder.Entity("Data.Models.EFChangeHistory", b =>
@@ -847,11 +846,11 @@ namespace Data.Migrations.MySql
                         .HasColumnType("tinyint(1)");
 
                     b.Property<string>("Comment")
-                        .HasMaxLength(128)
+                        .HasColumnType("varchar(128) CHARACTER SET utf8mb4")
-                        .HasColumnType("varchar(128)");
+                        .HasMaxLength(128);
 
                     b.Property<string>("CurrentValue")
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<int?>("ImpersonationEntityId")
                         .HasColumnType("int");
@@ -860,7 +859,7 @@ namespace Data.Migrations.MySql
                         .HasColumnType("int");
 
                     b.Property<string>("PreviousValue")
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<int>("TargetEntityId")
                         .HasColumnType("int");
@@ -892,12 +891,12 @@ namespace Data.Migrations.MySql
                         .HasColumnType("datetime(6)");
 
                     b.Property<string>("Extra")
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<string>("Key")
                         .IsRequired()
-                        .HasMaxLength(32)
+                        .HasColumnType("varchar(32) CHARACTER SET utf8mb4")
-                        .HasColumnType("varchar(32)");
+                        .HasMaxLength(32);
 
                     b.Property<int?>("LinkedMetaId")
                         .HasColumnType("int");
@@ -907,7 +906,7 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("Value")
                         .IsRequired()
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.HasKey("MetaId");
 
@@ -930,7 +929,7 @@ namespace Data.Migrations.MySql
                         .HasColumnType("tinyint(1)");
 
                     b.Property<string>("AutomatedOffense")
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<DateTime?>("Expires")
                         .HasColumnType("datetime(6)");
@@ -938,7 +937,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")
@@ -946,7 +945,7 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("Offense")
                         .IsRequired()
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<int>("PunisherId")
                         .HasColumnType("int");
@@ -965,39 +964,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("PunisherId");
 
-                    b.ToTable("EFPenalties", (string)null);
+                    b.ToTable("EFPenalties");
-                });
-
-            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 =>
@@ -1016,7 +983,7 @@ namespace Data.Migrations.MySql
                         .HasColumnType("tinyint(1)");
 
                     b.Property<string>("Message")
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<long?>("ServerId")
                         .HasColumnType("bigint");
@@ -1047,13 +1014,13 @@ namespace Data.Migrations.MySql
                         .HasColumnType("tinyint(1)");
 
                     b.Property<string>("EndPoint")
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<int?>("GameName")
                         .HasColumnType("int");
 
                     b.Property<string>("HostName")
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<bool>("IsPasswordProtected")
                         .HasColumnType("tinyint(1)");
@@ -1063,7 +1030,7 @@ namespace Data.Migrations.MySql
 
                     b.HasKey("ServerId");
 
-                    b.ToTable("EFServers", (string)null);
+                    b.ToTable("EFServers");
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerSnapshot", b =>
@@ -1096,7 +1063,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFServerSnapshot", (string)null);
+                    b.ToTable("EFServerSnapshot");
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerStatistics", b =>
@@ -1121,7 +1088,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFServerStatistics", (string)null);
+                    b.ToTable("EFServerStatistics");
                 });
 
             modelBuilder.Entity("Data.Models.Vector3", b =>
@@ -1141,7 +1108,7 @@ namespace Data.Migrations.MySql
 
                     b.HasKey("Vector3Id");
 
-                    b.ToTable("Vector3", (string)null);
+                    b.ToTable("Vector3");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFACSnapshotVector3", b =>
@@ -1157,10 +1124,6 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("Vector3Id")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Snapshot");
-
-                    b.Navigation("Vector");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClient", b =>
@@ -1176,10 +1139,6 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("CurrentAliasId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("AliasLink");
-
-                    b.Navigation("CurrentAlias");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientConnectionHistory", b =>
@@ -1195,10 +1154,6 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientKill", b =>
@@ -1232,18 +1187,6 @@ 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 =>
@@ -1259,10 +1202,6 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFACSnapshot", b =>
@@ -1300,18 +1239,6 @@ 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 =>
@@ -1341,18 +1268,6 @@ 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 =>
@@ -1366,10 +1281,6 @@ 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 =>
@@ -1379,8 +1290,6 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("ClientId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Client");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientStatistics", b =>
@@ -1396,10 +1305,6 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFHitLocationCount", b =>
@@ -1421,10 +1326,6 @@ 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 =>
@@ -1438,10 +1339,6 @@ 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 =>
@@ -1459,12 +1356,6 @@ 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 =>
@@ -1474,8 +1365,6 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("LinkId")
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
-
-                    b.Navigation("Link");
                 });
 
             modelBuilder.Entity("Data.Models.EFMeta", b =>
@@ -1488,17 +1377,15 @@ 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");
+                        .HasForeignKey("LinkId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
 
                     b.HasOne("Data.Models.Client.EFClient", "Offender")
                         .WithMany("ReceivedPenalties")
@@ -1511,23 +1398,6 @@ 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 =>
@@ -1547,12 +1417,6 @@ 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 =>
@@ -1568,10 +1432,6 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Map");
-
-                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerStatistics", b =>
@@ -1581,39 +1441,6 @@ 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/20220102221801_RemoveUniqueAliasIndexConstraint.cs

@@ -1,32 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace Data.Migrations.Postgresql
-{
-    public partial class RemoveUniqueAliasIndexConstraint : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_EFAlias_Name_IPAddress",
-                table: "EFAlias");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_EFAlias_Name_IPAddress",
-                table: "EFAlias",
-                columns: new[] { "Name", "IPAddress" });
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_EFAlias_Name_IPAddress",
-                table: "EFAlias");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_EFAlias_Name_IPAddress",
-                table: "EFAlias",
-                columns: new[] { "Name", "IPAddress" },
-                unique: true);
-        }
-    }
-}

Data/Migrations/Postgresql/20220222222045_AddEFPenaltyIdentifier.cs

@@ -1,56 +0,0 @@
-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

@@ -1,56 +0,0 @@
-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

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

Data/Migrations/Postgresql/PostgresqlDatabaseContextModelSnapshot.cs

@@ -6,8 +6,6 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
-#nullable disable
-
 namespace Data.Migrations.Postgresql
 {
     [DbContext(typeof(PostgresqlDatabaseContext))]
@@ -17,18 +15,16 @@ namespace Data.Migrations.Postgresql
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.1")
+                .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
+                .HasAnnotation("ProductVersion", "3.1.10")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
             modelBuilder.Entity("Data.Models.Client.EFACSnapshotVector3", b =>
                 {
                     b.Property<int>("ACSnapshotVector3Id")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
+                        .HasColumnType("integer")
-
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ACSnapshotVector3Id"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
@@ -45,16 +41,15 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("Vector3Id");
 
-                    b.ToTable("EFACSnapshotVector3", (string)null);
+                    b.ToTable("EFACSnapshotVector3");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClient", b =>
                 {
                     b.Property<int>("ClientId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
+                        .HasColumnType("integer")
-
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
@@ -101,16 +96,15 @@ namespace Data.Migrations.Postgresql
                     b.HasIndex("NetworkId")
                         .IsUnique();
 
-                    b.ToTable("EFClients", (string)null);
+                    b.ToTable("EFClients");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientConnectionHistory", b =>
                 {
                     b.Property<long>("ClientConnectionId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
+                        .HasColumnType("bigint")
-
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("ClientConnectionId"));
 
                     b.Property<int>("ClientId")
                         .HasColumnType("integer");
@@ -135,16 +129,15 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFClientConnectionHistory", (string)null);
+                    b.ToTable("EFClientConnectionHistory");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientKill", b =>
                 {
                     b.Property<long>("KillId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
+                        .HasColumnType("bigint")
-
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("KillId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
@@ -211,16 +204,15 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("ViewAnglesVector3Id");
 
-                    b.ToTable("EFClientKills", (string)null);
+                    b.ToTable("EFClientKills");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientMessage", b =>
                 {
                     b.Property<long>("MessageId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
+                        .HasColumnType("bigint")
-
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("MessageId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
@@ -248,16 +240,15 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("TimeSent");
 
-                    b.ToTable("EFClientMessages", (string)null);
+                    b.ToTable("EFClientMessages");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFACSnapshot", b =>
                 {
                     b.Property<int>("SnapshotId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
+                        .HasColumnType("integer")
-
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("SnapshotId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
@@ -357,16 +348,15 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFACSnapshot", (string)null);
+                    b.ToTable("EFACSnapshot");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientHitStatistic", b =>
                 {
                     b.Property<int>("ClientHitStatisticId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
+                        .HasColumnType("integer")
-
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientHitStatisticId"));
 
                     b.Property<int>("ClientId")
                         .HasColumnType("integer");
@@ -433,16 +423,15 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("WeaponId");
 
-                    b.ToTable("EFClientHitStatistics", (string)null);
+                    b.ToTable("EFClientHitStatistics");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientRankingHistory", b =>
                 {
                     b.Property<long>("ClientRankingHistoryId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
+                        .HasColumnType("bigint")
-
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("ClientRankingHistoryId"));
 
                     b.Property<int>("ClientId")
                         .HasColumnType("integer");
@@ -480,16 +469,15 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("ZScore");
 
-                    b.ToTable("EFClientRankingHistory", (string)null);
+                    b.ToTable("EFClientRankingHistory");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientRatingHistory", b =>
                 {
                     b.Property<int>("RatingHistoryId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
+                        .HasColumnType("integer")
-
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("RatingHistoryId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
@@ -501,7 +489,7 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("ClientId");
 
-                    b.ToTable("EFClientRatingHistory", (string)null);
+                    b.ToTable("EFClientRatingHistory");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientStatistics", b =>
@@ -559,27 +547,26 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("ClientId", "TimePlayed", "ZScore");
 
-                    b.ToTable("EFClientStatistics", (string)null);
+                    b.ToTable("EFClientStatistics");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFHitLocationCount", b =>
                 {
                     b.Property<int>("HitLocationCountId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
+                        .HasColumnType("integer")
-
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("HitLocationCountId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
 
                     b.Property<int>("EFClientStatisticsClientId")
-                        .HasColumnType("integer")
+                        .HasColumnName("EFClientStatisticsClientId")
-                        .HasColumnName("EFClientStatisticsClientId");
+                        .HasColumnType("integer");
 
                     b.Property<long>("EFClientStatisticsServerId")
-                        .HasColumnType("bigint")
+                        .HasColumnName("EFClientStatisticsServerId")
-                        .HasColumnName("EFClientStatisticsServerId");
+                        .HasColumnType("bigint");
 
                     b.Property<int>("HitCount")
                         .HasColumnType("integer");
@@ -599,16 +586,15 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("EFClientStatisticsClientId", "EFClientStatisticsServerId");
 
-                    b.ToTable("EFHitLocationCounts", (string)null);
+                    b.ToTable("EFHitLocationCounts");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFRating", b =>
                 {
                     b.Property<int>("RatingId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
+                        .HasColumnType("integer")
-
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("RatingId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
@@ -644,16 +630,15 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("When", "ServerId", "Performance", "ActivityAmount");
 
-                    b.ToTable("EFRating", (string)null);
+                    b.ToTable("EFRating");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFHitLocation", b =>
                 {
                     b.Property<int>("HitLocationId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
+                        .HasColumnType("integer")
-
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("HitLocationId"));
 
                     b.Property<DateTime>("CreatedDateTime")
                         .HasColumnType("timestamp without time zone");
@@ -672,16 +657,15 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("Name");
 
-                    b.ToTable("EFHitLocations", (string)null);
+                    b.ToTable("EFHitLocations");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFMap", b =>
                 {
                     b.Property<int>("MapId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
+                        .HasColumnType("integer")
-
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("MapId"));
 
                     b.Property<DateTime>("CreatedDateTime")
                         .HasColumnType("timestamp without time zone");
@@ -698,16 +682,15 @@ namespace Data.Migrations.Postgresql
 
                     b.HasKey("MapId");
 
-                    b.ToTable("EFMaps", (string)null);
+                    b.ToTable("EFMaps");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFMeansOfDeath", b =>
                 {
                     b.Property<int>("MeansOfDeathId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
+                        .HasColumnType("integer")
-
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("MeansOfDeathId"));
 
                     b.Property<DateTime>("CreatedDateTime")
                         .HasColumnType("timestamp without time zone");
@@ -724,16 +707,15 @@ namespace Data.Migrations.Postgresql
 
                     b.HasKey("MeansOfDeathId");
 
-                    b.ToTable("EFMeansOfDeath", (string)null);
+                    b.ToTable("EFMeansOfDeath");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFWeapon", b =>
                 {
                     b.Property<int>("WeaponId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
+                        .HasColumnType("integer")
-
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("WeaponId"));
 
                     b.Property<DateTime>("CreatedDateTime")
                         .HasColumnType("timestamp without time zone");
@@ -752,16 +734,15 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("Name");
 
-                    b.ToTable("EFWeapons", (string)null);
+                    b.ToTable("EFWeapons");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFWeaponAttachment", b =>
                 {
                     b.Property<int>("WeaponAttachmentId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
+                        .HasColumnType("integer")
-
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("WeaponAttachmentId"));
 
                     b.Property<DateTime>("CreatedDateTime")
                         .HasColumnType("timestamp without time zone");
@@ -778,16 +759,15 @@ namespace Data.Migrations.Postgresql
 
                     b.HasKey("WeaponAttachmentId");
 
-                    b.ToTable("EFWeaponAttachments", (string)null);
+                    b.ToTable("EFWeaponAttachments");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFWeaponAttachmentCombo", b =>
                 {
                     b.Property<int>("WeaponAttachmentComboId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
+                        .HasColumnType("integer")
-
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("WeaponAttachmentComboId"));
 
                     b.Property<int>("Attachment1Id")
                         .HasColumnType("integer");
@@ -815,16 +795,15 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("Attachment3Id");
 
-                    b.ToTable("EFWeaponAttachmentCombos", (string)null);
+                    b.ToTable("EFWeaponAttachmentCombos");
                 });
 
             modelBuilder.Entity("Data.Models.EFAlias", b =>
                 {
                     b.Property<int>("AliasId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
+                        .HasColumnType("integer")
-
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("AliasId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
@@ -840,12 +819,12 @@ namespace Data.Migrations.Postgresql
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
-                        .HasColumnType("character varying(24)");
+                        .HasMaxLength(24);
 
                     b.Property<string>("SearchableName")
-                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
-                        .HasColumnType("character varying(24)");
+                        .HasMaxLength(24);
 
                     b.HasKey("AliasId");
 
@@ -857,41 +836,40 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("SearchableName");
 
-                    b.HasIndex("Name", "IPAddress");
+                    b.HasIndex("Name", "IPAddress")
+                        .IsUnique();
 
-                    b.ToTable("EFAlias", (string)null);
+                    b.ToTable("EFAlias");
                 });
 
             modelBuilder.Entity("Data.Models.EFAliasLink", b =>
                 {
                     b.Property<int>("AliasLinkId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
+                        .HasColumnType("integer")
-
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("AliasLinkId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
 
                     b.HasKey("AliasLinkId");
 
-                    b.ToTable("EFAliasLinks", (string)null);
+                    b.ToTable("EFAliasLinks");
                 });
 
             modelBuilder.Entity("Data.Models.EFChangeHistory", b =>
                 {
                     b.Property<int>("ChangeHistoryId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
+                        .HasColumnType("integer")
-
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ChangeHistoryId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
 
                     b.Property<string>("Comment")
-                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)")
-                        .HasColumnType("character varying(128)");
+                        .HasMaxLength(128);
 
                     b.Property<string>("CurrentValue")
                         .HasColumnType("text");
@@ -923,9 +901,8 @@ namespace Data.Migrations.Postgresql
                 {
                     b.Property<int>("MetaId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
+                        .HasColumnType("integer")
-
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("MetaId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
@@ -941,8 +918,8 @@ namespace Data.Migrations.Postgresql
 
                     b.Property<string>("Key")
                         .IsRequired()
-                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)")
-                        .HasColumnType("character varying(32)");
+                        .HasMaxLength(32);
 
                     b.Property<int?>("LinkedMetaId")
                         .HasColumnType("integer");
@@ -969,9 +946,8 @@ namespace Data.Migrations.Postgresql
                 {
                     b.Property<int>("PenaltyId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
+                        .HasColumnType("integer")
-
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("PenaltyId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
@@ -985,7 +961,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")
@@ -1012,50 +988,15 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("PunisherId");
 
-                    b.ToTable("EFPenalties", (string)null);
+                    b.ToTable("EFPenalties");
-                });
-
-            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");
+                        .HasColumnType("integer")
-
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("InboxMessageId"));
 
                     b.Property<DateTime>("CreatedDateTime")
                         .HasColumnType("timestamp without time zone");
@@ -1114,16 +1055,15 @@ namespace Data.Migrations.Postgresql
 
                     b.HasKey("ServerId");
 
-                    b.ToTable("EFServers", (string)null);
+                    b.ToTable("EFServers");
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerSnapshot", b =>
                 {
                     b.Property<long>("ServerSnapshotId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
+                        .HasColumnType("bigint")
-
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("ServerSnapshotId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
@@ -1149,16 +1089,15 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFServerSnapshot", (string)null);
+                    b.ToTable("EFServerSnapshot");
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerStatistics", b =>
                 {
                     b.Property<int>("StatisticId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
+                        .HasColumnType("integer")
-
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("StatisticId"));
 
                     b.Property<bool>("Active")
                         .HasColumnType("boolean");
@@ -1176,16 +1115,15 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFServerStatistics", (string)null);
+                    b.ToTable("EFServerStatistics");
                 });
 
             modelBuilder.Entity("Data.Models.Vector3", b =>
                 {
                     b.Property<int>("Vector3Id")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
+                        .HasColumnType("integer")
-
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Vector3Id"));
 
                     b.Property<float>("X")
                         .HasColumnType("real");
@@ -1198,7 +1136,7 @@ namespace Data.Migrations.Postgresql
 
                     b.HasKey("Vector3Id");
 
-                    b.ToTable("Vector3", (string)null);
+                    b.ToTable("Vector3");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFACSnapshotVector3", b =>
@@ -1214,10 +1152,6 @@ namespace Data.Migrations.Postgresql
                         .HasForeignKey("Vector3Id")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Snapshot");
-
-                    b.Navigation("Vector");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClient", b =>
@@ -1233,10 +1167,6 @@ namespace Data.Migrations.Postgresql
                         .HasForeignKey("CurrentAliasId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("AliasLink");
-
-                    b.Navigation("CurrentAlias");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientConnectionHistory", b =>
@@ -1252,10 +1182,6 @@ namespace Data.Migrations.Postgresql
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientKill", b =>
@@ -1289,18 +1215,6 @@ 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 =>
@@ -1316,10 +1230,6 @@ namespace Data.Migrations.Postgresql
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFACSnapshot", b =>
@@ -1357,18 +1267,6 @@ 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 =>
@@ -1398,18 +1296,6 @@ 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 =>
@@ -1423,10 +1309,6 @@ 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 =>
@@ -1436,8 +1318,6 @@ namespace Data.Migrations.Postgresql
                         .HasForeignKey("ClientId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Client");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientStatistics", b =>
@@ -1453,10 +1333,6 @@ namespace Data.Migrations.Postgresql
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFHitLocationCount", b =>
@@ -1478,10 +1354,6 @@ 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 =>
@@ -1495,10 +1367,6 @@ 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 =>
@@ -1516,12 +1384,6 @@ 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 =>
@@ -1531,8 +1393,6 @@ namespace Data.Migrations.Postgresql
                         .HasForeignKey("LinkId")
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
-
-                    b.Navigation("Link");
                 });
 
             modelBuilder.Entity("Data.Models.EFMeta", b =>
@@ -1545,17 +1405,15 @@ 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");
+                        .HasForeignKey("LinkId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
 
                     b.HasOne("Data.Models.Client.EFClient", "Offender")
                         .WithMany("ReceivedPenalties")
@@ -1568,23 +1426,6 @@ 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 =>
@@ -1604,12 +1445,6 @@ 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 =>
@@ -1625,10 +1460,6 @@ namespace Data.Migrations.Postgresql
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Map");
-
-                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerStatistics", b =>
@@ -1638,39 +1469,6 @@ 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/20220102214442_RemoveUniqueAliasIndexConstraint.cs

@@ -1,15 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace Data.Migrations.Sqlite
-{
-    public partial class RemoveUniqueAliasIndexConstraint : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-        }
-    }
-}

Data/Migrations/Sqlite/20220222161952_AddEFPenaltyIdentifier.cs

@@ -1,55 +0,0 @@
-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

@@ -1,56 +0,0 @@
-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

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

Data/Migrations/Sqlite/SqliteDatabaseContextModelSnapshot.cs

@@ -5,8 +5,6 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
-#nullable disable
-
 namespace Data.Migrations.Sqlite
 {
     [DbContext(typeof(SqliteDatabaseContext))]
@@ -15,7 +13,8 @@ namespace Data.Migrations.Sqlite
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "6.0.1");
+            modelBuilder
+                .HasAnnotation("ProductVersion", "3.1.10");
 
             modelBuilder.Entity("Data.Models.Client.EFACSnapshotVector3", b =>
                 {
@@ -38,7 +37,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("Vector3Id");
 
-                    b.ToTable("EFACSnapshotVector3", (string)null);
+                    b.ToTable("EFACSnapshotVector3");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClient", b =>
@@ -92,7 +91,7 @@ namespace Data.Migrations.Sqlite
                     b.HasIndex("NetworkId")
                         .IsUnique();
 
-                    b.ToTable("EFClients", (string)null);
+                    b.ToTable("EFClients");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientConnectionHistory", b =>
@@ -124,7 +123,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFClientConnectionHistory", (string)null);
+                    b.ToTable("EFClientConnectionHistory");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientKill", b =>
@@ -198,7 +197,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("ViewAnglesVector3Id");
 
-                    b.ToTable("EFClientKills", (string)null);
+                    b.ToTable("EFClientKills");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientMessage", b =>
@@ -233,7 +232,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("TimeSent");
 
-                    b.ToTable("EFClientMessages", (string)null);
+                    b.ToTable("EFClientMessages");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFACSnapshot", b =>
@@ -340,7 +339,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFACSnapshot", (string)null);
+                    b.ToTable("EFACSnapshot");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientHitStatistic", b =>
@@ -414,7 +413,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("WeaponId");
 
-                    b.ToTable("EFClientHitStatistics", (string)null);
+                    b.ToTable("EFClientHitStatistics");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientRankingHistory", b =>
@@ -459,7 +458,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("ZScore");
 
-                    b.ToTable("EFClientRankingHistory", (string)null);
+                    b.ToTable("EFClientRankingHistory");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientRatingHistory", b =>
@@ -478,7 +477,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("ClientId");
 
-                    b.ToTable("EFClientRatingHistory", (string)null);
+                    b.ToTable("EFClientRatingHistory");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientStatistics", b =>
@@ -536,7 +535,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("ClientId", "TimePlayed", "ZScore");
 
-                    b.ToTable("EFClientStatistics", (string)null);
+                    b.ToTable("EFClientStatistics");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFHitLocationCount", b =>
@@ -549,12 +548,12 @@ namespace Data.Migrations.Sqlite
                         .HasColumnType("INTEGER");
 
                     b.Property<int>("EFClientStatisticsClientId")
-                        .HasColumnType("INTEGER")
+                        .HasColumnName("EFClientStatisticsClientId")
-                        .HasColumnName("EFClientStatisticsClientId");
+                        .HasColumnType("INTEGER");
 
                     b.Property<long>("EFClientStatisticsServerId")
-                        .HasColumnType("INTEGER")
+                        .HasColumnName("EFClientStatisticsServerId")
-                        .HasColumnName("EFClientStatisticsServerId");
+                        .HasColumnType("INTEGER");
 
                     b.Property<int>("HitCount")
                         .HasColumnType("INTEGER");
@@ -574,7 +573,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("EFClientStatisticsClientId", "EFClientStatisticsServerId");
 
-                    b.ToTable("EFHitLocationCounts", (string)null);
+                    b.ToTable("EFHitLocationCounts");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFRating", b =>
@@ -617,7 +616,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("When", "ServerId", "Performance", "ActivityAmount");
 
-                    b.ToTable("EFRating", (string)null);
+                    b.ToTable("EFRating");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFHitLocation", b =>
@@ -643,7 +642,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("Name");
 
-                    b.ToTable("EFHitLocations", (string)null);
+                    b.ToTable("EFHitLocations");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFMap", b =>
@@ -667,7 +666,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasKey("MapId");
 
-                    b.ToTable("EFMaps", (string)null);
+                    b.ToTable("EFMaps");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFMeansOfDeath", b =>
@@ -691,7 +690,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasKey("MeansOfDeathId");
 
-                    b.ToTable("EFMeansOfDeath", (string)null);
+                    b.ToTable("EFMeansOfDeath");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFWeapon", b =>
@@ -717,7 +716,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("Name");
 
-                    b.ToTable("EFWeapons", (string)null);
+                    b.ToTable("EFWeapons");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFWeaponAttachment", b =>
@@ -741,7 +740,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasKey("WeaponAttachmentId");
 
-                    b.ToTable("EFWeaponAttachments", (string)null);
+                    b.ToTable("EFWeaponAttachments");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFWeaponAttachmentCombo", b =>
@@ -776,7 +775,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("Attachment3Id");
 
-                    b.ToTable("EFWeaponAttachmentCombos", (string)null);
+                    b.ToTable("EFWeaponAttachmentCombos");
                 });
 
             modelBuilder.Entity("Data.Models.EFAlias", b =>
@@ -799,12 +798,12 @@ namespace Data.Migrations.Sqlite
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasMaxLength(24)
+                        .HasColumnType("TEXT")
-                        .HasColumnType("TEXT");
+                        .HasMaxLength(24);
 
                     b.Property<string>("SearchableName")
-                        .HasMaxLength(24)
+                        .HasColumnType("TEXT")
-                        .HasColumnType("TEXT");
+                        .HasMaxLength(24);
 
                     b.HasKey("AliasId");
 
@@ -816,9 +815,10 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("SearchableName");
 
-                    b.HasIndex("Name", "IPAddress");
+                    b.HasIndex("Name", "IPAddress")
+                        .IsUnique();
 
-                    b.ToTable("EFAlias", (string)null);
+                    b.ToTable("EFAlias");
                 });
 
             modelBuilder.Entity("Data.Models.EFAliasLink", b =>
@@ -832,7 +832,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasKey("AliasLinkId");
 
-                    b.ToTable("EFAliasLinks", (string)null);
+                    b.ToTable("EFAliasLinks");
                 });
 
             modelBuilder.Entity("Data.Models.EFChangeHistory", b =>
@@ -845,8 +845,8 @@ namespace Data.Migrations.Sqlite
                         .HasColumnType("INTEGER");
 
                     b.Property<string>("Comment")
-                        .HasMaxLength(128)
+                        .HasColumnType("TEXT")
-                        .HasColumnType("TEXT");
+                        .HasMaxLength(128);
 
                     b.Property<string>("CurrentValue")
                         .HasColumnType("TEXT");
@@ -894,8 +894,8 @@ namespace Data.Migrations.Sqlite
 
                     b.Property<string>("Key")
                         .IsRequired()
-                        .HasMaxLength(32)
+                        .HasColumnType("TEXT")
-                        .HasColumnType("TEXT");
+                        .HasMaxLength(32);
 
                     b.Property<int?>("LinkedMetaId")
                         .HasColumnType("INTEGER");
@@ -936,7 +936,7 @@ namespace Data.Migrations.Sqlite
                     b.Property<bool>("IsEvadedOffense")
                         .HasColumnType("INTEGER");
 
-                    b.Property<int?>("LinkId")
+                    b.Property<int>("LinkId")
                         .HasColumnType("INTEGER");
 
                     b.Property<int>("OffenderId")
@@ -963,39 +963,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("PunisherId");
 
-                    b.ToTable("EFPenalties", (string)null);
+                    b.ToTable("EFPenalties");
-                });
-
-            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 =>
@@ -1061,7 +1029,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasKey("ServerId");
 
-                    b.ToTable("EFServers", (string)null);
+                    b.ToTable("EFServers");
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerSnapshot", b =>
@@ -1094,7 +1062,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFServerSnapshot", (string)null);
+                    b.ToTable("EFServerSnapshot");
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerStatistics", b =>
@@ -1119,7 +1087,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFServerStatistics", (string)null);
+                    b.ToTable("EFServerStatistics");
                 });
 
             modelBuilder.Entity("Data.Models.Vector3", b =>
@@ -1139,7 +1107,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasKey("Vector3Id");
 
-                    b.ToTable("Vector3", (string)null);
+                    b.ToTable("Vector3");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFACSnapshotVector3", b =>
@@ -1155,10 +1123,6 @@ namespace Data.Migrations.Sqlite
                         .HasForeignKey("Vector3Id")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Snapshot");
-
-                    b.Navigation("Vector");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClient", b =>
@@ -1174,10 +1138,6 @@ namespace Data.Migrations.Sqlite
                         .HasForeignKey("CurrentAliasId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("AliasLink");
-
-                    b.Navigation("CurrentAlias");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientConnectionHistory", b =>
@@ -1193,10 +1153,6 @@ namespace Data.Migrations.Sqlite
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientKill", b =>
@@ -1230,18 +1186,6 @@ 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 =>
@@ -1257,10 +1201,6 @@ namespace Data.Migrations.Sqlite
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFACSnapshot", b =>
@@ -1298,18 +1238,6 @@ 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 =>
@@ -1339,18 +1267,6 @@ 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 =>
@@ -1364,10 +1280,6 @@ 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 =>
@@ -1377,8 +1289,6 @@ namespace Data.Migrations.Sqlite
                         .HasForeignKey("ClientId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Client");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientStatistics", b =>
@@ -1394,10 +1304,6 @@ namespace Data.Migrations.Sqlite
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFHitLocationCount", b =>
@@ -1419,10 +1325,6 @@ 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 =>
@@ -1436,10 +1338,6 @@ 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 =>
@@ -1457,12 +1355,6 @@ 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 =>
@@ -1472,8 +1364,6 @@ namespace Data.Migrations.Sqlite
                         .HasForeignKey("LinkId")
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
-
-                    b.Navigation("Link");
                 });
 
             modelBuilder.Entity("Data.Models.EFMeta", b =>
@@ -1486,17 +1376,15 @@ 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");
+                        .HasForeignKey("LinkId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
 
                     b.HasOne("Data.Models.Client.EFClient", "Offender")
                         .WithMany("ReceivedPenalties")
@@ -1509,23 +1397,6 @@ 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 =>
@@ -1545,12 +1416,6 @@ 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 =>
@@ -1566,10 +1431,6 @@ namespace Data.Migrations.Sqlite
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Map");
-
-                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerStatistics", b =>
@@ -1579,39 +1440,6 @@ 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/Client/Stats/EFClientStatistics.cs

@@ -57,11 +57,10 @@ namespace Data.Models.Client.Stats
         public double MaxStrain { get; set; }
 
         [NotMapped]
-        public float AverageHitOffset =>
+        public float AverageHitOffset
-            (float) Math.Round(
+        {
-                HitLocations.Sum(c => c.HitOffsetAverage) /
+            get => (float)Math.Round(HitLocations.Sum(c => c.HitOffsetAverage) / Math.Max(1, HitLocations.Where(c => c.HitOffsetAverage > 0).Count()), 4);
-                Math.Max(1, HitLocations.Count(c => c.HitOffsetAverage > 0)), 4);
+        }
-
         [NotMapped]
         public int SessionKills { get; set; }
         [NotMapped]
@@ -83,26 +82,26 @@ namespace Data.Models.Client.Stats
             KillStreak = 0;
             DeathStreak = 0;
             LastScore = 0;
-            _sessionScores.Add(0);
+            SessionScores.Add(0);
             Team = 0;
         }
         [NotMapped]
         public int SessionScore
         {
-            set => _sessionScores[^1] = value;
+            set => SessionScores[SessionScores.Count - 1] = value;
 
             get
             {
-                lock (_sessionScores)
+                lock (SessionScores)
                 {
-                    return new List<int>(_sessionScores).Sum();
+                    return new List<int>(SessionScores).Sum();
                 }
             }
         }
         [NotMapped]
-        public int RoundScore => _sessionScores[^1];
+        public int RoundScore => SessionScores[SessionScores.Count - 1];
         [NotMapped]
-        private readonly List<int> _sessionScores = new List<int> { 0 };
+        private readonly List<int> SessionScores = new List<int>() { 0 };
         [NotMapped]
         public int Team { get; set; }
         [NotMapped]
@@ -110,21 +109,6 @@ namespace Data.Models.Client.Stats
         [NotMapped]
         public double SessionSPM { get; set; }
         [NotMapped]
-        public SemaphoreSlim ProcessingHit { get; }
+        public SemaphoreSlim ProcessingHit { get; private set; }
-
-        [NotMapped] public MatchData MatchData { get; } = new MatchData();
-    }
-
-    public class MatchData
-    {
-        public int Kills { get; set; }
-        public int Deaths { get; set; }
-        public double Kdr => Deaths == 0 ? Kills : Math.Round(Kills / (double) Deaths, 2);
-
-        public void StartNewMatch()
-        {
-            Kills = 0;
-            Deaths = 0;
-        }
     }
 }

Data/Models/EFPenalty.cs

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

Data/Models/EFPenaltyIdentifier.cs

@@ -1,22 +0,0 @@
-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/Vector3.cs

@@ -1,8 +1,6 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.Text.RegularExpressions;
-// ReSharper disable CompareOfFloatsByEqualityOperator
-#pragma warning disable CS0659
 
 namespace Data.Models
 {
@@ -112,4 +110,4 @@ namespace Data.Models
 
         public double AngleBetween(Vector3 a) => Math.Acos(this.DotProduct(a) / (a.Magnitude() * this.Magnitude()));
     }
-}
+}

DeploymentFiles/UpdateIW4MAdmin.ps1

@@ -1,118 +0,0 @@
-param (
-    [Parameter(HelpMessage = "Do not prompt for any user input")]
-    [switch]$Silent = $False,
-
-    [Parameter(HelpMessage = "Clean unneeded files listed in _delete.txt after update")]
-    [switch]$Clean = $False,
-
-    [Parameter(HelpMessage = "Only update releases in the verified stream")]
-    [switch]$Verified = $False,
-
-    [Parameter(HelpMessage = "Directory to install to")]
-    [ValidateScript({
-        if (-Not($_ | Test-Path))
-        {
-            throw "File or folder does not exist"
-        } return $true
-    })]
-    [System.IO.FileInfo]$Directory
-)
-
-Write-Output "======================================="
-Write-Output " IW4MAdmin Updater v1                  "
-Write-Output " by XERXES & RaidMax                   "
-Write-Output "======================================="
-
-$stopwatch = [system.diagnostics.stopwatch]::StartNew()
-$repoName = "RaidMax/IW4M-Admin"
-$assetPattern = "IW4MAdmin-20*.zip"
-
-if ($Verified)
-{
-    $releasesUri = "https://api.github.com/repos/$repoName/releases/latest"
-}
-
-else
-{
-    $releasesUri = "https://api.github.com/repos/$repoName/releases"
-}
-
-Write-Output "Retrieving latest version info..."
-
-$releaseInfo = (Invoke-WebRequest $releasesUri | ConvertFrom-Json) | Select -First 1
-$asset = $releaseInfo.assets | Where-Object name -like $assetPattern | Select -First 1
-$downloadUri = $asset.browser_download_url
-$filename = Split-Path $downloadUri -leaf
-
-Write-Output "The latest version is $( $releaseInfo.tag_name ) released $( $releaseInfo.published_at )"
-
-if (!$Silent)
-{
-    $stopwatch.Stop()
-    Write-Warning "All IW4MAdmin files will be updated. Your database and configuration will not be modified. Are you sure you want to continue?" -WarningAction Inquire
-    $stopwatch.Start()
-}
-
-Write-Output "Downloading update. This might take a moment..."
-
-$fileDownload = Invoke-WebRequest -Uri $downloadUri
-if ($fileDownload.StatusDescription -ne "OK")
-{
-    throw "Could not update IW4MAdmin. ($fileDownload.StatusDescription)"
-}
-
-$remoteHash = $fileDownload.Headers['Content-MD5']
-$decodedHash = [System.BitConverter]::ToString([System.Convert]::FromBase64String($remoteHash)).replace('-', '')
-$directoryPath = Get-Location
-$fullPath = "$directoryPath\$filename"
-$outputFile = [System.IO.File]::Open($fullPath, 2)
-$stream = [System.IO.BinaryWriter]::new($outputFile)
-
-if ($Directory)
-{
-    $outputDir = $Directory
-}
-
-else
-{
-    $outputDir = Get-Location
-}
-
-try
-{
-    $stream.Write($fileDownload.Content)
-}
-finally
-{
-    $stream.Dispose()
-    $outputFile.Dispose()
-}
-
-$localHash = (Get-FileHash -Path $fullPath -Algorithm MD5).Hash
-
-if ($localHash -ne $decodedHash)
-{
-    throw "Failed to update. File hashes don't match!"
-}
-
-Write-Output "Extracting $filename to $outputDir"
-Expand-Archive -Path $fullPath -DestinationPath $outputDir -Force
-
-if ($Clean)
-{
-    Write-Output "Running post-update clean..."
-    $DeleteList = Get-Content -Path ./_delete.txt
-    ForEach ($file in $DeleteList)
-    {
-        Write-Output "Deleting $file"
-        Remove-Item -Path $file
-    }
-}
-
-Write-Output "Removing temporary files..."
-Remove-Item -Force $fullPath
-
-$stopwatch.Stop()
-$executionTime = [math]::Round($stopwatch.Elapsed.TotalSeconds, 0)
-
-Write-Output "Update completed successfully in $executionTime seconds!"

DeploymentFiles/UpdateIW4MAdmin.sh

@@ -1,106 +0,0 @@
-#!/bin/bash
-echo "======================================="
-echo " IW4MAdmin Updater v1                  "
-echo "======================================="
-
-while getopts scvd: flag
-do
-    case "${flag}" in
-        s) silent='true';;
-        c) clean='true';;
-        v) verified='true';;
-        d) directory=${OPTARG};;
-        *) exit 1;;
-    esac
-done
-
-start=$SECONDS
-repoName="RaidMax/IW4M-Admin"
-releaseUri="https://api.github.com/repos/$repoName/releases"
-
-echo "Retrieving latest version info..."
-
-if [ ! "$directory" ]
-then
-  directory=$(pwd)
-else
-  if [ ! -d "$directory" ]
-    then
-      mkdir "$directory"
-  fi
-fi
-
-if [ "$verified" ]
-then
-  releaseUri="https://api.github.com/repos/$repoName/releases/latest"
-fi
-
-releaseInfo=$(curl -s "${releaseUri}")
-downloadUri=$(echo "$releaseInfo" | grep "browser_download_url" | cut -d '"' -f 4"" | head -n1)
-publishDate=$(echo "$releaseInfo"| grep "published_at" | cut -d '"' -f 4"" | head -n1)
-releaseTitle=$(echo "$releaseInfo" | grep "tag_name" | cut -d '"' -f 4"" | head -n1)
-filename=$(basename $downloadUri)
-fullpath="$directory/$filename"
-
-echo "The latest version is $releaseTitle released $publishDate"
-
-if [[ ! "$silent" ]]
-  then
-  echo -e "\033[33mAll IW4MAdmin files will be updated.\033[0m"
-  echo -e "\033[33mYour database and configuration will not be modified.\033[0m"
-  read -p "Are you sure you want to continue [Y/N]? " -n 1 -r
-  echo 
-  if ! [[ $REPLY =~ ^[Yy]$ ]]
-  then
-     exit 0
-  fi
-fi
-
-echo "Downloading update. This might take a moment..."
-
-wget -q "$downloadUri" -O "$fullpath"
-
-if [[ $? -ne 0 ]]
-then
-  echo "Could not download update files!"
-  exit 1
-fi
-
-echo "Extracting $filename to $directory"
-
-unzip -o -q "$fullpath" -d "$directory"
-
-if [[ $? -ne 0 ]]
-then
-  echo "Could not extract update files!"
-  exit 1
-fi
-
-if [[ "$clean" ]]
-then
-  echo "Running post-update clean..."
-  cat "_delete.txt" | while read -r line || [[ -n $line ]];
-  do
-    rm -f "$directory/$line"
-    if [[ $? -ne 0 ]]
-    then
-      echo "Could not clean $directory/$line!"
-      exit 1
-    fi
-  done
-fi
-
-echo "Removing temporary files..."
-rm -f "$fullpath"
-
-if [[ $? -ne 0 ]]
-then
-  echo "Could not remove update files!"
-  exit 1
-fi
-
-chmod +x "$directory/StartIW4MAdmin.sh"
-chmod +x "$directory/UpdateIW4MAdmin.sh"
-
-executionTime=$(($SECONDS - start))
-echo "Update completed successfully in $executionTime seconds!"

DeploymentFiles/deployment-pipeline.yml

@@ -10,7 +10,7 @@ trigger:
 pr: none
 
 pool:
-  vmImage: 'windows-2022'
+  vmImage: 'windows-latest'
 
 variables:
   solution: 'IW4MAdmin.sln'
@@ -21,15 +21,6 @@ variables:
   isPreRelease: false
 
 steps:
-- task: UseDotNet@2
-  displayName: 'Install .NET Core 6 SDK'
-  inputs:
-    packageType: 'sdk'
-    version: '6.0.x'
-    includePreviewVersions: true
-
-- task: NuGetToolInstaller@1
-
 - task: PowerShell@2
   displayName: 'Setup Pre-Release configuration'
   condition: eq(variables['Build.SourceBranch'], 'refs/heads/release/pre')
@@ -40,7 +31,7 @@ steps:
             echo '##vso[task.setvariable variable=buildConfiguration]Prerelease'
             echo '##vso[task.setvariable variable=isPreRelease]true'
     failOnStderr: true
-  
+
 - task: NuGetCommand@2
   displayName: 'Restore nuget packages'
   inputs:
@@ -64,20 +55,6 @@ steps:
     msbuildArgs: '/p:DeployOnBuild=false /p:PackageAsSingleFile=false /p:SkipInvalidConfigurations=true /p:PackageLocation="$(build.artifactStagingDirectory)" /p:Version=$(Build.BuildNumber)'
     platform: '$(buildPlatform)'
     configuration: '$(buildConfiguration)'
-      
-- task: PowerShell@2
-  displayName: 'Bundle JS Files'
-  inputs:
-    targetType: 'inline'
-    script: |
-      Write-Host 'Getting dotnet bundle'
-      wget http://raidmax.org/IW4MAdmin/res/dotnet-bundle.zip -o $(Build.Repository.LocalPath)\dotnet-bundle.zip
-      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 $(Build.Repository.LocalPath)\WebfrontCore\bundleconfig.json
-    failOnStderr: true
-    workingDirectory: '$(Build.Repository.LocalPath)\WebfrontCore'
 
 - task: DotNetCoreCLI@2
   displayName: 'Publish projects'
@@ -104,7 +81,7 @@ steps:
   inputs:
     filename: 'Application\BuildScripts\PostPublish.bat'
     workingFolder: '$(Build.Repository.LocalPath)'
-    arguments: '$(outputFolder) $(Build.Repository.LocalPath)'
+    arguments: '$(outputFolder)'
     failOnStandardError: true
 
 - task: PowerShell@2
@@ -121,7 +98,6 @@ steps:
     script: |
       echo changing to encoding for linux start script
       dos2unix $(outputFolder)\StartIW4MAdmin.sh
-      dos2unix $(outputFolder)\UpdateIW4MAdmin.sh
       echo creating website version filename
       @echo IW4MAdmin-$(Build.BuildNumber) > $(Build.ArtifactStagingDirectory)\version_$(releaseType).txt
     workingDirectory: '$(Build.Repository.LocalPath)\Application\BuildScripts'
@@ -163,11 +139,6 @@ steps:
     archiveFile: '$(Build.ArtifactStagingDirectory)/IW4MAdmin-$(Build.BuildNumber).zip'
     replaceExistingArchive: true
 
-- task: PublishPipelineArtifact@1
-  inputs:
-    targetPath: '$(Build.ArtifactStagingDirectory)/IW4MAdmin-$(Build.BuildNumber).zip'
-    artifact: 'IW4MAdmin-$(Build.BuildNumber).zip'
-
 - task: FtpUpload@2
   displayName: 'Upload zip file to website'
   inputs:

GameFiles/IW4x/userraw/scripts/_commands.gsc

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

GameFiles/IW4x/userraw/scripts/_customcallbacks.gsc

@@ -144,7 +144,6 @@ waitForFrameThread()
 
 waitForAdditionalAngles( logString, beforeFrameCount, afterFrameCount )
 {
-    self endon( "disconnect" );
 	currentIndex = self.currentAnglePosition;
 	wait( 0.05 * afterFrameCount );
 	
@@ -254,4 +253,4 @@ Callback_PlayerDisconnect()
 {
 	level notify( "disconnected", self );
 	self maps\mp\gametypes\_playerlogic::Callback_PlayerDisconnect();
-}
+}

GameFiles/IW4x/userraw/scripts/_integration.gsc

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

IW4MAdmin.sln

@@ -6,14 +6,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{26E8
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8C8F3945-0AEF-4949-A1F7-B18E952E50BC}"
 	ProjectSection(SolutionItems) = preProject
+		GameFiles\IW4x\userraw\scripts\_commands.gsc = GameFiles\IW4x\userraw\scripts\_commands.gsc
 		GameFiles\IW4x\userraw\scripts\_customcallbacks.gsc = GameFiles\IW4x\userraw\scripts\_customcallbacks.gsc
 		DeploymentFiles\deployment-pipeline.yml = DeploymentFiles\deployment-pipeline.yml
 		DeploymentFiles\PostPublish.ps1 = DeploymentFiles\PostPublish.ps1
 		README.md = README.md
 		version.txt = version.txt
-		DeploymentFiles\UpdateIW4MAdmin.ps1 = DeploymentFiles\UpdateIW4MAdmin.ps1
-		DeploymentFiles\UpdateIW4MAdmin.sh = DeploymentFiles\UpdateIW4MAdmin.sh
-		GameFiles\IW4x\userraw\scripts\_integration.gsc = GameFiles\IW4x\userraw\scripts\_integration.gsc
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharedLibraryCore", "SharedLibraryCore\SharedLibraryCore.csproj", "{AA0541A2-8D51-4AD9-B0AC-3D1F5B162481}"
@@ -30,6 +28,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProfanityDeterment", "Plugi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Login", "Plugins\Login\Login.csproj", "{D9F2ED28-6FA5-40CA-9912-E7A849147AB1}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IW4ScriptCommands", "Plugins\IW4ScriptCommands\IW4ScriptCommands.csproj", "{6C706CE5-A206-4E46-8712-F8C48D526091}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ScriptPlugins", "ScriptPlugins", "{3F9ACC27-26DB-49FA-BCD2-50C54A49C9FA}"
 	ProjectSection(SolutionItems) = preProject
 		Plugins\ScriptPlugins\ActionOnReport.js = Plugins\ScriptPlugins\ActionOnReport.js
@@ -49,8 +49,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ScriptPlugins", "ScriptPlug
 		Plugins\ScriptPlugins\ParserS1x.js = Plugins\ScriptPlugins\ParserS1x.js
 		Plugins\ScriptPlugins\ParserCSGO.js = Plugins\ScriptPlugins\ParserCSGO.js
 		Plugins\ScriptPlugins\ParserCSGOSM.js = Plugins\ScriptPlugins\ParserCSGOSM.js
-		Plugins\ScriptPlugins\ParserPlutoniumT4COZM.js = Plugins\ScriptPlugins\ParserPlutoniumT4COZM.js
-		Plugins\ScriptPlugins\GameInterface.js = Plugins\ScriptPlugins\GameInterface.js
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomessageFeed", "Plugins\AutomessageFeed\AutomessageFeed.csproj", "{F5815359-CFC7-44B4-9A3B-C04BACAD5836}"
@@ -59,6 +57,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LiveRadar", "Plugins\LiveRa
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{3065279E-17F0-4CE0-AF5B-014E04263D77}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationTests", "Tests\ApplicationTests\ApplicationTests.csproj", "{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data", "Data\Data.csproj", "{81689023-E55E-48ED-B7A8-53F4E21BBF2D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Integrations", "Integrations", "{A2AE33B4-0830-426A-9E11-951DAB12BE5B}"
@@ -251,6 +251,30 @@ Global
 		{D9F2ED28-6FA5-40CA-9912-E7A849147AB1}.Release|x64.Build.0 = Release|Any CPU
 		{D9F2ED28-6FA5-40CA-9912-E7A849147AB1}.Release|x86.ActiveCfg = Release|Any CPU
 		{D9F2ED28-6FA5-40CA-9912-E7A849147AB1}.Release|x86.Build.0 = Release|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|x64.Build.0 = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|x86.Build.0 = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|Any CPU.Build.0 = Prerelease|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|x64.ActiveCfg = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|x64.Build.0 = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|x86.ActiveCfg = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|x86.Build.0 = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|x64.ActiveCfg = Release|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|x64.Build.0 = Release|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|x86.ActiveCfg = Release|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|x86.Build.0 = Release|Any CPU
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -299,6 +323,29 @@ Global
 		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Release|x64.Build.0 = Release|Any CPU
 		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Release|x86.ActiveCfg = Release|Any CPU
 		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Release|x86.Build.0 = Release|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Debug|x64.Build.0 = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Debug|x86.Build.0 = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Prerelease|Any CPU.ActiveCfg = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Prerelease|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Prerelease|Mixed Platforms.Build.0 = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Prerelease|x64.ActiveCfg = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Prerelease|x64.Build.0 = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Prerelease|x86.ActiveCfg = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Prerelease|x86.Build.0 = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Release|x64.ActiveCfg = Release|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Release|x64.Build.0 = Release|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Release|x86.ActiveCfg = Release|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Release|x86.Build.0 = Release|Any CPU
 		{81689023-E55E-48ED-B7A8-53F4E21BBF2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{81689023-E55E-48ED-B7A8-53F4E21BBF2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{81689023-E55E-48ED-B7A8-53F4E21BBF2D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -380,9 +427,11 @@ Global
 		{179140D3-97AA-4CB4-8BF6-A0C73CA75701} = {26E8B310-269E-46D4-A612-24601F16065F}
 		{958FF7EC-0226-4E85-A85B-B84EC768197D} = {26E8B310-269E-46D4-A612-24601F16065F}
 		{D9F2ED28-6FA5-40CA-9912-E7A849147AB1} = {26E8B310-269E-46D4-A612-24601F16065F}
+		{6C706CE5-A206-4E46-8712-F8C48D526091} = {26E8B310-269E-46D4-A612-24601F16065F}
 		{3F9ACC27-26DB-49FA-BCD2-50C54A49C9FA} = {26E8B310-269E-46D4-A612-24601F16065F}
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836} = {26E8B310-269E-46D4-A612-24601F16065F}
 		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD} = {26E8B310-269E-46D4-A612-24601F16065F}
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B} = {3065279E-17F0-4CE0-AF5B-014E04263D77}
 		{A9348433-58C1-4B9C-8BB7-088B02529D9D} = {A2AE33B4-0830-426A-9E11-951DAB12BE5B}
 		{9512295B-3045-40E0-9B7E-2409F2173E9D} = {A2AE33B4-0830-426A-9E11-951DAB12BE5B}
 	EndGlobalSection

Integrations/Cod/CodRConConnection.cs

@@ -64,9 +64,9 @@ namespace Integrations.Cod
 
             var timeSinceLastQuery = (DateTime.Now - connectionState.LastQuery).TotalMilliseconds;
 
-            if (timeSinceLastQuery < config.FloodProtectInterval)
+            if (timeSinceLastQuery < StaticHelpers.FloodProtectionInterval)
             {
-                await Task.Delay(config.FloodProtectInterval - (int)timeSinceLastQuery);
+                await Task.Delay(StaticHelpers.FloodProtectionInterval - (int)timeSinceLastQuery);
             }
 
             connectionState.LastQuery = DateTime.Now;
@@ -150,9 +150,9 @@ namespace Integrations.Cod
             })
             {
                 connectionState.SendEventArgs.UserToken = socket;
+                connectionState.OnSentData.Reset();
+                connectionState.OnReceivedData.Reset();
                 connectionState.ConnectionAttempts++;
-                await connectionState.OnSentData.WaitAsync();
-                await connectionState.OnReceivedData.WaitAsync();
                 connectionState.BytesReadPerSegment.Clear();
                 bool exceptionCaught = false;
 
@@ -199,16 +199,6 @@ namespace Integrations.Cod
                     {
                         connectionState.OnComplete.Release(1);
                     }
-
-                    if (connectionState.OnSentData.CurrentCount == 0)
-                    {
-                        connectionState.OnSentData.Release();
-                    }
-
-                    if (connectionState.OnReceivedData.CurrentCount == 0)
-                    {
-                        connectionState.OnReceivedData.Release();
-                    }
                 }
             }
 
@@ -338,8 +328,7 @@ namespace Integrations.Cod
             {
                 // the send has not been completed asynchronously
                 // this really shouldn't ever happen because it's UDP
-                
+                if (!await Task.Run(() => connectionState.OnSentData.Wait(StaticHelpers.SocketTimeout(1))))
-                if(!await connectionState.OnSentData.WaitAsync(StaticHelpers.SocketTimeout(1)))
                 {
                     using(LogContext.PushProperty("Server", Endpoint.ToString()))
                     {
@@ -353,7 +342,7 @@ namespace Integrations.Cod
 
             if (!waitForResponse)
             {
-                return Array.Empty<byte[]>();
+                return new byte[0][];
             }
 
             connectionState.ReceiveEventArgs.SetBuffer(connectionState.ReceiveBuffer);
@@ -364,12 +353,12 @@ namespace Integrations.Cod
             if (receiveDataPending)
             {
                 _log.LogDebug("Waiting to asynchronously receive data on attempt #{connectionAttempts}", connectionState.ConnectionAttempts);
-                if (!await connectionState.OnReceivedData.WaitAsync(
+                if (!await Task.Run(() => connectionState.OnReceivedData.Wait(
                     new[]
                     {
                         StaticHelpers.SocketTimeout(connectionState.ConnectionAttempts), 
                         overrideTimeout
-                    }.Max()))
+                    }.Max())))
                 {
                     if (connectionState.ConnectionAttempts > 1) // this reduces some spam for unstable connections
                     {
@@ -418,24 +407,12 @@ namespace Integrations.Cod
             if (e.BytesTransferred == 0)
             {
                 _log.LogDebug("No bytes were transmitted so the connection was probably closed");
-               
+                ActiveQueries[this.Endpoint].OnReceivedData.Set();
-                var semaphore = ActiveQueries[this.Endpoint].OnReceivedData;
-                if (semaphore.CurrentCount == 0)
-                {
-                    semaphore.Release();
-                }
-                
                 return;
             }
 
-            if (sender is not Socket sock)
+            if (!(sender is Socket sock))
             {
-                var semaphore = ActiveQueries[this.Endpoint].OnReceivedData;
-                if (semaphore.CurrentCount == 0)
-                {
-                    semaphore.Release();
-                }
-                
                 return;
             }
             
@@ -450,19 +427,16 @@ 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);
-                    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);
 
                     var bufferSpaceAvailable = sock.Available + totalBytesTransferred - state.ReceiveBuffer.Length;
-                    if (bufferSpaceAvailable >= 0)
+                    if (bufferSpaceAvailable >= 0 )
                     {
-                        _log.LogWarning(
+                        _log.LogWarning("Not enough buffer space to store incoming data {bytesNeeded} additional bytes required", bufferSpaceAvailable);
-                            "Not enough buffer space to store incoming data {bytesNeeded} additional bytes required",
-                            bufferSpaceAvailable);
                         continue;
                     }
 
@@ -473,39 +447,27 @@ namespace Integrations.Cod
                         _log.LogDebug("Remaining bytes are async");
                         continue;
                     }
-
+                        
-                    _log.LogDebug("Read {bytesTransferred} synchronous bytes from {endpoint}",
+                    _log.LogDebug("Read {bytesTransferred} synchronous bytes from {endpoint}", state.ReceiveEventArgs.BytesTransferred, e.RemoteEndPoint);
-                        state.ReceiveEventArgs.BytesTransferred, e.RemoteEndPoint);
                     // 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;
                 }
+                    
+                ActiveQueries[this.Endpoint].OnReceivedData.Set();
             }
 
             catch (ObjectDisposedException)
             {
                 _log.LogDebug("Socket was disposed while receiving data");
-            }
+                ActiveQueries[this.Endpoint].OnReceivedData.Set();
-
-            finally
-            {
-                var semaphore = ActiveQueries[this.Endpoint].OnReceivedData;
-                if (semaphore.CurrentCount == 0)
-                {
-                    semaphore.Release();
-                }
             }
         }
 
         private void OnDataSent(object sender, SocketAsyncEventArgs e)
         {
             _log.LogDebug("Sent {byteCount} bytes to {endpoint}", e.Buffer?.Length, e.ConnectSocket?.RemoteEndPoint);
-            
+            ActiveQueries[this.Endpoint].OnSentData.Set();
-            var semaphore = ActiveQueries[this.Endpoint].OnSentData;
-            if (semaphore.CurrentCount == 0)
-            {
-                semaphore.Release();
-            }
         }
     }
-}
+}

Integrations/Cod/ConnectionState.cs

@@ -21,12 +21,11 @@ namespace Integrations.Cod
         private const int BufferSize = 16384;
         public readonly byte[] ReceiveBuffer = new byte[BufferSize];
         public readonly SemaphoreSlim OnComplete = new SemaphoreSlim(1, 1);
-        public readonly SemaphoreSlim OnSentData = new(1, 1);
+        public readonly ManualResetEventSlim OnSentData = new ManualResetEventSlim(false);
-        public readonly SemaphoreSlim OnReceivedData = new (1, 1);
+        public readonly ManualResetEventSlim OnReceivedData = new ManualResetEventSlim(false);
-       
         public List<int> BytesReadPerSegment { get; set; } = new List<int>();
         public SocketAsyncEventArgs SendEventArgs { get; set; } = new SocketAsyncEventArgs();
         public SocketAsyncEventArgs ReceiveEventArgs { get; set; } = new SocketAsyncEventArgs();
         public DateTime LastQuery { get; set; } = DateTime.Now;
     }
-}
+}

Integrations/Cod/Integrations.Cod.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <AssemblyName>Integrations.Cod</AssemblyName>
         <RootNamespace>Integrations.Cod</RootNamespace>
         <Configurations>Debug;Release;Prerelease</Configurations>

Integrations/Source/Integrations.Source.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <AssemblyName>Integrations.Source</AssemblyName>
         <RootNamespace>Integrations.Source</RootNamespace>
         <Configurations>Debug;Release;Prerelease</Configurations>

Integrations/Source/SourceRConConnection.cs

@@ -66,7 +66,6 @@ namespace Integrations.Source
                         // ignored
                     }
 
-                    await Task.Delay(ConnectionTimeout);
                     _rconClient = _rconClientFactory.CreateClient(_ipEndPoint);
                     _authenticated = false;
                     _needNewSocket = false;
@@ -184,4 +183,4 @@ namespace Integrations.Source
         {
         }
     }
-}
+}

Plugins/AutomessageFeed/AutomessageFeed.csproj

@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <LangVersion>Latest</LangVersion>
+    <LangVersion>7.1</LangVersion>
     <Configurations>Debug;Release;Prerelease</Configurations>
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SyndicationFeed.ReaderWriter" Version="1.0.2" />
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.2.22.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2021.8.31.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/AutomessageFeed/Plugin.cs

@@ -65,7 +65,6 @@ namespace AutomessageFeed
 
         public async Task OnLoadAsync(IManager manager)
         {
-            await _configurationHandler.BuildAsync();
             if (_configurationHandler.Configuration() == null)
             {
                 _configurationHandler.Set((Configuration)new Configuration().Generate());