only send heartbeat when fully initialized

update postgres target version to 12.9

Application/Application.csproj

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

Application/ApplicationManager.cs

@@ -355,9 +355,9 @@ namespace IW4MAdmin.Application
             // copy over default config if it doesn't exist
             if (!_appConfig.Servers?.Any() ?? true)
             {
-                var defaultConfig = new BaseConfigurationHandler<DefaultSettings>("DefaultSettings").Configuration();
+                var defaultHandler = new BaseConfigurationHandler<DefaultSettings>("DefaultSettings");
-                //ConfigHandler.Set((ApplicationConfiguration)new ApplicationConfiguration().Generate());
+                await defaultHandler.BuildAsync();
-                //var newConfig = ConfigHandler.Configuration();
+                var defaultConfig = defaultHandler.Configuration();
         
                 _appConfig.AutoMessages = defaultConfig.AutoMessages;
                 _appConfig.GlobalRules = defaultConfig.GlobalRules;
@@ -551,7 +551,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, ServerInstance.ToString());
+                        _logger.LogInformation("Finishing initialization and now monitoring [{Server}]", ServerInstance.Hostname);
                     }
 
                     // add the start event for this server

Application/BuildScripts/PostBuild.bat

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

Application/BuildScripts/PostPublish.bat

@@ -23,6 +23,7 @@ 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"
@@ -30,16 +31,37 @@ 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

Application/DefaultSettings.json

@@ -159,12 +159,12 @@
       "Game": "IW5",
       "Gametypes": [
         {
-          "Name": "dom",
+          "Name": "tdm",
-          "Alias": "Domination"
+          "Alias": "Team Deathmatch"
         },
         {
-          "Name": "conf",
+          "Name": "dom",
-          "Alias": "Kill Confirmed"
+          "Alias": "Domination"
         },
         {
           "Name": "ctf",
@@ -175,29 +175,37 @@
           "Alias": "Demolition"
         },
         {
-          "Name": "dm",
+          "Name": "dz",
-          "Alias": "Free For All"
-        },
-        {
-          "Name": "grnd",
           "Alias": "Drop Zone"
         },
         {
-          "Name": "gun",
+          "Name": "ffa",
+          "Alias": "Free For All"
+        },
+        {
+          "Name": "gg",
           "Alias": "Gun Game"
         },
+        {
+          "Name": "hq",
+          "Alias": "Headquarters"
+        },
         {
           "Name": "koth",
           "Alias": "Headquarters"
         },
         {
-          "Name": "infect",
+          "Name": "inf",
           "Alias": "Infected"
         },
         {
-          "Name": "jugg",
+          "Name": "jug",
           "Alias": "Juggernaut"
         },
+        {
+          "Name": "kc",
+          "Alias": "Kill Confirmed"
+        },
         {
           "Name": "oic",
           "Alias": "One In The Chamber"
@@ -215,12 +223,8 @@
           "Alias": "Team Defender"
         },
         {
-          "Name": "tjugg",
+          "Name": "tj",
           "Alias": "Team Juggernaut"
-        },
-        {
-          "Name": "war",
-          "Alias": "Team Deathmatch"
         }
       ]
     },

Application/Extensions/StartupExtensions.cs

@@ -78,8 +78,10 @@ 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(appConfig.ConnectionString + (appendTimeout ? ";default command timeout=0" : ""),
+                        .UseMySql(connectionString, ServerVersion.AutoDetect(connectionString),
                             mysqlOptions => mysqlOptions.EnableRetryOnFailure())
                         .UseLoggerFactory(sp.GetRequiredService<ILoggerFactory>()).Options);
                     return services;
@@ -92,7 +94,7 @@ namespace IW4MAdmin.Application.Extensions
                                 postgresqlOptions =>
                                 {
                                     postgresqlOptions.EnableRetryOnFailure();
-                                    postgresqlOptions.SetPostgresVersion(new Version("9.4"));
+                                    postgresqlOptions.SetPostgresVersion(new Version("12.9"));
                                 })
                             .UseLoggerFactory(sp.GetRequiredService<ILoggerFactory>()).Options);
                     return services;

Application/Factories/ConfigurationHandlerFactory.cs

@@ -1,4 +1,5 @@
-using IW4MAdmin.Application.Misc;
+using System.Threading.Tasks;
+using IW4MAdmin.Application.Misc;
 using SharedLibraryCore.Interfaces;
 
 namespace IW4MAdmin.Application.Factories
@@ -17,7 +18,17 @@ namespace IW4MAdmin.Application.Factories
         /// <returns></returns>
         public IConfigurationHandler<T> GetConfigurationHandler<T>(string name) where T : IBaseConfiguration
         {
-            return new BaseConfigurationHandler<T>(name);
+            var handler = 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/IW4MServer.cs

@@ -12,6 +12,7 @@ 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;
@@ -25,7 +26,6 @@ using Data.Models;
 using Data.Models.Server;
 using IW4MAdmin.Application.Commands;
 using Microsoft.EntityFrameworkCore;
-using SharedLibraryCore.Formatting;
 using static Data.Models.Client.EFClient;
 
 namespace IW4MAdmin
@@ -53,7 +53,9 @@ 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>(),
@@ -353,7 +355,7 @@ namespace IW4MAdmin
                         try
                         {
                             var factory = _serviceProvider.GetRequiredService<IDatabaseContextFactory>();
-                            await using var context = factory.CreateContext();
+                            await using var context = factory.CreateContext(enableTracking: false);
 
                             var messageCount = await context.InboxMessages
                                 .CountAsync(msg => msg.DestinationClientId == E.Origin.ClientId && !msg.IsDelivered);
@@ -1074,7 +1076,10 @@ namespace IW4MAdmin
         {
             try
             {
-                ResolvedIpEndPoint = new IPEndPoint((await Dns.GetHostAddressesAsync(IP)).First(), Port);
+                ResolvedIpEndPoint =
+                    new IPEndPoint(
+                        (await Dns.GetHostAddressesAsync(IP)).First(address =>
+                            address.AddressFamily == AddressFamily.InterNetwork), Port);
             }
             catch (Exception ex)
             {
@@ -1083,10 +1088,14 @@ namespace IW4MAdmin
             }
 
             RconParser = Manager.AdditionalRConParsers
-                .FirstOrDefault(_parser => _parser.Version == ServerConfig.RConParserVersion);
+                .FirstOrDefault(parser =>
+                    parser.Version == ServerConfig.RConParserVersion ||
+                    parser.Name == ServerConfig.RConParserVersion);
 
             EventParser = Manager.AdditionalEventParsers
-                .FirstOrDefault(_parser => _parser.Version == ServerConfig.EventParserVersion);
+                .FirstOrDefault(parser =>
+                    parser.Version == ServerConfig.EventParserVersion ||
+                    parser.Name == ServerConfig.RConParserVersion);
 
             RconParser ??= Manager.AdditionalRConParsers[0];
             EventParser ??= Manager.AdditionalEventParsers[0];
@@ -1103,7 +1112,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;

Application/Main.cs

@@ -34,16 +34,17 @@ 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; private set; } = BuildNumber.Parse(Utilities.GetVersionAsString());
+        public static BuildNumber Version { get; } = BuildNumber.Parse(Utilities.GetVersionAsString());
-        public static ApplicationManager ServerManager;
+        private static ApplicationManager _serverManager;
-        private static Task ApplicationTask;
+        private static Task _applicationTask;
-        private static ServiceProvider serviceProvider;
+        private static ServiceProvider _serviceProvider;
 
         /// <summary>
         /// entrypoint of the application
@@ -56,7 +57,7 @@ namespace IW4MAdmin.Application
             Console.OutputEncoding = Encoding.UTF8;
             Console.ForegroundColor = ConsoleColor.Gray;
 
-            Console.CancelKeyPress += new ConsoleCancelEventHandler(OnCancelKey);
+            Console.CancelKeyPress += OnCancelKey;
 
             Console.WriteLine("=====================================================");
             Console.WriteLine(" IW4MAdmin");
@@ -75,10 +76,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;
             }
         }
 
@@ -92,8 +93,7 @@ namespace IW4MAdmin.Application
             ITranslationLookup translationLookup = null;
             var logger = BuildDefaultLogger<Program>(new ApplicationConfiguration());
             Utilities.DefaultLogger = logger;
-            IServiceCollection services = null;
+            logger.LogInformation("Begin IW4MAdmin startup. Version is {Version} {@Args}", Version, args);
-            logger.LogInformation("Begin IW4MAdmin startup. Version is {version} {@args}", Version, args);
             
             try
             {
@@ -102,22 +102,29 @@ namespace IW4MAdmin.Application
                 ConfigurationMigration.CheckDirectories();
                 ConfigurationMigration.RemoveObsoletePlugins20210322();
                 logger.LogDebug("Configuring services...");
-                services = ConfigureServices(args);
+                var services = await 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>();
 
-                await versionChecker.CheckVersion();
+                _applicationTask = RunApplicationTasksAsync(logger, services);
-                await ServerManager.Init();
+                var tasks = new[]
+                {
+                    versionChecker.CheckVersion(),
+                    _serverManager.Init(),
+                    _applicationTask
+                };
+
+                await Task.WhenAll(tasks);
             }
 
             catch (Exception e)
             {
-                string failMessage = translationLookup == null
+                var failMessage = translationLookup == null
                     ? "Failed to initialize IW4MAdmin"
                     : translationLookup["MANAGER_INIT_FAIL"];
-                string exitMessage = translationLookup == null
+                var exitMessage = translationLookup == null
                     ? "Press enter to exit..."
                     : translationLookup["MANAGER_EXIT"];
 
@@ -137,7 +144,7 @@ namespace IW4MAdmin.Application
                             .FormatExt(configException.ConfigurationFileName));
                     }
 
-                    foreach (string error in configException.Errors)
+                    foreach (var error in configException.Errors)
                     {
                         Console.WriteLine(error);
                     }
@@ -153,27 +160,12 @@ namespace IW4MAdmin.Application
                 return;
             }
 
-            try
+            if (_serverManager.IsRestartRequested)
-            {
-                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;
             }
 
-            serviceProvider.Dispose();
+            await _serviceProvider.DisposeAsync();
         }
 
         /// <summary>
@@ -182,24 +174,26 @@ 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
-            var inputThread = new Thread(async () => await ReadConsoleInput(logger));
+            async void ReadInput() => await ReadConsoleInput(logger);
+
+            var inputThread = new Thread(ReadInput);
             inputThread.Start();
 
             var tasks = new[]
             {
-                ServerManager.Start(),
                 webfrontTask,
-                serviceProvider.GetRequiredService<IMasterCommunication>()
+                _serverManager.Start(),
-                    .RunUploadStatus(ServerManager.CancellationToken),
+                _serviceProvider.GetRequiredService<IMasterCommunication>()
-                collectionService.BeginCollectionAsync(cancellationToken: ServerManager.CancellationToken)
+                    .RunUploadStatus(_serverManager.CancellationToken),
+                collectionService.BeginCollectionAsync(cancellationToken: _serverManager.CancellationToken)
             };
 
             logger.LogDebug("Starting webfront and input tasks");
@@ -209,7 +203,6 @@ namespace IW4MAdmin.Application
             Console.WriteLine(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_SHUTDOWN_SUCCESS"]);
         }
         
-
         /// <summary>
         /// reads input from the console and executes entered commands on the default server
         /// </summary>
@@ -222,34 +215,43 @@ namespace IW4MAdmin.Application
                 return;
             }
 
-            string lastCommand;
+            EFClient origin = null;
-            var Origin = Utilities.IW4MAdminClient(ServerManager.Servers[0]);
 
             try
             {
-                while (!ServerManager.CancellationToken.IsCancellationRequested)
+                while (!_serverManager.CancellationToken.IsCancellationRequested)
                 {
-                    lastCommand = await Console.In.ReadLineAsync();
+                    if (!_serverManager.IsInitialized)
+                    {
+                        await Task.Delay(1000);
+                        continue;
+                    }
                     
-                    if (lastCommand?.Length > 0)
+                    var lastCommand = await Console.In.ReadLineAsync();
+
+                    if (lastCommand == null)
                     {
-                        if (lastCommand?.Length > 0)
+                        continue;
+                    }
+
+                    if (!lastCommand.Any())
                     {
-                            GameEvent E = new GameEvent()
+                        continue;
+                    }
+
+                    var gameEvent = new GameEvent
                     {
                         Type = GameEvent.EventType.Command,
                         Data = lastCommand,
-                                Origin = Origin,
+                        Origin = origin ??= Utilities.IW4MAdminClient(_serverManager.Servers.FirstOrDefault()),
-                                Owner = ServerManager.Servers[0]
+                        Owner = _serverManager.Servers[0]
                     };
 
-                            ServerManager.AddEvent(E);
+                    _serverManager.AddEvent(gameEvent);
-                            await E.WaitAsync(Utilities.DefaultCommandTimeout, ServerManager.CancellationToken);
+                    await gameEvent.WaitAsync(Utilities.DefaultCommandTimeout, _serverManager.CancellationToken);
                     Console.Write('>');
                 }
             }
-                }
-            }
             catch (OperationCanceledException)
             {
             }
@@ -276,9 +278,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);
             }
 
@@ -286,23 +288,23 @@ 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, new[] {configInstance.Name()});
+                var handlerInstance = Activator.CreateInstance(handlerType, configInstance.Name());
                 var genericInterfaceType = typeof(IConfigurationHandler<>).MakeGenericType(configurationType);
                 
                 serviceCollection.AddSingleton(genericInterfaceType, handlerInstance);
@@ -316,10 +318,10 @@ namespace IW4MAdmin.Application
 
             // 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);
@@ -332,12 +334,21 @@ namespace IW4MAdmin.Application
         /// <summary>
         /// Configures the dependency injection services
         /// </summary>
-        private static IServiceCollection ConfigureServices(string[] args)
+        private static async Task<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
@@ -355,7 +366,7 @@ namespace IW4MAdmin.Application
             {
                 appConfig = (ApplicationConfiguration) new ApplicationConfiguration().Generate();
                 appConfigHandler.Set(appConfig);
-                appConfigHandler.Save();
+                await appConfigHandler.Save();
             }
 
             // register override level names
@@ -373,15 +384,14 @@ namespace IW4MAdmin.Application
             serviceCollection
                 .AddBaseLogger(appConfig)
                 .AddSingleton(defaultConfig)
-                .AddSingleton<IServiceCollection>(_serviceProvider => serviceCollection)
+                .AddSingleton<IServiceCollection>(serviceCollection)
                 .AddSingleton<IConfigurationHandler<DefaultSettings>, BaseConfigurationHandler<DefaultSettings>>()
                 .AddSingleton((IConfigurationHandler<ApplicationConfiguration>) appConfigHandler)
-                .AddSingleton(
+                .AddSingleton<IConfigurationHandler<CommandConfiguration>>(commandConfigHandler)
-                    new BaseConfigurationHandler<CommandConfiguration>("CommandConfiguration") as
-                        IConfigurationHandler<CommandConfiguration>)
                 .AddSingleton(appConfig)
-                .AddSingleton(_serviceProvider =>
+                .AddSingleton(statsCommandHandler.Configuration() ?? new StatsConfiguration())
-                    _serviceProvider.GetRequiredService<IConfigurationHandler<CommandConfiguration>>()
+                .AddSingleton(serviceProvider =>
+                    serviceProvider.GetRequiredService<IConfigurationHandler<CommandConfiguration>>()
                         .Configuration() ?? new CommandConfiguration())
                 .AddSingleton<IPluginImporter, PluginImporter>()
                 .AddSingleton<IMiddlewareActionHandler, MiddlewareActionHandler>()
@@ -412,7 +422,9 @@ namespace IW4MAdmin.Application
                 .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>()

Application/Misc/BaseConfigurationHandler.cs

@@ -1,10 +1,13 @@
-using Newtonsoft.Json;
+using SharedLibraryCore;
-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
 {
@@ -14,27 +17,39 @@ namespace IW4MAdmin.Application.Misc
     /// <typeparam name="T">base configuration type</typeparam>
     public class BaseConfigurationHandler<T> : IConfigurationHandler<T> where T : IBaseConfiguration
     {
-        T _configuration;
+        private T _configuration;
+        private readonly SemaphoreSlim _onSaving;
+        private readonly JsonSerializerOptions _serializerOptions;
 
-        public BaseConfigurationHandler(string fn)
+
+        public BaseConfigurationHandler(string fileName)
         {
-            FileName = Path.Join(Utilities.OperatingDirectory, "Configuration", $"{fn}.json");
+            _serializerOptions = new JsonSerializerOptions
-            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 void Build()
+        public async Task BuildAsync()
         {
             try
             {
-                var configContent = File.ReadAllText(FileName);
+                await using var fileStream = File.OpenRead(FileName);
-                _configuration = JsonConvert.DeserializeObject<T>(configContent);
+                _configuration = await JsonSerializer.DeserializeAsync<T>(fileStream, _serializerOptions);
             }
 
             catch (FileNotFoundException)
@@ -52,16 +67,23 @@ namespace IW4MAdmin.Application.Misc
             }
         }
 
-        public Task Save()
+        public async Task Save()
         {
-            var settings = new JsonSerializerSettings()
+            try
             {
-                Formatting = Formatting.Indented
+                await _onSaving.WaitAsync();
-            };
-            settings.Converters.Add(new Newtonsoft.Json.Converters.StringEnumConverter());
 
-            var appConfigJSON = JsonConvert.SerializeObject(_configuration, settings);
+                await using var fileStream = File.Create(FileName);
-            return File.WriteAllTextAsync(FileName, appConfigJSON);
+                await JsonSerializer.SerializeAsync(fileStream, _configuration, _serializerOptions);
+            }
+
+            finally
+            {
+                if (_onSaving.CurrentCount == 0)
+                {
+                    _onSaving.Release(1);
+                }
+            }
         }
 
         public T Configuration()

Application/Misc/MasterCommunication.cs

@@ -26,7 +26,8 @@ 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)
         {
@@ -93,53 +94,24 @@ 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)
+                catch (Exception ex)
                 {
-                    _logger.LogWarning(e, "Could not send heartbeat");
+                    _logger.LogWarning(ex, "Could not send heartbeat");
-                    var exceptions = e.InnerExceptions.Where(ex => ex.GetType() == typeof(ApiException));
-
-                    foreach (var ex in exceptions)
-                    {
-                        if (((ApiException)ex).StatusCode == System.Net.HttpStatusCode.Unauthorized)
-                        {
-                            connected = false;
                 }
-                    }
-                }
-
-                catch (ApiException e)
-                {
-                    _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(30000, token);
+                    await Task.Delay(Interval, token);
                 }
 
                 catch
@@ -151,7 +123,7 @@ namespace IW4MAdmin.Application.Misc
 
         private async Task UploadStatus()
         {
-            if (firstHeartBeat)
+            if (_firstHeartBeat)
             {
                 var token = await _apiInstance.Authenticate(new AuthenticationId
                 {
@@ -185,7 +157,7 @@ namespace IW4MAdmin.Application.Misc
 
             Response<ResultMessage> response = null;
 
-            if (firstHeartBeat)
+            if (_firstHeartBeat)
             {
                 response = await _apiInstance.AddInstance(instance);
             }
@@ -193,7 +165,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

@@ -207,42 +207,30 @@ namespace IW4MAdmin.Application.Misc
 
         public async Task<IEnumerable<IClientMeta>> GetRuntimeMeta(ClientPaginationRequest request)
         {
-            var meta = new List<IClientMeta>();
+            var metas = await Task.WhenAll(_metaActions.Where(kvp => kvp.Key != MetaType.Information)
+                .Select(async kvp => await kvp.Value[0](request)));
 
-            foreach (var (type, actions) in _metaActions)
+            return metas.SelectMany(m => (IEnumerable<IClientMeta>)m)
-            {
+                .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>();
 
-                foreach (var individualMetaRegistration in _metaActions[metaType])
+                var completedMeta = await Task.WhenAll(_metaActions[metaType].Select(async individualMetaRegistration =>
-                {
+                    (IEnumerable<T>)await individualMetaRegistration(request)));
-                    allMeta.AddRange(await individualMetaRegistration(request));
+                
-                }
+                allMeta.AddRange(completedMeta.SelectMany(meta => meta));
                 
                 return ProcessInformationMeta(allMeta);
             }
 
-            else
+            var meta = await _metaActions[metaType][0](request) as IEnumerable<T>;
-            {
-                meta = await _metaActions[metaType][0](request) as IEnumerable<T>;
-            }
 
             return meta;
         }

Application/Misc/PluginImporter.cs

@@ -83,19 +83,47 @@ namespace IW4MAdmin.Application.Misc
                         .GroupBy(_assembly => _assembly.FullName).Select(_assembly => _assembly.OrderByDescending(_assembly => _assembly.GetName().Version).First());
 
                     pluginTypes = assemblies
-                        .SelectMany(_asm => _asm.GetTypes())
+                        .SelectMany(_asm =>
+                        {
+                            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 => _asm.GetTypes())
+                        .SelectMany(_asm =>{
+                            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 => asm.GetTypes())
+                        .SelectMany(asm => {
+                            try
+                            {
+                                return asm.GetTypes();
+                            }
+                            catch
+                            {
+                                return Enumerable.Empty<Type>();
+                            }
+                        })
                         .Where(asmType =>
                             asmType.IsClass && asmType.GetInterface(nameof(IBaseConfiguration), false) != null);
 

Application/Misc/ScriptPlugin.cs

@@ -168,22 +168,26 @@ namespace IW4MAdmin.Application.Misc
                     }
                 }
 
-                _scriptEngine.SetValue("_configHandler", new ScriptPluginConfigurationWrapper(Name, _scriptEngine));
-                await OnLoadAsync(manager);
-
                 try
                 {
                     if (pluginObject.isParser)
                     {
+                        await OnLoadAsync(manager);
                         IsParser = true;
-                        IEventParser eventParser = (IEventParser)_scriptEngine.GetValue("eventParser").ToObject();
+                        var eventParser = (IEventParser)_scriptEngine.GetValue("eventParser").ToObject();
-                        IRConParser rconParser = (IRConParser)_scriptEngine.GetValue("rconParser").ToObject();
+                        var 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)
                 {
@@ -268,17 +272,17 @@ namespace IW4MAdmin.Application.Misc
             }
         }
 
-        public Task OnLoadAsync(IManager manager)
+        public async Task OnLoadAsync(IManager manager)
         {
             _logger.LogDebug("OnLoad executing for {name}", Name);
             _scriptEngine.SetValue("_manager", manager);
-            return Task.FromResult(_scriptEngine.Execute("plugin.onLoadAsync(_manager)").GetCompletionValue());
+            await Task.FromResult(_scriptEngine.Execute("plugin.onLoadAsync(_manager)").GetCompletionValue());
         }
 
-        public Task OnTickAsync(Server S)
+        public async Task OnTickAsync(Server S)
         {
             _scriptEngine.SetValue("_server", S);
-            return Task.FromResult(_scriptEngine.Execute("plugin.onTickAsync(_server)").GetCompletionValue());
+            await Task.FromResult(_scriptEngine.Execute("plugin.onTickAsync(_server)").GetCompletionValue());
         }
 
         public async Task OnUnloadAsync()

Application/Misc/ScriptPluginConfigurationWrapper.cs

@@ -12,19 +12,24 @@ namespace IW4MAdmin.Application.Misc
     public class ScriptPluginConfigurationWrapper
     {
         private readonly BaseConfigurationHandler<ScriptPluginConfiguration> _handler;
-        private readonly ScriptPluginConfiguration _config;
+        private ScriptPluginConfiguration _config;
         private readonly string _pluginName;
         private readonly Engine _scriptEngine;
 
         public ScriptPluginConfigurationWrapper(string pluginName, Engine scriptEngine)
         {
             _handler = new BaseConfigurationHandler<ScriptPluginConfiguration>("ScriptPluginSettings");
-            _config = _handler.Configuration() ??
-                      (ScriptPluginConfiguration) new ScriptPluginConfiguration().Generate();
             _pluginName = pluginName;
             _scriptEngine = scriptEngine;
         }
 
+        public async Task InitializeAsync()
+        {
+            await _handler.BuildAsync();
+            _config = _handler.Configuration() ??
+                      (ScriptPluginConfiguration) new ScriptPluginConfiguration().Generate();
+        }
+
         private static int? AsInteger(double d)
         {
             return int.TryParse(d.ToString(CultureInfo.InvariantCulture), out var parsed) ? parsed : (int?) null;

Application/Misc/TokenAuthentication.cs

@@ -7,26 +7,26 @@ using System.Text;
 
 namespace IW4MAdmin.Application.Misc
 {
-    class TokenAuthentication : ITokenAuthentication
+    internal class TokenAuthentication : ITokenAuthentication
     {
         private readonly ConcurrentDictionary<long, TokenState> _tokens;
-        private readonly RNGCryptoServiceProvider _random;
+        private readonly RandomNumberGenerator _random;
-        private readonly static TimeSpan _timeoutPeriod = new TimeSpan(0, 0, 120);
+        private static readonly TimeSpan TimeoutPeriod = new TimeSpan(0, 0, 120);
-        private const short TOKEN_LENGTH = 4;
+        private const short TokenLength = 4;
 
         public TokenAuthentication()
         {
             _tokens = new ConcurrentDictionary<long, TokenState>();
-            _random = new RNGCryptoServiceProvider();
+            _random = RandomNumberGenerator.Create();
         }
 
         public bool AuthorizeToken(long networkId, string token)
         {
-            bool authorizeSuccessful = _tokens.ContainsKey(networkId) && _tokens[networkId].Token == token;
+            var authorizeSuccessful = _tokens.ContainsKey(networkId) && _tokens[networkId].Token == token;
 
             if (authorizeSuccessful)
             {
-                _tokens.TryRemove(networkId, out TokenState _);
+                _tokens.TryRemove(networkId, out _);
             }
 
             return authorizeSuccessful;
@@ -34,15 +34,15 @@ namespace IW4MAdmin.Application.Misc
 
         public TokenState GenerateNextToken(long networkId)
         {
-            TokenState state = null;
+            TokenState state;
 
             if (_tokens.ContainsKey(networkId))
             {
                 state = _tokens[networkId];
 
-                if ((DateTime.Now - state.RequestTime) > _timeoutPeriod)
+                if ((DateTime.Now - state.RequestTime) > TimeoutPeriod)
                 {
-                    _tokens.TryRemove(networkId, out TokenState _);
+                    _tokens.TryRemove(networkId, out _);
                 }
 
                 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 TokenState _);
+                    _tokens.TryRemove(key, out _);
                 }
             }
 
             return state;
         }
 
-        public string _generateToken()
+        private 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);
             }
 
-            StringBuilder token = new StringBuilder();
+            var token = new StringBuilder();
 
-            while (token.Length < TOKEN_LENGTH)
+            var charSet = new byte[1];
+            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]);
                 }

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,

Data/Data.csproj

@@ -1,30 +1,27 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</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.1.0</PackageVersion>
+    <PackageVersion>1.2.0</PackageVersion>
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.10">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Npgsql" Version="4.1.7" />
+    <PackageReference Include="Npgsql" Version="6.0.2" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.4" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.2" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.2.4" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.1" />
-  </ItemGroup>
-  
-  <ItemGroup Condition="'$(Configuration)'=='Debug'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.10" />
   </ItemGroup>
   
 </Project>

Data/Helpers/LookupCache.cs

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

Data/MigrationContext/MySqlDatabaseContext.cs

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

Data/MigrationContext/PostgresqlDatabaseContext.cs

@@ -25,7 +25,7 @@ namespace Data.MigrationContext
             {
                 optionsBuilder.UseNpgsql(
                         "Host=127.0.0.1;Database=IW4MAdmin_Migration;Username=postgres;Password=password;",
-                        options => options.SetPostgresVersion(new Version("9.4")))
+                        options => options.SetPostgresVersion(new Version("12.9")))
                     .EnableDetailedErrors(true)
                     .EnableSensitiveDataLogging(true);
             }

Data/Models/Vector3.cs

@@ -1,6 +1,8 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.Text.RegularExpressions;
+// ReSharper disable CompareOfFloatsByEqualityOperator
+#pragma warning disable CS0659
 
 namespace Data.Models
 {

DeploymentFiles/UpdateIW4MAdmin.ps1

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

@@ -0,0 +1,106 @@
+#!/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-latest'
+  vmImage: 'windows-2022'
 
 variables:
   solution: 'IW4MAdmin.sln'
@@ -21,6 +21,15 @@ 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')
@@ -56,6 +65,20 @@ steps:
     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'
   inputs:
@@ -81,7 +104,7 @@ steps:
   inputs:
     filename: 'Application\BuildScripts\PostPublish.bat'
     workingFolder: '$(Build.Repository.LocalPath)'
-    arguments: '$(outputFolder)'
+    arguments: '$(outputFolder) $(Build.Repository.LocalPath)'
     failOnStandardError: true
 
 - task: PowerShell@2
@@ -98,6 +121,7 @@ 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'
@@ -139,6 +163,11 @@ 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:

IW4MAdmin.sln

@@ -12,6 +12,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		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
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharedLibraryCore", "SharedLibraryCore\SharedLibraryCore.csproj", "{AA0541A2-8D51-4AD9-B0AC-3D1F5B162481}"
@@ -58,8 +60,6 @@ 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}"
@@ -324,29 +324,6 @@ 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
@@ -432,7 +409,6 @@ Global
 		{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/Integrations.Cod.csproj

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

Plugins/AutomessageFeed/AutomessageFeed.csproj

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

Plugins/AutomessageFeed/Plugin.cs

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

Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
     <Configurations>Debug;Release;Prerelease</Configurations>
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.20.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.28.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/LiveRadar/Controllers/RadarController.cs

@@ -1,29 +1,25 @@
 using LiveRadar.Configuration;
 using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
 using SharedLibraryCore;
 using SharedLibraryCore.Dtos;
 using SharedLibraryCore.Interfaces;
 using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 
 namespace LiveRadar.Web.Controllers
 {
     public class RadarController : BaseController
     {
-        private static readonly JsonSerializerSettings _serializerSettings = new JsonSerializerSettings()
-        {
-            ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
-            ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver()
-        };
-
         private readonly IManager _manager;
-        private readonly LiveRadarConfiguration _config;
+        private static LiveRadarConfiguration _config;
+        private readonly IConfigurationHandler<LiveRadarConfiguration> _configurationHandler;
 
         public RadarController(IManager manager, IConfigurationHandlerFactory configurationHandlerFactory) : base(manager)
         {
             _manager = manager;
-            _config = configurationHandlerFactory.GetConfigurationHandler<LiveRadarConfiguration>("LiveRadarConfiguration").Configuration() ?? new LiveRadarConfiguration();
+            _configurationHandler =
+                configurationHandlerFactory.GetConfigurationHandler<LiveRadarConfiguration>("LiveRadarConfiguration");
         }
 
         [HttpGet]
@@ -46,7 +42,7 @@ namespace LiveRadar.Web.Controllers
 
         [HttpGet]
         [Route("Radar/{serverId}/Map")]
-        public IActionResult Map(long? serverId = null)
+        public async Task<IActionResult> Map(long? serverId = null)
         {
             var server = serverId == null ? _manager.GetServers().FirstOrDefault() : _manager.GetServers().FirstOrDefault(_server => _server.EndPoint == serverId);
             
@@ -55,6 +51,12 @@ namespace LiveRadar.Web.Controllers
                 return NotFound();
             }
 
+            if (_config == null)
+            {
+                await _configurationHandler.BuildAsync();
+                _config = _configurationHandler.Configuration() ?? new LiveRadarConfiguration();
+            }
+            
             var map = _config.Maps.FirstOrDefault(_map => _map.Name == server.CurrentMap.Name);
 
             if (map == null)

Plugins/LiveRadar/LiveRadar.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RazorCompileOnBuild Condition="'$(CONFIG)'!='Debug'">true</RazorCompileOnBuild>
     <RazorCompiledOnPublish Condition="'$(CONFIG)'!='Debug'">true</RazorCompiledOnPublish>
     <PreserveCompilationContext Condition="'$(CONFIG)'!='Debug'">false</PreserveCompilationContext>
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.20.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.28.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/LiveRadar/Plugin.cs

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

Plugins/LiveRadar/RadarEvent.cs

@@ -2,6 +2,8 @@
 using SharedLibraryCore;
 using System;
 using System.Linq;
+// ReSharper disable CompareOfFloatsByEqualityOperator
+#pragma warning disable CS0659
 
 namespace LiveRadar
 {

Plugins/Login/Login.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.20.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.28.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/Login/Plugin.cs

@@ -76,6 +76,7 @@ namespace IW4MAdmin.Plugins.Login
         {
             AuthorizedClients = new ConcurrentDictionary<int, bool>();
 
+            await _configHandler.BuildAsync();
             if (_configHandler.Configuration() == null)
             {
                 _configHandler.Set((Configuration)new Configuration().Generate());

Plugins/ProfanityDeterment/Plugin.cs

@@ -109,6 +109,7 @@ namespace IW4MAdmin.Plugins.ProfanityDeterment
 
         public async Task OnLoadAsync(IManager manager)
         {
+            await _configHandler.BuildAsync();
             if (_configHandler.Configuration() == null)
             {
                 _configHandler.Set((Configuration)new Configuration().Generate());

Plugins/ProfanityDeterment/ProfanityDeterment.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
     <PackageId>RaidMax.IW4MAdmin.Plugins.ProfanityDeterment</PackageId>
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.20.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.28.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/Stats/Client/HitCalculator.cs

@@ -201,7 +201,7 @@ namespace IW4MAdmin.Plugins.Stats.Client
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError(ex, "Could not retrieve previous hit data for client {client}");
+                    _logger.LogError(ex, "Could not retrieve previous hit data for client {Client}", hitInfo.EntityId);
                     continue;
                 }
 

Plugins/Stats/Client/ServerDistributionCalculator.cs

@@ -48,6 +48,7 @@ namespace Stats.Client
             await LoadServers();
             _distributionCache.SetCacheItem((async (set, token) =>
             {
+                await _configurationHandler.BuildAsync();
                 var validPlayTime = _configurationHandler.Configuration()?.TopPlayersMinPlayTime ?? 3600 * 3;
 
                 var distributions = new Dictionary<long, Extensions.LogParams>();
@@ -73,6 +74,7 @@ namespace Stats.Client
 
             _maxZScoreCache.SetCacheItem(async (set, token) =>
             {
+                await _configurationHandler.BuildAsync();
                 var validPlayTime = _configurationHandler.Configuration()?.TopPlayersMinPlayTime ?? 3600 * 3;
 
                 var zScore = await set

Plugins/Stats/Client/WeaponNameParser.cs

@@ -3,9 +3,7 @@ using Stats.Client.Abstractions;
 using Stats.Client.Game;
 using System.Collections.Generic;
 using System.Linq;
-using IW4MAdmin.Plugins.Stats.Config;
 using SharedLibraryCore;
-using SharedLibraryCore.Interfaces;
 using Stats.Config;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
@@ -16,10 +14,10 @@ namespace Stats.Client
         private readonly ILogger _logger;
         private readonly StatsConfiguration _config;
 
-        public WeaponNameParser(ILogger<WeaponNameParser> logger, IConfigurationHandler<StatsConfiguration> config)
+        public WeaponNameParser(ILogger<WeaponNameParser> logger, StatsConfiguration config)
         {
             _logger = logger;
-            _config = config.Configuration();
+            _config = config;
         }
 
         public WeaponInfo Parse(string weaponName, Server.Game gameName)

Plugins/Stats/Commands/MostKillsCommand.cs

@@ -17,7 +17,6 @@ namespace IW4MAdmin.Plugins.Stats.Commands
     class MostKillsCommand : Command
     {
         private readonly IDatabaseContextFactory _contextFactory;
-        private readonly CommandConfiguration _config;
 
         public MostKillsCommand(CommandConfiguration config, ITranslationLookup translationLookup,
             IDatabaseContextFactory contextFactory) : base(config, translationLookup)
@@ -28,7 +27,6 @@ namespace IW4MAdmin.Plugins.Stats.Commands
             Permission = EFClient.Permission.User;
 
             _contextFactory = contextFactory;
-            _config = config;
         }
 
         public override async Task ExecuteAsync(GameEvent E)

Plugins/Stats/Commands/MostPlayedCommand.cs

@@ -56,7 +56,6 @@ namespace IW4MAdmin.Plugins.Stats.Commands
             return mostPlayed;
         }
 
-        private readonly CommandConfiguration _config;
         private readonly IDatabaseContextFactory _contextFactory;
 
         public MostPlayedCommand(CommandConfiguration config, ITranslationLookup translationLookup,
@@ -68,7 +67,6 @@ namespace IW4MAdmin.Plugins.Stats.Commands
             Permission = EFClient.Permission.User;
             RequiresTarget = false;
 
-            _config = config;
             _contextFactory = contextFactory;
         }
 

Plugins/Stats/Helpers/StatManager.cs

@@ -21,7 +21,7 @@ using Data.Models.Server;
 using Humanizer.Localisation;
 using Microsoft.Data.Sqlite;
 using Microsoft.Extensions.Logging;
-using MySql.Data.MySqlClient;
+using MySqlConnector;
 using Npgsql;
 using Stats.Client.Abstractions;
 using Stats.Config;
@@ -38,7 +38,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
         private readonly ConcurrentDictionary<long, ServerStats> _servers;
         private readonly ILogger _log;
         private readonly IDatabaseContextFactory _contextFactory;
-        private readonly IConfigurationHandler<StatsConfiguration> _configHandler;
+        private readonly StatsConfiguration _config;
         private static List<EFServer> serverModels;
         public static string CLIENT_STATS_KEY = "ClientStats";
         public static string CLIENT_DETECTIONS_KEY = "ClientDetections";
@@ -47,13 +47,13 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
         private readonly IServerDistributionCalculator _serverDistributionCalculator;
 
         public StatManager(ILogger<StatManager> logger, IManager mgr, IDatabaseContextFactory contextFactory,
-            IConfigurationHandler<StatsConfiguration> configHandler,
+            StatsConfiguration statsConfig,
             IServerDistributionCalculator serverDistributionCalculator)
         {
             _servers = new ConcurrentDictionary<long, ServerStats>();
             _log = logger;
             _contextFactory = contextFactory;
-            _configHandler = configHandler;
+            _config = statsConfig;
             _serverDistributionCalculator = serverDistributionCalculator;
         }
 
@@ -75,7 +75,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
                           r.When > fifteenDaysAgo &&
                           r.RatingHistory.Client.Level != EFClient.Permission.Banned &&
                           r.Newest &&
-                          r.ActivityAmount >= _configHandler.Configuration().TopPlayersMinPlayTime;
+                          r.ActivityAmount >= _config.TopPlayersMinPlayTime;
         }
 
         /// <summary>
@@ -87,7 +87,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
         {
             await using var context = _contextFactory.CreateContext(enableTracking: false);
             
-            if (_configHandler.Configuration().EnableAdvancedMetrics)
+            if (_config.EnableAdvancedMetrics)
             {
                 var clientRanking = await context.Set<EFClientRankingHistory>()
                     .Where(r => r.ClientId == clientId)
@@ -126,7 +126,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
                                 && ranking.PerformanceMetric != null
                                 && ranking.Newest
                                 && ranking.Client.TotalConnectionTime >=
-                                _configHandler.Configuration().TopPlayersMinPlayTime;
+                                _config.TopPlayersMinPlayTime;
         }
 
         public async Task<int> GetTotalRankedPlayers(long serverId)
@@ -217,7 +217,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
 
         public async Task<List<TopStatsInfo>> GetTopStats(int start, int count, long? serverId = null)
         {
-            if (_configHandler.Configuration().EnableAdvancedMetrics)
+            if (_config.EnableAdvancedMetrics)
             {
                 return await GetNewTopStats(start, count, serverId);
             }
@@ -570,7 +570,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
             {
                 clientStats = UpdateStats(clientStats, pl);
                 await SaveClientStats(clientStats);
-                if (_configHandler.Configuration().EnableAdvancedMetrics)
+                if (_config.EnableAdvancedMetrics)
                 {
                     await UpdateHistoricalRanking(pl.ClientId, clientStats, serverId);
                 }
@@ -973,7 +973,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
 
             // update their performance 
             if ((DateTime.UtcNow - attackerStats.LastStatHistoryUpdate).TotalMinutes >=
-                (Utilities.IsDevelopment ? 0.5 : _configHandler.Configuration().EnableAdvancedMetrics ? 5.0 : 2.5))
+                (Utilities.IsDevelopment ? 0.5 : _config.EnableAdvancedMetrics ? 5.0 : 2.5))
             {
                 try
                 {
@@ -982,7 +982,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
                     // for stat history update, but one is already processing that invalidates the original
                     await attackerStats.ProcessingHit.WaitAsync(Utilities.DefaultCommandTimeout,
                         Plugin.ServerManager.CancellationToken);
-                    if (_configHandler.Configuration().EnableAdvancedMetrics)
+                    if (_config.EnableAdvancedMetrics)
                     {
                         await UpdateHistoricalRanking(attacker.ClientId, attackerStats, serverId);
                     }
@@ -1190,7 +1190,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
         public async Task UpdateHistoricalRanking(int clientId, EFClientStatistics clientStats, long serverId)
         {
             await using var context = _contextFactory.CreateContext();
-            var minPlayTime = _configHandler.Configuration().TopPlayersMinPlayTime;
+            var minPlayTime = _config.TopPlayersMinPlayTime;
             
             var performances = await context.Set<EFClientStatistics>()
                 .AsNoTracking()
@@ -1208,7 +1208,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
                 var serverRanking = await context.Set<EFClientStatistics>()
                     .Where(stats => stats.ClientId != clientStats.ClientId)
                     .Where(AdvancedClientStatsResourceQueryHelper.GetRankingFunc(
-                        _configHandler.Configuration().TopPlayersMinPlayTime, clientStats.ZScore, serverId))
+                        _config.TopPlayersMinPlayTime, clientStats.ZScore, serverId))
                     .CountAsync();
 
                 var serverRankingSnapshot = new EFClientRankingHistory

Plugins/Stats/Plugin.cs

@@ -11,7 +11,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Data.Abstractions;
-using Data.Models.Client;
 using Data.Models.Client.Stats;
 using Data.Models.Server;
 using Microsoft.Extensions.Logging;
@@ -172,6 +171,7 @@ namespace IW4MAdmin.Plugins.Stats
 
         public async Task OnLoadAsync(IManager manager)
         {
+            await Config.BuildAsync();
             // load custom configuration
             if (Config.Configuration() == null)
             {
@@ -191,10 +191,8 @@ namespace IW4MAdmin.Plugins.Stats
             async Task<IEnumerable<InformationResponse>> getStats(ClientPaginationRequest request)
             {
                 IList<EFClientStatistics> clientStats;
-                int messageCount = 0;
                 await using var ctx = _databaseContextFactory.CreateContext(enableTracking: false);
                 clientStats = await ctx.Set<EFClientStatistics>().Where(c => c.ClientId == request.ClientId).ToListAsync();
-                messageCount = await ctx.Set<EFClientMessage>().CountAsync(_message => _message.ClientId == request.ClientId);
 
                 int kills = clientStats.Sum(c => c.Kills);
                 int deaths = clientStats.Sum(c => c.Deaths);
@@ -253,14 +251,6 @@ namespace IW4MAdmin.Plugins.Stats
                         Column = 0,
                         Order = 5,
                         Type = MetaType.Information
-                    },
-                    new InformationResponse()
-                    {
-                        Key = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_PROFILE_MESSAGES"],
-                        Value = messageCount.ToString("#,##0", new System.Globalization.CultureInfo(Utilities.CurrentLocalization.LocalizationName)),
-                        Column = 1,
-                        Order = 4,
-                        Type = MetaType.Information
                     }
                 };
             }
@@ -451,7 +441,7 @@ namespace IW4MAdmin.Plugins.Stats
             }
 
             ServerManager = manager;
-            Manager = new StatManager(_managerLogger, manager, _databaseContextFactory, Config, _serverDistributionCalculator);
+            Manager = new StatManager(_managerLogger, manager, _databaseContextFactory, Config.Configuration(), _serverDistributionCalculator);
             await _serverDistributionCalculator.Initialize();
         }
 

Plugins/Stats/Stats.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
     <PackageId>RaidMax.IW4MAdmin.Plugins.Stats</PackageId>
@@ -17,7 +17,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.20.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.28.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/Welcome/Plugin.cs

@@ -6,6 +6,7 @@ using SharedLibraryCore.Database.Models;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using System.Net;
+using System.Net.Http;
 using Newtonsoft.Json.Linq;
 using Humanizer;
 using Data.Abstractions;
@@ -34,6 +35,7 @@ namespace IW4MAdmin.Plugins.Welcome
 
         public async Task OnLoadAsync(IManager manager)
         {
+            await _configHandler.BuildAsync();
             if (_configHandler.Configuration() == null)
             {
                 _configHandler.Set((WelcomeConfiguration) new WelcomeConfiguration().Generate());
@@ -93,7 +95,7 @@ namespace IW4MAdmin.Plugins.Welcome
                 msg = msg.Replace("{{ClientLocation}}", await GetCountryName(joining.IPAddressString));
             }
 
-            msg = msg.Replace("{{TimesConnected}}", joining.Connections.Ordinalize());
+            msg = msg.Replace("{{TimesConnected}}", joining.Connections.Ordinalize(Utilities.CurrentLocalization.Culture));
 
             return msg;
         }
@@ -105,11 +107,11 @@ namespace IW4MAdmin.Plugins.Welcome
         /// <returns></returns>
         private async Task<string> GetCountryName(string ip)
         {
-            using var wc = new WebClient();
+            using var wc = new HttpClient();
             try
             {
                 var response =
-                    await wc.DownloadStringTaskAsync(new Uri($"http://extreme-ip-lookup.com/json/{ip}?key=demo"));
+                    await wc.GetStringAsync(new Uri($"http://ip-api.com/json/{ip}"));
                 var responseObj = JObject.Parse(response);
                 response = responseObj["country"]?.ToString();
 

Plugins/Welcome/Welcome.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
     <PackageId>RaidMax.IW4MAdmin.Plugins.Welcome</PackageId>
@@ -20,7 +20,7 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.20.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.28.1" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>

README.md

@@ -13,9 +13,9 @@ Latest binary builds are always available at:
 ## Setup
 **IW4MAdmin** requires minimal effort to get up and running.
 ### Prerequisites
-* [.NET Core 3.1.x Runtime](https://www.microsoft.com/net/download) *or newer*
+* [.NET Core 6.0.x Runtime](https://www.microsoft.com/net/download)
-    * [Direct Download (Windows)](https://dotnet.microsoft.com/download/dotnet-core/thank-you/runtime-aspnetcore-3.1.4-windows-hosting-bundle-installer)
+    * [Direct Download (Windows)](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-aspnetcore-6.0.1-windows-x64-installer)
-    * [Package Installation (Linux)](https://docs.microsoft.com/en-us/dotnet/core/install/linux-package-manager-ubuntu-1910)
+    * [Package Installation Instructions (Linux)](https://docs.microsoft.com/en-us/dotnet/core/install/linux)
 ### Installation
 1. Install .NET Core Runtime
 2.  Extract `IW4MAdmin-<version>.zip`  
@@ -35,11 +35,22 @@ Linux
     * You will need to retrieve your login credentials by typing `!rt` ingame
 
 ### Updating
+**Manually**  
 1. Download the latest version of **IW4MAdmin**
 2. Extract the newer version of **IW4MAdmin** into pre-existing **IW4MAdmin** folder and overwrite existing files
 
     _Your configuration and database will be saved_
 
+**OR**  
+Use the provided `UpdateIW4MAdmin` script to download and install automatically
+
+| Argument Windows (Linux) | Description                                               |
+|--------------------------|-----------------------------------------------------------|
+| -Silent (s)              | Do not prompt for any user input                          |
+| -Clean (c)               | Clean unneeded files listed in `_delete.txt` after update |
+| -Verified (v)            | Only update releases in the verified stream               |
+ | -Directory (d)           | Directory to install to                                   |
+
 ## Help
 Feel free to join the **IW4MAdmin** [Discord](https://discord.gg/ZZFK5p3)  
 If you come across an issue,  bug, or feature request please post an [issue](https://github.com/RaidMax/IW4M-Admin/issues)

SharedLibraryCore/BaseController.cs

@@ -1,18 +1,20 @@
-using Microsoft.AspNetCore.Authentication;
+using System;
-using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Dtos;
-using SharedLibraryCore.Interfaces;
-using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Data.Context;
 using Data.Models;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.Cookies;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
 using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Dtos;
+using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.Localization;
 
 namespace SharedLibraryCore
 {
@@ -23,16 +25,11 @@ namespace SharedLibraryCore
         /// </summary>
         private const int COOKIE_LIFESPAN = 3;
 
-        public IManager Manager { get; private set; }
-        protected readonly DatabaseContext Context;
-        protected bool Authorized { get; set; }
-        protected Localization.TranslationLookup Localization { get; private set; }
-        protected EFClient Client { get; private set; }
         private static readonly byte[] LocalHost = { 127, 0, 0, 1 };
         private static string SocialLink;
         private static string SocialTitle;
+        protected readonly DatabaseContext Context;
         protected List<Page> Pages;
-        protected ApplicationConfiguration AppConfig { get; }
 
         public BaseController(IManager manager)
         {
@@ -59,17 +56,24 @@ namespace SharedLibraryCore
             ViewBag.EnableColorCodes = AppConfig.EnableColorCodes;
             ViewBag.Language = Utilities.CurrentLocalization.Culture.TwoLetterISOLanguageName;
 
-            Client ??= new EFClient()
+            Client ??= new EFClient
             {
                 ClientId = -1,
-                Level = EFClient.Permission.Banned,
+                Level = Data.Models.Client.EFClient.Permission.Banned,
-                CurrentAlias = new EFAlias() { Name = "Webfront Guest" }
+                CurrentAlias = new EFAlias { Name = "Webfront Guest" }
             };
         }
 
+        public IManager Manager { get; }
+        protected bool Authorized { get; set; }
+        protected TranslationLookup Localization { get; }
+        protected EFClient Client { get; }
+        protected ApplicationConfiguration AppConfig { get; }
+
         protected async Task SignInAsync(ClaimsPrincipal claimsPrinciple)
         {
-            await HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, claimsPrinciple, new AuthenticationProperties()
+            await HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, claimsPrinciple,
+                new AuthenticationProperties
                 {
                     AllowRefresh = true,
                     ExpiresUtc = DateTime.UtcNow.AddMonths(COOKIE_LIFESPAN),
@@ -84,21 +88,27 @@ namespace SharedLibraryCore
             {
                 try
                 {
-                    int clientId = Convert.ToInt32(User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid)?.Value ?? "-1");
+                    var clientId =
+                        Convert.ToInt32(User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid)?.Value ?? "-1");
 
                     if (clientId > 0)
                     {
                         Client.ClientId = clientId;
-                        Client.NetworkId = clientId == 1 ? 0 : User.Claims.First(_claim => _claim.Type == ClaimTypes.PrimarySid).Value.ConvertGuidToLong(System.Globalization.NumberStyles.HexNumber);
+                        Client.NetworkId = clientId == 1
-                        Client.Level = (EFClient.Permission)Enum.Parse(typeof(EFClient.Permission), User.Claims.First(c => c.Type == ClaimTypes.Role).Value);
+                            ? 0
-                        Client.CurrentAlias = new EFAlias() { Name = User.Claims.First(c => c.Type == ClaimTypes.NameIdentifier).Value };
+                            : User.Claims.First(_claim => _claim.Type == ClaimTypes.PrimarySid).Value
+                                .ConvertGuidToLong(NumberStyles.HexNumber);
+                        Client.Level = (Data.Models.Client.EFClient.Permission)Enum.Parse(
+                            typeof(Data.Models.Client.EFClient.Permission),
+                            User.Claims.First(c => c.Type == ClaimTypes.Role).Value);
+                        Client.CurrentAlias = new EFAlias
+                            { Name = User.Claims.First(c => c.Type == ClaimTypes.NameIdentifier).Value };
                         Authorized = Client.ClientId >= 0;
                     }
                 }
 
                 catch (InvalidOperationException)
                 {
-
                 }
 
                 catch (KeyNotFoundException)
@@ -112,8 +122,8 @@ namespace SharedLibraryCore
             else if (!HttpContext.Request.Headers.ContainsKey("X-Forwarded-For"))
             {
                 Client.ClientId = 1;
-                Client.Level = EFClient.Permission.Console;
+                Client.Level = Data.Models.Client.EFClient.Permission.Console;
-                Client.CurrentAlias = new EFAlias() { Name = "IW4MAdmin" };
+                Client.CurrentAlias = new EFAlias { Name = "IW4MAdmin" };
                 Authorized = true;
                 var claims = new[]
                 {

SharedLibraryCore/Command.cs

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Data.Models.Client;
 using SharedLibraryCore.Commands;
 using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Interfaces;
 using static SharedLibraryCore.Server;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
@@ -17,7 +17,11 @@ namespace SharedLibraryCore
     {
         protected readonly CommandConfiguration _config;
         protected readonly ITranslationLookup _translationLookup;
+        private string alias;
         protected ILogger logger;
+        private string name;
+        private EFClient.Permission permission;
+        private Game[] supportedGames;
 
         public Command(CommandConfiguration config, ITranslationLookup layout)
         {
@@ -26,12 +30,23 @@ namespace SharedLibraryCore
             SupportedGames = new Game[0];
         }
 
+        /// <summary>
+        ///     Helper property to determine the number of required args
+        /// </summary>
+        public int RequiredArgumentCount => Arguments.Count(c => c.Required);
+
+
+        /// <summary>
+        ///     Argument list for the command
+        /// </summary>
+        public CommandArgument[] Arguments { get; protected set; } = new CommandArgument[0];
+
         /// <summary>
         ///     Executes the command
         /// </summary>
         /// <param name="gameEvent"></param>
         /// <returns></returns>
-        abstract public Task ExecuteAsync(GameEvent gameEvent);
+        public abstract Task ExecuteAsync(GameEvent gameEvent);
 
         /// <summary>
         ///     Specifies the name and string that triggers the command
@@ -52,7 +67,6 @@ namespace SharedLibraryCore
                 }
             }
         }
-        private string name;
 
         /// <summary>
         ///     Specifies the command description
@@ -62,7 +76,8 @@ namespace SharedLibraryCore
         /// <summary>
         ///     Helper property to provide the syntax of the command
         /// </summary>
-        public string Syntax => $"{_translationLookup["COMMAND_HELP_SYNTAX"]} {_config.CommandPrefix ?? "!"}{Alias} {string.Join(" ", Arguments.Select(a => $"<{(a.Required ? "" : _translationLookup["COMMAND_HELP_OPTIONAL"] + " ")}{a.Name}>"))}";
+        public string Syntax =>
+            $"{_translationLookup["COMMAND_HELP_SYNTAX"]} {_config.CommandPrefix ?? "!"}{Alias} {string.Join(" ", Arguments.Select(a => $"<{(a.Required ? "" : _translationLookup["COMMAND_HELP_OPTIONAL"] + " ")}{a.Name}>"))}";
 
         /// <summary>
         ///     Alternate name for this command to be executed by
@@ -83,12 +98,6 @@ namespace SharedLibraryCore
                 }
             }
         }
-        private string alias;
-
-        /// <summary>
-        /// Helper property to determine the number of required args
-        /// </summary>
-        public int RequiredArgumentCount => Arguments.Count(c => c.Required);
 
         /// <summary>
         ///     Indicates if the command requires a target to execute on
@@ -114,7 +123,6 @@ namespace SharedLibraryCore
                 }
             }
         }
-        private EFClient.Permission permission;
 
         public Game[] SupportedGames
         {
@@ -133,13 +141,6 @@ namespace SharedLibraryCore
                 }
             }
         }
-        private Game[] supportedGames;
-
-
-        /// <summary>
-        /// Argument list for the command
-        /// </summary>
-        public CommandArgument[] Arguments { get; protected set; } = new CommandArgument[0];
 
         /// <summary>
         ///     indicates if this command allows impersonation (run as)

SharedLibraryCore/Commands/AddClientTagCommand.cs

@@ -1,8 +1,8 @@
-using SharedLibraryCore.Configuration;
+using System.Threading.Tasks;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Interfaces;
-using System.Threading.Tasks;
 using Data.Models;
+using Data.Models.Client;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
 
 namespace SharedLibraryCore.Commands
 {
@@ -10,7 +10,8 @@ namespace SharedLibraryCore.Commands
     {
         private readonly IMetaService _metaService;
 
-        public AddClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(config, layout)
+        public AddClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) :
+            base(config, layout)
         {
             Name = "addclienttag";
             Description = layout["COMMANDS_ADD_CLIENT_TAG_DESC"];
@@ -19,7 +20,7 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = false;
             Arguments = new[]
             {
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
                     Required = true

SharedLibraryCore/Commands/CommandExtensions.cs

@@ -1,13 +1,15 @@
-using System;
+namespace SharedLibraryCore.Commands
-using System.Collections.Generic;
-using System.Text;
-
-namespace SharedLibraryCore.Commands
 {
     public static class CommandExtensions
     {
-        public static bool IsTargetingSelf(this GameEvent gameEvent) => gameEvent.Origin?.Equals(gameEvent.Target) ?? false;
+        public static bool IsTargetingSelf(this GameEvent gameEvent)
+        {
+            return gameEvent.Origin?.Equals(gameEvent.Target) ?? false;
+        }
 
-        public static bool CanPerformActionOnTarget(this GameEvent gameEvent) => gameEvent.Origin?.Level > gameEvent.Target?.Level;
+        public static bool CanPerformActionOnTarget(this GameEvent gameEvent)
+        {
+            return gameEvent.Origin?.Level > gameEvent.Target?.Level;
+        }
     }
 }

SharedLibraryCore/Commands/CommandProcessing.cs

@@ -1,36 +1,35 @@
-using SharedLibraryCore.Configuration;
+using System;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Exceptions;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Exceptions;
 
 namespace SharedLibraryCore.Commands
 {
     public class CommandProcessing
     {
-        public static async Task<Command> ValidateCommand(GameEvent E, ApplicationConfiguration appConfig, CommandConfiguration commandConfig)
+        public static async Task<Command> ValidateCommand(GameEvent E, ApplicationConfiguration appConfig,
+            CommandConfiguration commandConfig)
         {
             var loc = Utilities.CurrentLocalization.LocalizationIndex;
             var Manager = E.Owner.Manager;
-            bool isBroadcast = E.Data.StartsWith(appConfig.BroadcastCommandPrefix);
+            var isBroadcast = E.Data.StartsWith(appConfig.BroadcastCommandPrefix);
-            int prefixLength = isBroadcast ? appConfig.BroadcastCommandPrefix.Length : appConfig.CommandPrefix.Length;
+            var prefixLength = isBroadcast ? appConfig.BroadcastCommandPrefix.Length : appConfig.CommandPrefix.Length;
 
-            string CommandString = E.Data.Substring(prefixLength, E.Data.Length - prefixLength).Split(' ')[0];
+            var CommandString = E.Data.Substring(prefixLength, E.Data.Length - prefixLength).Split(' ')[0];
             E.Message = E.Data;
 
             Command C = null;
             foreach (Command cmd in Manager.GetCommands()
                          .Where(c => c.Name != null))
-            {
                 if (cmd.Name.Equals(CommandString, StringComparison.OrdinalIgnoreCase) ||
                     (cmd.Alias ?? "").Equals(CommandString, StringComparison.OrdinalIgnoreCase))
                 {
                     C = cmd;
                 }
-            }
 
             if (C == null)
             {
@@ -51,7 +50,7 @@ namespace SharedLibraryCore.Commands
             }
 
             E.Data = E.Data.RemoveWords(1);
-            String[] Args = E.Data.Trim().Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+            var Args = E.Data.Trim().Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
             // todo: the code below can be cleaned up 
 
             if (E.Origin.Level < C.Permission)
@@ -60,7 +59,7 @@ namespace SharedLibraryCore.Commands
                 throw new CommandException($"{E.Origin} does not have access to \"{C.Name}\"");
             }
 
-            if (Args.Length < (C.RequiredArgumentCount))
+            if (Args.Length < C.RequiredArgumentCount)
             {
                 E.Origin.Tell(loc["COMMAND_MISSINGARGS"]);
                 E.Origin.Tell(C.Syntax);
@@ -71,14 +70,14 @@ namespace SharedLibraryCore.Commands
             {
                 if (Args.Length > 0)
                 {
-                    if (!Int32.TryParse(Args[0], out int cNum))
+                    if (!int.TryParse(Args[0], out var cNum))
                     {
                         cNum = -1;
                     }
 
                     if (Args[0][0] == '@') // user specifying target by database ID
                     {
-                        int.TryParse(Args[0].Substring(1, Args[0].Length - 1), out int dbID);
+                        int.TryParse(Args[0].Substring(1, Args[0].Length - 1), out var dbID);
 
                         var found = await Manager.GetClientService().Get(dbID);
                         if (found != null)
@@ -90,12 +89,13 @@ namespace SharedLibraryCore.Commands
                         }
                     }
 
-                    else if (Args[0].Length < 3 && cNum > -1 && cNum < E.Owner.MaxClients) // user specifying target by client num
+                    else if (Args[0].Length < 3 && cNum > -1 && cNum < E.Owner.MaxClients
+                            ) // user specifying target by client num
                     {
                         if (E.Owner.Clients[cNum] != null)
                         {
                             E.Target = E.Owner.Clients[cNum];
-                            E.Data = String.Join(" ", Args.Skip(1));
+                            E.Data = string.Join(" ", Args.Skip(1));
                         }
                     }
                 }
@@ -111,11 +111,11 @@ namespace SharedLibraryCore.Commands
                         throw new CommandException($"{E.Origin} had multiple players found for {C.Name}");
                     }
 
-                    else if (matchingPlayers.Count == 1)
+                    if (matchingPlayers.Count == 1)
                     {
                         E.Target = matchingPlayers.First();
 
-                        string escapedName = Regex.Escape(E.Target.CleanedName);
+                        var escapedName = Regex.Escape(E.Target.CleanedName);
                         var reg = new Regex($"(\"{escapedName}\")|({escapedName})", RegexOptions.IgnoreCase);
                         E.Data = reg.Replace(E.Data, "", 1).Trim();
 
@@ -135,23 +135,21 @@ namespace SharedLibraryCore.Commands
                     {
                         E.Origin.Tell(loc["COMMAND_TARGET_MULTI"]);
                         foreach (var p in matchingPlayers)
-                        {
                             E.Origin.Tell($"[(Color::Yellow){p.ClientNumber}(Color::White)] {p.Name}");
-                        }
                         throw new CommandException($"{E.Origin} had multiple players found for {C.Name}");
                     }
 
-                    else if (matchingPlayers.Count == 1)
+                    if (matchingPlayers.Count == 1)
                     {
                         E.Target = matchingPlayers.First();
 
-                        string escapedName = Regex.Escape(E.Target.CleanedName);
+                        var escapedName = Regex.Escape(E.Target.CleanedName);
-                        string escapedArg = Regex.Escape(Args[0]);
+                        var escapedArg = Regex.Escape(Args[0]);
                         var reg = new Regex($"({escapedName})|({escapedArg})", RegexOptions.IgnoreCase);
                         E.Data = reg.Replace(E.Data, "", 1).Trim();
 
                         if ((E.Data.Trim() == E.Target.CleanedName.ToLower().Trim() ||
-                            E.Data == String.Empty) &&
+                             E.Data == string.Empty) &&
                             C.RequiresTarget)
                         {
                             E.Origin.Tell(loc["COMMAND_MISSINGARGS"]);

SharedLibraryCore/Commands/ListClientTags.cs

@@ -1,20 +1,18 @@
-using SharedLibraryCore.Configuration;
+using System.Linq;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Interfaces;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using Data.Models;
+using Data.Models.Client;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
 
 namespace SharedLibraryCore.Commands
 {
-
     public class ListClientTags : Command
     {
         private readonly IMetaService _metaService;
 
-        public ListClientTags(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(config, layout)
+        public ListClientTags(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(
+            config, layout)
         {
             Name = "listclienttags";
             Description = layout["COMMANDS_LIST_CLIENT_TAGS_DESC"];

SharedLibraryCore/Commands/NativeCommands.cs

@@ -1,20 +1,19 @@
-using Microsoft.EntityFrameworkCore;
+using System;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Helpers;
-using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.Services;
-using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Security.Cryptography;
-using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Data.Abstractions;
 using Data.Models;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Serilog.Context;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Helpers;
+using SharedLibraryCore.Interfaces;
 using static Data.Models.Client.EFClient;
 
 namespace SharedLibraryCore.Commands
@@ -24,7 +23,8 @@ namespace SharedLibraryCore.Commands
     /// </summary>
     public class QuitCommand : Command
     {
-        public QuitCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+        public QuitCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
         {
             Name = "quit";
             Description = _translationLookup["COMMANDS_QUIT_DESC"];
@@ -45,7 +45,8 @@ namespace SharedLibraryCore.Commands
     /// </summary>
     public class RestartCommand : Command
     {
-        public RestartCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+        public RestartCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
         {
             Name = "restart";
             Description = _translationLookup["COMMANDS_RESTART_DESC"];
@@ -67,7 +68,8 @@ namespace SharedLibraryCore.Commands
     /// </summary>
     public class OwnerCommand : Command
     {
-        public OwnerCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+        public OwnerCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
         {
             Name = "owner";
             Description = _translationLookup["COMMANDS_OWNER_DESC"];
@@ -85,8 +87,8 @@ namespace SharedLibraryCore.Commands
                 return;
             }
 
-            if (await (E.Owner.Manager.GetClientService() as ClientService).GetOwnerCount() == 0 &&
+            if (await E.Owner.Manager.GetClientService().GetOwnerCount() == 0 &&
-                !E.Origin.SetLevel(EFClient.Permission.Owner, Utilities.IW4MAdminClient(E.Owner)).Failed)
+                !E.Origin.SetLevel(Permission.Owner, Utilities.IW4MAdminClient(E.Owner)).Failed)
             {
                 E.Origin.Tell(_translationLookup["COMMANDS_OWNER_SUCCESS"]);
             }
@@ -103,7 +105,9 @@ namespace SharedLibraryCore.Commands
     public class WarnCommand : Command
     {
         private readonly ApplicationConfiguration _appConfig;
-        public WarnCommand(ApplicationConfiguration appConfig, CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+
+        public WarnCommand(ApplicationConfiguration appConfig, CommandConfiguration config,
+            ITranslationLookup translationLookup) : base(config, translationLookup)
         {
             Name = "warn";
             Description = _translationLookup["COMMANDS_WARN_DESC"];
@@ -112,12 +116,12 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = true;
             Arguments = new[]
             {
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
                     Required = true
                 },
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGS_REASON"],
                     Required = true
@@ -143,7 +147,8 @@ namespace SharedLibraryCore.Commands
     /// </summary>
     public class WarnClearCommand : Command
     {
-        public WarnClearCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+        public WarnClearCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
         {
             Name = "warnclear";
             Description = _translationLookup["COMMANDS_WARNCLEAR_DESC"];
@@ -152,7 +157,7 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = true;
             Arguments = new[]
             {
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
                     Required = true
@@ -178,7 +183,8 @@ namespace SharedLibraryCore.Commands
     {
         private readonly ApplicationConfiguration _appConfig;
 
-        public KickCommand(ApplicationConfiguration appConfig, CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+        public KickCommand(ApplicationConfiguration appConfig, CommandConfiguration config,
+            ITranslationLookup translationLookup) : base(config, translationLookup)
         {
             Name = "kick";
             Description = _translationLookup["COMMANDS_KICK_DESC"];
@@ -187,12 +193,12 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = true;
             Arguments = new[]
             {
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
                     Required = true
                 },
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGS_REASON"],
                     Required = true
@@ -204,7 +210,8 @@ namespace SharedLibraryCore.Commands
         public override async Task ExecuteAsync(GameEvent gameEvent)
         {
             var reason = gameEvent.Data.FindRuleForReason(_appConfig, gameEvent.Owner);
-            switch ((await gameEvent.Target.Kick(reason, gameEvent.Origin).WaitAsync(Utilities.DefaultCommandTimeout, gameEvent.Owner.Manager.CancellationToken)).FailReason)
+            switch ((await gameEvent.Target.Kick(reason, gameEvent.Origin).WaitAsync(Utilities.DefaultCommandTimeout,
+                        gameEvent.Owner.Manager.CancellationToken)).FailReason)
             {
                 case GameEvent.EventFailReason.None:
                     gameEvent.Origin.Tell(_translationLookup["COMMANDS_KICK_SUCCESS"].FormatExt(gameEvent.Target.Name));
@@ -224,9 +231,11 @@ namespace SharedLibraryCore.Commands
     /// </summary>
     public class TempBanCommand : Command
     {
+        private static readonly string TempBanRegex = @"([0-9]+\w+)\ (.+)";
         private readonly ApplicationConfiguration _appConfig;
 
-        public TempBanCommand(ApplicationConfiguration appConfig, CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+        public TempBanCommand(ApplicationConfiguration appConfig, CommandConfiguration config,
+            ITranslationLookup translationLookup) : base(config, translationLookup)
         {
             Name = "tempban";
             Description = _translationLookup["COMMANDS_TEMPBAN_DESC"];
@@ -235,17 +244,17 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = true;
             Arguments = new[]
             {
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
                     Required = true
                 },
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGS_DURATION"],
-                    Required = true,
+                    Required = true
                 },
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGS_REASON"],
                     Required = true
@@ -254,8 +263,6 @@ namespace SharedLibraryCore.Commands
             _appConfig = appConfig;
         }
 
-        private static readonly string TempBanRegex = @"([0-9]+\w+)\ (.+)";
-
         public override async Task ExecuteAsync(GameEvent gameEvent)
         {
             var match = Regex.Match(gameEvent.Data, TempBanRegex);
@@ -271,16 +278,20 @@ namespace SharedLibraryCore.Commands
 
                 else
                 {
-                    switch ((await gameEvent.Target.TempBan(tempbanReason, length, gameEvent.Origin).WaitAsync(Utilities.DefaultCommandTimeout, gameEvent.Owner.Manager.CancellationToken)).FailReason)
+                    switch ((await gameEvent.Target.TempBan(tempbanReason, length, gameEvent.Origin)
+                                .WaitAsync(Utilities.DefaultCommandTimeout, gameEvent.Owner.Manager.CancellationToken))
+                            .FailReason)
                     {
                         case GameEvent.EventFailReason.None:
-                            gameEvent.Origin.Tell(_translationLookup["COMMANDS_TEMPBAN_SUCCESS"].FormatExt(gameEvent.Target, length.HumanizeForCurrentCulture()));
+                            gameEvent.Origin.Tell(_translationLookup["COMMANDS_TEMPBAN_SUCCESS"]
+                                .FormatExt(gameEvent.Target, length.HumanizeForCurrentCulture()));
                             break;
                         case GameEvent.EventFailReason.Exception:
                             gameEvent.Origin.Tell(_translationLookup["SERVER_ERROR_COMMAND_INGAME"]);
                             break;
                         default:
-                            gameEvent.Origin.Tell(_translationLookup["COMMANDS_TEMPBAN_FAIL"].FormatExt(gameEvent.Target.Name));
+                            gameEvent.Origin.Tell(_translationLookup["COMMANDS_TEMPBAN_FAIL"]
+                                .FormatExt(gameEvent.Target.Name));
                             break;
                     }
                 }
@@ -294,7 +305,9 @@ namespace SharedLibraryCore.Commands
     public class BanCommand : Command
     {
         private readonly ApplicationConfiguration _appConfig;
-        public BanCommand(ApplicationConfiguration appConfig, CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+
+        public BanCommand(ApplicationConfiguration appConfig, CommandConfiguration config,
+            ITranslationLookup translationLookup) : base(config, translationLookup)
         {
             Name = "ban";
             Description = _translationLookup["COMMANDS_BAN_DESC"];
@@ -303,12 +316,12 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = true;
             Arguments = new[]
             {
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
                     Required = true
                 },
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGS_REASON"],
                     Required = true
@@ -320,7 +333,9 @@ namespace SharedLibraryCore.Commands
         public override async Task ExecuteAsync(GameEvent gameEvent)
         {
             var reason = gameEvent.Data.FindRuleForReason(_appConfig, gameEvent.Owner);
-            switch ((await gameEvent.Target.Ban(reason, gameEvent.Origin, false).WaitAsync(Utilities.DefaultCommandTimeout, gameEvent.Owner.Manager.CancellationToken)).FailReason)
+            switch ((await gameEvent.Target.Ban(reason, gameEvent.Origin, false)
+                        .WaitAsync(Utilities.DefaultCommandTimeout, gameEvent.Owner.Manager.CancellationToken))
+                    .FailReason)
             {
                 case GameEvent.EventFailReason.None:
                     gameEvent.Origin.Tell(_translationLookup["COMMANDS_BAN_SUCCESS"].FormatExt(gameEvent.Target.Name));
@@ -340,7 +355,8 @@ namespace SharedLibraryCore.Commands
     /// </summary>
     public class UnbanCommand : Command
     {
-        public UnbanCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+        public UnbanCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
         {
             Name = "unban";
             Description = _translationLookup["COMMANDS_UNBAN_DESC"];
@@ -349,12 +365,12 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = true;
             Arguments = new[]
             {
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGS_CLIENTID"],
-                    Required = true,
+                    Required = true
                 },
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGS_REASON"],
                     Required = true
@@ -365,10 +381,13 @@ namespace SharedLibraryCore.Commands
         public override async Task ExecuteAsync(GameEvent E)
         {
             // todo: don't do the lookup here
-            var penalties = await E.Owner.Manager.GetPenaltyService().GetActivePenaltiesAsync(E.Target.AliasLinkId);
+            var penalties = await E.Owner.Manager.GetPenaltyService().GetActivePenaltiesAsync(E.Target.AliasLinkId, E.Target.CurrentAliasId);
-            if (penalties.Where(p => p.Type == EFPenalty.PenaltyType.Ban || p.Type == EFPenalty.PenaltyType.TempBan).FirstOrDefault() != null)
+            if (penalties
+                    .FirstOrDefault(p =>
+                        p.Type == EFPenalty.PenaltyType.Ban || p.Type == EFPenalty.PenaltyType.TempBan) != null)
             {
-                switch ((await E.Target.Unban(E.Data, E.Origin).WaitAsync(Utilities.DefaultCommandTimeout, E.Owner.Manager.CancellationToken)).FailReason)
+                switch ((await E.Target.Unban(E.Data, E.Origin)
+                            .WaitAsync(Utilities.DefaultCommandTimeout, E.Owner.Manager.CancellationToken)).FailReason)
                 {
                     case GameEvent.EventFailReason.None:
                         E.Origin.Tell(_translationLookup["COMMANDS_UNBAN_SUCCESS"].FormatExt(E.Target));
@@ -391,7 +410,8 @@ namespace SharedLibraryCore.Commands
     /// </summary>
     public class FastRestartCommand : Command
     {
-        public FastRestartCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+        public FastRestartCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
         {
             Name = "fastrestart";
             Description = _translationLookup["COMMANDS_FASTRESTART_DESC"];
@@ -404,9 +424,10 @@ namespace SharedLibraryCore.Commands
         {
             await E.Owner.ExecuteCommandAsync("fast_restart");
 
-            var _ = !E.Origin.Masked ?
+            var _ = !E.Origin.Masked
-                  E.Owner.Broadcast($"(Color::Accent){E.Origin.Name} (Color::White){_translationLookup["COMMANDS_FASTRESTART_UNMASKED"]}") :
+                ? E.Owner.Broadcast(
-                 E.Owner.Broadcast(_translationLookup["COMMANDS_FASTRESTART_MASKED"]);
+                    $"(Color::Accent){E.Origin.Name} (Color::White){_translationLookup["COMMANDS_FASTRESTART_UNMASKED"]}")
+                : E.Owner.Broadcast(_translationLookup["COMMANDS_FASTRESTART_MASKED"]);
         }
     }
 
@@ -415,7 +436,8 @@ namespace SharedLibraryCore.Commands
     /// </summary>
     public class MapRotateCommand : Command
     {
-        public MapRotateCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+        public MapRotateCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
         {
             Name = "maprotate";
             Description = _translationLookup["COMMANDS_MAPROTATE_DESC"];
@@ -426,9 +448,11 @@ namespace SharedLibraryCore.Commands
 
         public override async Task ExecuteAsync(GameEvent E)
         {
-            _ = !E.Origin.Masked ?
+            _ = !E.Origin.Masked
-                E.Owner.Broadcast($"{_translationLookup["COMMANDS_MAPROTATE"]} [(Color::Accent){E.Origin.Name}(Color::White)]", E.Origin) :
+                ? E.Owner.Broadcast(
-                E.Owner.Broadcast(_translationLookup["COMMANDS_MAPROTATE"], E.Origin);
+                    $"{_translationLookup["COMMANDS_MAPROTATE"]} [(Color::Accent){E.Origin.Name}(Color::White)]",
+                    E.Origin)
+                : E.Owner.Broadcast(_translationLookup["COMMANDS_MAPROTATE"], E.Origin);
 
             await Task.Delay(E.Owner.Manager.GetApplicationSettings().Configuration().MapChangeDelaySeconds * 1000);
             await E.Owner.ExecuteCommandAsync("map_rotate");
@@ -440,7 +464,8 @@ namespace SharedLibraryCore.Commands
     /// </summary>
     public class SetLevelCommand : Command
     {
-        public SetLevelCommand(CommandConfiguration config, ITranslationLookup translationLookup, ILogger<SetLevelCommand> logger) : base(config, translationLookup)
+        public SetLevelCommand(CommandConfiguration config, ITranslationLookup translationLookup,
+            ILogger<SetLevelCommand> logger) : base(config, translationLookup)
         {
             Name = "setlevel";
             Description = _translationLookup["COMMANDS_SETLEVEL_DESC"];
@@ -449,12 +474,12 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = true;
             Arguments = new[]
             {
-                 new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
                     Required = true
                 },
-                 new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGS_LEVEL"],
                     Required = true
@@ -465,28 +490,28 @@ namespace SharedLibraryCore.Commands
 
         public override async Task ExecuteAsync(GameEvent gameEvent)
         {
-            Permission oldPerm = gameEvent.Target.Level;
+            var oldPerm = gameEvent.Target.Level;
-            Permission newPerm = Utilities.MatchPermission(gameEvent.Data);
+            var newPerm = Utilities.MatchPermission(gameEvent.Data);
-            bool allowMultiOwner = gameEvent.Owner.Manager.GetApplicationSettings().Configuration().EnableMultipleOwners;
+            var allowMultiOwner = gameEvent.Owner.Manager.GetApplicationSettings().Configuration().EnableMultipleOwners;
-            bool steppedPrivileges = gameEvent.Owner.Manager.GetApplicationSettings().Configuration().EnableSteppedHierarchy;
+            var steppedPrivileges =
+                gameEvent.Owner.Manager.GetApplicationSettings().Configuration().EnableSteppedHierarchy;
             var targetClient = gameEvent.Target;
 
             // pre setup logic
-            bool canPromoteSteppedPriv = gameEvent.Origin.Level > newPerm || gameEvent.Origin.Level == Permission.Owner;
+            var canPromoteSteppedPriv = gameEvent.Origin.Level > newPerm || gameEvent.Origin.Level == Permission.Owner;
-            bool hasOwner = await gameEvent.Owner.Manager.GetClientService().GetOwnerCount() > 0;
+            var hasOwner = await gameEvent.Owner.Manager.GetClientService().GetOwnerCount() > 0;
 
             // trying to set self
             if (gameEvent.Target == gameEvent.Origin)
             {
                 gameEvent.Origin.Tell(_translationLookup["COMMANDS_SETLEVEL_SELF"]);
-                return;
             }
 
             // origin permission not high enough
             else if (gameEvent.Origin.Level < gameEvent.Target.Level)
             {
-                gameEvent.Origin.Tell(_translationLookup["COMMANDS_SETLEVEL_PERMISSION"].FormatExt(gameEvent.Target.Name));
+                gameEvent.Origin.Tell(_translationLookup["COMMANDS_SETLEVEL_PERMISSION"]
-                return;
+                    .FormatExt(gameEvent.Target.Name));
             }
 
             // trying to set owner without enabling multiple owners
@@ -494,21 +519,20 @@ namespace SharedLibraryCore.Commands
             {
                 // only one owner is allowed
                 gameEvent.Origin.Tell(_translationLookup["COMMANDS_SETLEVEL_OWNER"]);
-                return;
             }
 
             // trying to set level when only owner is allowed to
             else if (gameEvent.Origin.Level < Permission.Owner && !steppedPrivileges)
             {
                 // only the owner is allowed to set levels
-                gameEvent.Origin.Tell($"{_translationLookup["COMMANDS_SETLEVEL_STEPPEDDISABLED"]} (Color::White){gameEvent.Target.Name}");
+                gameEvent.Origin.Tell(
-                return;
+                    $"{_translationLookup["COMMANDS_SETLEVEL_STEPPEDDISABLED"]} (Color::White){gameEvent.Target.Name}");
             }
 
             else if (gameEvent.Target.Level == Permission.Flagged)
             {
-                gameEvent.Origin.Tell(_translationLookup["COMMANDS_SETLEVEL_FLAGGED"].FormatExt(gameEvent.Target.Name + "(Color::White)"));
+                gameEvent.Origin.Tell(_translationLookup["COMMANDS_SETLEVEL_FLAGGED"]
-                return;
+                    .FormatExt(gameEvent.Target.Name + "(Color::White)"));
             }
 
             // stepped privilege is enabled, but the new level is too high
@@ -523,13 +547,16 @@ namespace SharedLibraryCore.Commands
             // valid
             else if (newPerm > Permission.Banned)
             {
-                targetClient = targetClient.ClientNumber < 0 ?
+                targetClient = targetClient.ClientNumber < 0
-                    gameEvent.Owner.Manager.GetActiveClients()
+                    ? gameEvent.Owner.Manager.GetActiveClients()
-                    .FirstOrDefault(c => c.ClientId == targetClient?.ClientId) ?? targetClient : targetClient;
+                        .FirstOrDefault(c => c.ClientId == targetClient?.ClientId) ?? targetClient
+                    : targetClient;
 
-                logger.LogDebug("Beginning set level of client {origin} to {newPermission}", gameEvent.Origin.ToString(), newPerm);
+                logger.LogDebug("Beginning set level of client {origin} to {newPermission}",
+                    gameEvent.Origin.ToString(), newPerm);
 
-                var result = await targetClient.SetLevel(newPerm, gameEvent.Origin).WaitAsync(Utilities.DefaultCommandTimeout, gameEvent.Owner.Manager.CancellationToken);
+                var result = await targetClient.SetLevel(newPerm, gameEvent.Origin)
+                    .WaitAsync(Utilities.DefaultCommandTimeout, gameEvent.Owner.Manager.CancellationToken);
 
                 if (result.Failed)
                 {
@@ -547,6 +574,7 @@ namespace SharedLibraryCore.Commands
                             gameEvent.Origin.ToString(),
                             result.FailReason);
                     }
+
                     gameEvent.Origin.Tell(_translationLookup["SERVER_ERROR_COMMAND_INGAME"]);
                     return;
                 }
@@ -559,9 +587,11 @@ namespace SharedLibraryCore.Commands
                 }
 
                 // inform the origin that the client has been updated
-                _ = newPerm < oldPerm ?
+                _ = newPerm < oldPerm
-                    gameEvent.Origin.Tell(_translationLookup["COMMANDS_SETLEVEL_DEMOTE_SUCCESS"].FormatExt(targetClient.Name)) :
+                    ? gameEvent.Origin.Tell(_translationLookup["COMMANDS_SETLEVEL_DEMOTE_SUCCESS"]
-                    gameEvent.Origin.Tell(_translationLookup["COMMANDS_SETLEVEL_SUCCESS"].FormatExt(targetClient.Name));
+                        .FormatExt(targetClient.Name))
+                    : gameEvent.Origin.Tell(
+                        _translationLookup["COMMANDS_SETLEVEL_SUCCESS"].FormatExt(targetClient.Name));
             }
 
             // all other tests failed so it's invalid group
@@ -577,7 +607,8 @@ namespace SharedLibraryCore.Commands
     /// </summary>
     public class MemoryUsageCommand : Command
     {
-        public MemoryUsageCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+        public MemoryUsageCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
         {
             Name = "usage";
             Description = _translationLookup["COMMANDS_USAGE_DESC"];
@@ -588,7 +619,8 @@ namespace SharedLibraryCore.Commands
 
         public override Task ExecuteAsync(GameEvent E)
         {
-            E.Origin.Tell(_translationLookup["COMMANDS_USAGE_TEXT"].FormatExt(Math.Round(((System.Diagnostics.Process.GetCurrentProcess().PrivateMemorySize64 / 2048f) / 1200f), 1)));
+            E.Origin.Tell(_translationLookup["COMMANDS_USAGE_TEXT"]
+                .FormatExt(Math.Round(Process.GetCurrentProcess().PrivateMemorySize64 / 2048f / 1200f, 1)));
             return Task.CompletedTask;
         }
     }
@@ -598,7 +630,8 @@ namespace SharedLibraryCore.Commands
     /// </summary>
     public class UptimeCommand : Command
     {
-        public UptimeCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+        public UptimeCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
         {
             Name = "uptime";
             Description = _translationLookup["COMMANDS_UPTIME_DESC"];
@@ -609,7 +642,7 @@ namespace SharedLibraryCore.Commands
 
         public override Task ExecuteAsync(GameEvent E)
         {
-            var uptime = DateTime.Now - System.Diagnostics.Process.GetCurrentProcess().StartTime;
+            var uptime = DateTime.Now - Process.GetCurrentProcess().StartTime;
             var loc = _translationLookup;
             E.Origin.Tell(loc["COMMANDS_UPTIME_TEXT"].FormatExt(uptime.HumanizeForCurrentCulture(4)));
             return Task.CompletedTask;
@@ -622,7 +655,8 @@ namespace SharedLibraryCore.Commands
     /// </summary>
     public class LoadMapCommand : Command
     {
-        public LoadMapCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+        public LoadMapCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
         {
             Name = "map";
             Description = _translationLookup["COMMANDS_MAP_DESC"];
@@ -631,7 +665,7 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = false;
             Arguments = new[]
             {
-                 new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGS_MAP"],
                     Required = true
@@ -641,15 +675,16 @@ namespace SharedLibraryCore.Commands
 
         public override async Task ExecuteAsync(GameEvent E)
         {
-            string newMap = E.Data.Trim();
+            var newMap = E.Data.Trim();
-            int delay = E.Owner.Manager.GetApplicationSettings().Configuration().MapChangeDelaySeconds * 1000;
+            var delay = E.Owner.Manager.GetApplicationSettings().Configuration().MapChangeDelaySeconds * 1000;
 
-            var foundMap = E.Owner.Maps.FirstOrDefault(_map => _map.Name.Equals(newMap, StringComparison.InvariantCultureIgnoreCase) ||
+            var foundMap = E.Owner.Maps.FirstOrDefault(_map =>
+                _map.Name.Equals(newMap, StringComparison.InvariantCultureIgnoreCase) ||
                 _map.Alias.Equals(newMap, StringComparison.InvariantCultureIgnoreCase));
 
-            _ = foundMap == null ?
+            _ = foundMap == null
-                E.Owner.Broadcast(_translationLookup["COMMANDS_MAP_UKN"].FormatExt(newMap)) :
+                ? E.Owner.Broadcast(_translationLookup["COMMANDS_MAP_UKN"].FormatExt(newMap))
-                 E.Owner.Broadcast(_translationLookup["COMMANDS_MAP_SUCCESS"].FormatExt(foundMap.Alias));
+                : E.Owner.Broadcast(_translationLookup["COMMANDS_MAP_SUCCESS"].FormatExt(foundMap.Alias));
 
             await Task.Delay(delay);
             await E.Owner.LoadMap(foundMap?.Name ?? newMap);
@@ -662,7 +697,8 @@ namespace SharedLibraryCore.Commands
     /// </summary>
     public class ListRulesCommands : Command
     {
-        public ListRulesCommands(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+        public ListRulesCommands(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
         {
             Name = "rules";
             Description = _translationLookup["COMMANDS_RULES_DESC"];
@@ -676,9 +712,9 @@ namespace SharedLibraryCore.Commands
             if (E.Owner.Manager.GetApplicationSettings().Configuration().GlobalRules?.Length < 1 &&
                 E.Owner.ServerConfig.Rules?.Length < 1)
             {
-                var _ = E.Message.IsBroadcastCommand(_config.BroadcastCommandPrefix) ?
+                var _ = E.Message.IsBroadcastCommand(_config.BroadcastCommandPrefix)
-                      E.Owner.Broadcast(_translationLookup["COMMANDS_RULES_NONE"]) :
+                    ? E.Owner.Broadcast(_translationLookup["COMMANDS_RULES_NONE"])
-                      E.Origin.Tell(_translationLookup["COMMANDS_RULES_NONE"]);
+                    : E.Origin.Tell(_translationLookup["COMMANDS_RULES_NONE"]);
             }
 
             else
@@ -706,13 +742,13 @@ namespace SharedLibraryCore.Commands
     }
 
 
-
     /// <summary>
     ///     Flag given client for specified reason
     /// </summary>
     public class FlagClientCommand : Command
     {
-        public FlagClientCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+        public FlagClientCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
         {
             Name = "flag";
             Description = _translationLookup["COMMANDS_FLAG_DESC"];
@@ -721,12 +757,12 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = true;
             Arguments = new[]
             {
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
                     Required = true
                 },
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGS_REASON"],
                     Required = true
@@ -736,7 +772,8 @@ namespace SharedLibraryCore.Commands
 
         public override async Task ExecuteAsync(GameEvent E)
         {
-            switch ((await E.Target.Flag(E.Data, E.Origin).WaitAsync(Utilities.DefaultCommandTimeout, E.Owner.Manager.CancellationToken)).FailReason)
+            switch ((await E.Target.Flag(E.Data, E.Origin)
+                        .WaitAsync(Utilities.DefaultCommandTimeout, E.Owner.Manager.CancellationToken)).FailReason)
             {
                 case GameEvent.EventFailReason.Permission:
                     E.Origin.Tell(_translationLookup["COMMANDS_FLAG_FAIL"].FormatExt(E.Target.Name));
@@ -759,7 +796,8 @@ namespace SharedLibraryCore.Commands
     /// </summary>
     public class UnflagClientCommand : Command
     {
-        public UnflagClientCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+        public UnflagClientCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
         {
             Name = "unflag";
             Description = _translationLookup["COMMANDS_UNFLAG_DESC"];
@@ -768,12 +806,12 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = true;
             Arguments = new[]
             {
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
                     Required = true
                 },
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGS_REASON"],
                     Required = true
@@ -783,7 +821,8 @@ namespace SharedLibraryCore.Commands
 
         public override async Task ExecuteAsync(GameEvent E)
         {
-            switch ((await E.Target.Unflag(E.Data, E.Origin).WaitAsync(Utilities.DefaultCommandTimeout, E.Owner.Manager.CancellationToken)).FailReason)
+            switch ((await E.Target.Unflag(E.Data, E.Origin)
+                        .WaitAsync(Utilities.DefaultCommandTimeout, E.Owner.Manager.CancellationToken)).FailReason)
             {
                 case GameEvent.EventFailReason.None:
                     E.Origin.Tell(_translationLookup["COMMANDS_FLAG_UNFLAG"].FormatExt(E.Target.Name));
@@ -806,12 +845,13 @@ namespace SharedLibraryCore.Commands
     /// </summary>
     public class MaskCommand : Command
     {
-        public MaskCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+        public MaskCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
         {
             Name = "mask";
             Description = _translationLookup["COMMANDS_MASK_DESC"];
             Alias = "hide";
-            Permission = EFClient.Permission.Moderator;
+            Permission = Permission.Moderator;
             RequiresTarget = false;
         }
 
@@ -837,7 +877,8 @@ namespace SharedLibraryCore.Commands
     /// </summary>
     public class ListBanInfoCommand : Command
     {
-        public ListBanInfoCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+        public ListBanInfoCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
         {
             Name = "baninfo";
             Description = _translationLookup["COMMANDS_BANINFO_DESC"];
@@ -846,7 +887,7 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = true;
             Arguments = new[]
             {
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
                     Required = true
@@ -856,7 +897,8 @@ namespace SharedLibraryCore.Commands
 
         public override async Task ExecuteAsync(GameEvent E)
         {
-            var existingPenalties = await E.Owner.Manager.GetPenaltyService().GetActivePenaltiesAsync(E.Target.AliasLinkId, E.Target.IPAddress);
+            var existingPenalties = await E.Owner.Manager.GetPenaltyService()
+                .GetActivePenaltiesAsync(E.Target.AliasLinkId, E.Target.CurrentAliasId, E.Target.IPAddress);
             var penalty = existingPenalties.FirstOrDefault(b => b.Type > EFPenalty.PenaltyType.Kick);
 
             if (penalty == null)
@@ -872,8 +914,9 @@ namespace SharedLibraryCore.Commands
 
             else
             {
-                string remainingTime = (penalty.Expires.Value - DateTime.UtcNow).HumanizeForCurrentCulture();
+                var remainingTime = (penalty.Expires.Value - DateTime.UtcNow).HumanizeForCurrentCulture();
-                E.Origin.Tell(_translationLookup["COMMANDS_BANINFO_TB_SUCCESS"].FormatExt(E.Target.Name, penalty.Offense, remainingTime));
+                E.Origin.Tell(_translationLookup["COMMANDS_BANINFO_TB_SUCCESS"]
+                    .FormatExt(E.Target.Name, penalty.Offense, remainingTime));
             }
         }
     }
@@ -883,7 +926,8 @@ namespace SharedLibraryCore.Commands
     /// </summary>
     public class ExecuteRConCommand : Command
     {
-        public ExecuteRConCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+        public ExecuteRConCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
         {
             Name = "rcon";
             Description = _translationLookup["COMMANDS_RCON_DESC"];
@@ -892,7 +936,7 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = false;
             Arguments = new[]
             {
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGS_COMMANDS"],
                     Required = true
@@ -904,9 +948,7 @@ namespace SharedLibraryCore.Commands
         {
             var response = await E.Owner.ExecuteCommandAsync(E.Data.Trim());
             foreach (var item in response)
-            {
                 E.Origin.Tell(item);
-            }
 
             if (response.Length == 0)
             {
@@ -920,7 +962,8 @@ namespace SharedLibraryCore.Commands
     /// </summary>
     public class ListExternalIPCommand : Command
     {
-        public ListExternalIPCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+        public ListExternalIPCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
         {
             Name = "getexternalip";
             Description = _translationLookup["COMMANDS_IP_DESC"];
@@ -954,7 +997,7 @@ namespace SharedLibraryCore.Commands
             _contextFactory = contextFactory;
             Arguments = new[]
             {
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGS_INACTIVE"],
                     Required = false
@@ -964,7 +1007,7 @@ namespace SharedLibraryCore.Commands
 
         public override async Task ExecuteAsync(GameEvent E)
         {
-            int inactiveDays = 30;
+            var inactiveDays = 30;
 
             try
             {
@@ -1007,7 +1050,8 @@ namespace SharedLibraryCore.Commands
     /// </summary>
     public class SetPasswordCommand : Command
     {
-        public SetPasswordCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+        public SetPasswordCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
         {
             Name = "setpassword";
             Description = _translationLookup["COMMANDS_SETPASSWORD_DESC"];
@@ -1017,7 +1061,7 @@ namespace SharedLibraryCore.Commands
             AllowImpersonation = true;
             Arguments = new[]
             {
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGS_PASSWORD"],
                     Required = true
@@ -1033,7 +1077,7 @@ namespace SharedLibraryCore.Commands
                 return;
             }
 
-            string[] hashedPassword = Helpers.Hashing.Hash(E.Data);
+            var hashedPassword = Hashing.Hash(E.Data);
 
             E.Origin.Password = hashedPassword[0];
             E.Origin.PasswordSalt = hashedPassword[1];
@@ -1048,7 +1092,8 @@ namespace SharedLibraryCore.Commands
     /// </summary>
     public class GetClientPingCommand : Command
     {
-        public GetClientPingCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+        public GetClientPingCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
         {
             Name = "ping";
             Description = _translationLookup["COMMANDS_PING_DESC"];
@@ -1057,7 +1102,7 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = false;
             Arguments = new[]
             {
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
                     Required = false
@@ -1092,7 +1137,8 @@ namespace SharedLibraryCore.Commands
     {
         private readonly IMetaService _metaService;
 
-        public SetGravatarCommand(CommandConfiguration config, ITranslationLookup translationLookup, IMetaService metaService) : base(config, translationLookup)
+        public SetGravatarCommand(CommandConfiguration config, ITranslationLookup translationLookup,
+            IMetaService metaService) : base(config, translationLookup)
         {
             Name = "setgravatar";
             Description = _translationLookup["COMMANDS_GRAVATAR_DESC"];
@@ -1101,7 +1147,7 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = false;
             Arguments = new[]
             {
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGS_GRAVATAR"],
                     Required = true
@@ -1115,7 +1161,8 @@ namespace SharedLibraryCore.Commands
         {
             using (var md5 = MD5.Create())
             {
-                string gravatarEmail = string.Concat(md5.ComputeHash(E.Data.ToLower().Select(d => Convert.ToByte(d)).ToArray())
+                var gravatarEmail = string.Concat(md5
+                    .ComputeHash(E.Data.ToLower().Select(d => Convert.ToByte(d)).ToArray())
                     .Select(h => h.ToString("x2")));
                 await _metaService.AddPersistentMeta("GravatarEmail", gravatarEmail, E.Origin);
             }
@@ -1129,19 +1176,22 @@ namespace SharedLibraryCore.Commands
     /// </summary>
     public class NextMapCommand : Command
     {
-        public NextMapCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+        public NextMapCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
         {
             Name = "nextmap";
             Description = _translationLookup["COMMANDS_NEXTMAP_DESC"];
             Alias = "nm";
-            Permission = EFClient.Permission.User;
+            Permission = Permission.User;
             RequiresTarget = false;
         }
 
         public static async Task<string> GetNextMap(Server s, ITranslationLookup lookup)
         {
-            string mapRotation = (await s.GetDvarAsync<string>("sv_mapRotation")).Value?.ToLower() ?? "";
+            var mapRotation = (await s.GetDvarAsync<string>("sv_mapRotation")).Value?.ToLower() ?? "";
-            var regexMatches = Regex.Matches(mapRotation, @"((?:gametype|exec) +(?:([a-z]{1,4})(?:.cfg)?))? *map ([a-z|_|\d]+)", RegexOptions.IgnoreCase).ToList();
+            var regexMatches = Regex.Matches(mapRotation,
+                    @"((?:gametype|exec) +(?:([a-z]{1,4})(?:.cfg)?))? *map ([a-z|_|\d]+)", RegexOptions.IgnoreCase)
+                .ToList();
 
             // find the current map in the rotation
             var currentMap = regexMatches.Where(m => m.Groups[3].ToString() == s.CurrentMap.Name);
@@ -1151,7 +1201,8 @@ namespace SharedLibraryCore.Commands
             // no maprotation at all
             if (regexMatches.Count() == 0)
             {
-                return lookup["COMMANDS_NEXTMAP_SUCCESS"].FormatExt(s.CurrentMap.Alias, Utilities.GetLocalizedGametype(s.Gametype));
+                return lookup["COMMANDS_NEXTMAP_SUCCESS"]
+                    .FormatExt(s.CurrentMap.Alias, Utilities.GetLocalizedGametype(s.Gametype));
             }
 
             // the current map is not in rotation
@@ -1161,7 +1212,8 @@ namespace SharedLibraryCore.Commands
             }
 
             // there's duplicate maps in rotation
-            else if (currentMap.Count() > 1)
+
+            if (currentMap.Count() > 1)
             {
                 // gametype has been manually specified
                 var duplicateMaps = currentMap.Where(m => !string.IsNullOrEmpty(m.Groups[1].ToString()));
@@ -1176,16 +1228,17 @@ namespace SharedLibraryCore.Commands
             }
 
             // if the current map is the last map, the next map is the first map
-            var nextMapMatch = currentMap.First().Index != lastMap.Index ?
+            var nextMapMatch = currentMap.First().Index != lastMap.Index
-               regexMatches[regexMatches.IndexOf(currentMap.First()) + 1] :
+                ? regexMatches[regexMatches.IndexOf(currentMap.First()) + 1]
-               regexMatches.First();
+                : regexMatches.First();
 
-            string nextMapName = nextMapMatch.Groups[3].ToString();
+            var nextMapName = nextMapMatch.Groups[3].ToString();
 
-            nextMap = s.Maps.FirstOrDefault(m => m.Name == nextMapMatch.Groups[3].ToString()) ?? new Map() { Alias = nextMapName, Name = nextMapName };
+            nextMap = s.Maps.FirstOrDefault(m => m.Name == nextMapMatch.Groups[3].ToString()) ??
-            string nextGametype = nextMapMatch.Groups[2].ToString().Length == 0 ?
+                      new Map { Alias = nextMapName, Name = nextMapName };
-                Utilities.GetLocalizedGametype(s.Gametype) :
+            var nextGametype = nextMapMatch.Groups[2].ToString().Length == 0
-                Utilities.GetLocalizedGametype(nextMapMatch.Groups[2].ToString());
+                ? Utilities.GetLocalizedGametype(s.Gametype)
+                : Utilities.GetLocalizedGametype(nextMapMatch.Groups[2].ToString());
 
             return lookup["COMMANDS_NEXTMAP_SUCCESS"].FormatExt(nextMap.Alias, nextGametype);
         }

SharedLibraryCore/Commands/PrivateMessageAdminsCommand.cs

@@ -1,16 +1,16 @@
-using SharedLibraryCore.Configuration;
+using System.Linq;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Interfaces;
-using System;
-using System.Linq;
 using System.Threading.Tasks;
+using Data.Models.Client;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
 using static SharedLibraryCore.Server;
 
 namespace SharedLibraryCore.Commands
 {
     public class PrivateMessageAdminsCommand : Command
     {
-        public PrivateMessageAdminsCommand(CommandConfiguration config, ITranslationLookup lookup) : base(config, lookup)
+        public PrivateMessageAdminsCommand(CommandConfiguration config, ITranslationLookup lookup) : base(config,
+            lookup)
         {
             Name = "privatemessageadmin";
             Description = lookup["COMMANDS_PMADMINS_DESC"];
@@ -21,12 +21,14 @@ namespace SharedLibraryCore.Commands
 
         public override Task ExecuteAsync(GameEvent E)
         {
-            bool isGameSupported = _config.Commands[nameof(PrivateMessageAdminsCommand)].SupportedGames.Length > 0 &&
+            var isGameSupported = _config.Commands[nameof(PrivateMessageAdminsCommand)].SupportedGames.Length > 0 &&
-                _config.Commands[nameof(PrivateMessageAdminsCommand)].SupportedGames.Contains(E.Owner.GameName);
+                                  _config.Commands[nameof(PrivateMessageAdminsCommand)].SupportedGames
+                                      .Contains(E.Owner.GameName);
 
             if (!isGameSupported)
             {
-                E.Origin.Tell(_translationLookup["COMMANDS_GAME_NOT_SUPPORTED"].FormatExt(nameof(PrivateMessageAdminsCommand)));
+                E.Origin.Tell(_translationLookup["COMMANDS_GAME_NOT_SUPPORTED"]
+                    .FormatExt(nameof(PrivateMessageAdminsCommand)));
                 return Task.CompletedTask;
             }
 

SharedLibraryCore/Commands/RemoveClientTagCommand.cs

@@ -1,8 +1,8 @@
-using SharedLibraryCore.Configuration;
+using System.Threading.Tasks;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Interfaces;
-using System.Threading.Tasks;
 using Data.Models;
+using Data.Models.Client;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
 
 namespace SharedLibraryCore.Commands
 {
@@ -10,7 +10,8 @@ namespace SharedLibraryCore.Commands
     {
         private readonly IMetaService _metaService;
 
-        public RemoveClientTag(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(config, layout)
+        public RemoveClientTag(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(
+            config, layout)
         {
             Name = "removeclienttag";
             Description = layout["COMMANDS_REMOVE_CLIENT_TAG_DESC"];
@@ -19,7 +20,7 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = false;
             Arguments = new[]
             {
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
                     Required = true

SharedLibraryCore/Commands/RequestTokenCommand.cs

@@ -1,7 +1,7 @@
-using SharedLibraryCore.Configuration;
+using System.Threading.Tasks;
-using SharedLibraryCore.Database.Models;
+using Data.Models.Client;
+using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Interfaces;
-using System.Threading.Tasks;
 
 namespace SharedLibraryCore.Commands
 {
@@ -22,7 +22,8 @@ namespace SharedLibraryCore.Commands
         public override Task ExecuteAsync(GameEvent E)
         {
             var state = E.Owner.Manager.TokenAuthenticator.GenerateNextToken(E.Origin.NetworkId);
-            E.Origin.Tell(string.Format(_translationLookup["COMMANDS_GENERATETOKEN_SUCCESS"], state.Token, $"{state.RemainingTime} {_translationLookup["GLOBAL_MINUTES"]}", E.Origin.ClientId));
+            E.Origin.Tell(string.Format(_translationLookup["COMMANDS_GENERATETOKEN_SUCCESS"], state.Token,
+                $"{state.RemainingTime} {_translationLookup["GLOBAL_MINUTES"]}", E.Origin.ClientId));
 
             return Task.CompletedTask;
         }

SharedLibraryCore/Commands/RunAsCommand.cs

@@ -1,8 +1,8 @@
-using SharedLibraryCore.Configuration;
+using System.Linq;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Interfaces;
-using System.Linq;
 using System.Threading.Tasks;
+using Data.Models.Client;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
 
 namespace SharedLibraryCore.Commands
 {
@@ -17,7 +17,7 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = true;
             Arguments = new[]
             {
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = lookup["COMMANDS_ARGS_COMMANDS"],
                     Required = true
@@ -40,7 +40,7 @@ namespace SharedLibraryCore.Commands
             }
 
             var cmd = $"{Utilities.CommandPrefix}{gameEvent.Data}";
-            var impersonatedCommandEvent = new GameEvent()
+            var impersonatedCommandEvent = new GameEvent
             {
                 Type = GameEvent.EventType.Command,
                 Origin = gameEvent.Target,
@@ -52,7 +52,8 @@ namespace SharedLibraryCore.Commands
             };
             gameEvent.Owner.Manager.AddEvent(impersonatedCommandEvent);
 
-            var result = await impersonatedCommandEvent.WaitAsync(Utilities.DefaultCommandTimeout, gameEvent.Owner.Manager.CancellationToken);
+            var result = await impersonatedCommandEvent.WaitAsync(Utilities.DefaultCommandTimeout,
+                gameEvent.Owner.Manager.CancellationToken);
             await result.WaitAsync(Utilities.DefaultCommandTimeout, gameEvent.Owner.Manager.CancellationToken);
 
             // remove the added command response
@@ -63,9 +64,8 @@ namespace SharedLibraryCore.Commands
                 .ToList();
 
             foreach (var output in responses)
-            {
+                await gameEvent.Origin.Tell(_translationLookup["COMMANDS_RUN_AS_SUCCESS"].FormatExt(output))
-                await gameEvent.Origin.Tell(_translationLookup["COMMANDS_RUN_AS_SUCCESS"].FormatExt(output)).WaitAsync();
+                    .WaitAsync();
-            }
         }
     }
 }

SharedLibraryCore/Commands/SetClientTagCommand.cs

@@ -1,9 +1,9 @@
-using SharedLibraryCore.Configuration;
+using System.Linq;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Interfaces;
-using System.Linq;
 using System.Threading.Tasks;
 using Data.Models;
+using Data.Models.Client;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
 
 namespace SharedLibraryCore.Commands
 {
@@ -12,7 +12,8 @@ namespace SharedLibraryCore.Commands
         private readonly IMetaService _metaService;
 
 
-        public SetClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(config, layout)
+        public SetClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) :
+            base(config, layout)
         {
             Name = "setclienttag";
             Description = layout["COMMANDS_SET_CLIENT_TAG_DESC"];
@@ -21,7 +22,7 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = true;
             Arguments = new[]
             {
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
                     Required = true

SharedLibraryCore/Commands/UnlinkClientCommand.cs

@@ -1,7 +1,7 @@
-using SharedLibraryCore.Configuration;
+using System.Threading.Tasks;
-using SharedLibraryCore.Database.Models;
+using Data.Models.Client;
+using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Interfaces;
-using System.Threading.Tasks;
 
 namespace SharedLibraryCore.Commands
 {

SharedLibraryCore/Commands/UnsetClientTagCommand.cs

@@ -1,9 +1,8 @@
-using SharedLibraryCore.Configuration;
+using System.Threading.Tasks;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Interfaces;
-using System.Linq;
-using System.Threading.Tasks;
 using Data.Models;
+using Data.Models.Client;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
 
 namespace SharedLibraryCore.Commands
 {
@@ -12,7 +11,8 @@ namespace SharedLibraryCore.Commands
         private readonly IMetaService _metaService;
 
 
-        public UnsetClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(config, layout)
+        public UnsetClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) :
+            base(config, layout)
         {
             Name = "unsetclienttag";
             Description = layout["COMMANDS_UNSET_CLIENT_TAG_DESC"];
@@ -21,7 +21,7 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = true;
             Arguments = new[]
             {
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
                     Required = true

SharedLibraryCore/Configuration/ApplicationConfiguration.cs

@@ -1,10 +1,10 @@
-using SharedLibraryCore.Configuration.Attributes;
+using System;
-using SharedLibraryCore.Interfaces;
-using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Newtonsoft.Json;
+using SharedLibraryCore.Configuration.Attributes;
+using SharedLibraryCore.Interfaces;
 using static Data.Models.Client.EFClient;
 
 namespace SharedLibraryCore.Configuration
@@ -12,7 +12,8 @@ namespace SharedLibraryCore.Configuration
     public class ApplicationConfiguration : IBaseConfiguration
     {
         [ConfigurationIgnore]
-        public CommunityInformationConfiguration CommunityInformation { get; set; } = new CommunityInformationConfiguration();
+        public CommunityInformationConfiguration CommunityInformation { get; set; } =
+            new CommunityInformationConfiguration();
 
         [LocalizedDisplayName("SETUP_ENABLE_WEBFRONT")]
         [ConfigurationLinked("WebfrontBindUrl", "ManualWebfrontUrl", "WebfrontPrimaryColor", "WebfrontSecondaryColor",
@@ -38,8 +39,7 @@ namespace SharedLibraryCore.Configuration
         [LocalizedDisplayName("WEBFRONT_CONFIGURATION_CUSTOM_BRANDING")]
         public string WebfrontCustomBranding { get; set; }
 
-        [ConfigurationIgnore]
+        [ConfigurationIgnore] public WebfrontConfiguration Webfront { get; set; } = new WebfrontConfiguration();
-        public WebfrontConfiguration Webfront { get; set; } = new WebfrontConfiguration();
 
         [LocalizedDisplayName("SETUP_ENABLE_MULTIOWN")]
         public bool EnableMultipleOwners { get; set; }
@@ -116,8 +116,7 @@ namespace SharedLibraryCore.Configuration
         [LocalizedDisplayName("WEBFRONT_CONFIGURATION_ENABLE_COLOR_CODES")]
         public bool EnableColorCodes { get; set; }
 
-        [ConfigurationIgnore] 
+        [ConfigurationIgnore] public string IngameAccentColorKey { get; set; } = "Cyan";
-        public string IngameAccentColorKey { get; set; } = "Cyan";
 
         [LocalizedDisplayName("WEBFRONT_CONFIGURATION_AUTOMESSAGE_PERIOD")]
         public int AutoMessagePeriod { get; set; }
@@ -135,7 +134,8 @@ namespace SharedLibraryCore.Configuration
         public int MapChangeDelaySeconds { get; set; } = 5;
 
         [LocalizedDisplayName("WEBFRONT_CONFIGURATION_BAN_DURATIONS")]
-        public TimeSpan[] BanDurations { get; set; } = {
+        public TimeSpan[] BanDurations { get; set; } =
+        {
             TimeSpan.FromHours(1),
             TimeSpan.FromHours(6),
             TimeSpan.FromDays(1),
@@ -148,17 +148,15 @@ namespace SharedLibraryCore.Configuration
         [LocalizedDisplayName("WEBFRONT_CONFIGURATION_PRESET_BAN_REASONS")]
         public Dictionary<string, string> PresetPenaltyReasons { get; set; } = new Dictionary<string, string>
             { { "afk", "Away from keyboard" }, { "ci", "Connection interrupted. Reconnect" } };
-        [LocalizedDisplayName(("WEBFRONT_CONFIGURATION_ENABLE_PRIVILEGED_USER_PRIVACY"))]
+
+        [LocalizedDisplayName("WEBFRONT_CONFIGURATION_ENABLE_PRIVILEGED_USER_PRIVACY")]
         public bool EnablePrivilegedUserPrivacy { get; set; }
 
-        [ConfigurationIgnore]
+        [ConfigurationIgnore] public bool EnableImplicitAccountLinking { get; set; } = false;
-        public bool EnableImplicitAccountLinking { get; set; } = false;
 
-        [ConfigurationIgnore] 
+        [ConfigurationIgnore] public TimeSpan MaxClientHistoryTime { get; set; } = TimeSpan.FromHours(12);
-        public TimeSpan MaxClientHistoryTime { get; set; } = TimeSpan.FromHours(12);
 
-        [ConfigurationIgnore] 
+        [ConfigurationIgnore] public TimeSpan ServerDataCollectionInterval { get; set; } = TimeSpan.FromMinutes(5);
-        public TimeSpan ServerDataCollectionInterval { get; set; } = TimeSpan.FromMinutes(5);
 
         public int ServerConnectionAttempts { get; set; } = 6;
 
@@ -167,16 +165,20 @@ namespace SharedLibraryCore.Configuration
             .GetValues(typeof(Permission))
             .Cast<Permission>()
             .ToDictionary(perm => perm, perm => perm.ToString());
-        [UIHint("ServerConfiguration")] 
+
-        public ServerConfiguration[] Servers { get; set; }
+        [UIHint("ServerConfiguration")] public ServerConfiguration[] Servers { get; set; }
 
         [ConfigurationIgnore] public int MinimumNameLength { get; set; } = 3;
         [ConfigurationIgnore] public string Id { get; set; }
         [ConfigurationIgnore] public string SubscriptionId { get; set; }
+
         [Obsolete("Moved to DefaultSettings")]
-        [ConfigurationIgnore] public MapConfiguration[] Maps { get; set; }
+        [ConfigurationIgnore]
+        public MapConfiguration[] Maps { get; set; }
+
         [Obsolete("Moved to DefaultSettings")]
-        [ConfigurationIgnore] public QuickMessageConfiguration[] QuickMessages { get; set; }
+        [ConfigurationIgnore]
+        public QuickMessageConfiguration[] QuickMessages { get; set; }
 
         [ConfigurationIgnore]
         [JsonIgnore]
@@ -192,30 +194,30 @@ namespace SharedLibraryCore.Configuration
             var loc = Utilities.CurrentLocalization.LocalizationIndex;
             Id = Guid.NewGuid().ToString();
 
-            EnableWebFront = Utilities.PromptBool(loc["SETUP_ENABLE_WEBFRONT"]);
+            EnableWebFront = loc["SETUP_ENABLE_WEBFRONT"].PromptBool();
-            EnableMultipleOwners = Utilities.PromptBool(loc["SETUP_ENABLE_MULTIOWN"]);
+            EnableMultipleOwners = loc["SETUP_ENABLE_MULTIOWN"].PromptBool();
-            EnableSteppedHierarchy = Utilities.PromptBool(loc["SETUP_ENABLE_STEPPEDPRIV"]);
+            EnableSteppedHierarchy = loc["SETUP_ENABLE_STEPPEDPRIV"].PromptBool();
-            EnableCustomSayName = Utilities.PromptBool(loc["SETUP_ENABLE_CUSTOMSAY"]);
+            EnableCustomSayName = loc["SETUP_ENABLE_CUSTOMSAY"].PromptBool();
 
-            bool useCustomParserEncoding = Utilities.PromptBool(loc["SETUP_USE_CUSTOMENCODING"]);
+            var useCustomParserEncoding = loc["SETUP_USE_CUSTOMENCODING"].PromptBool();
             if (useCustomParserEncoding)
             {
-                CustomParserEncoding = Utilities.PromptString(loc["SETUP_ENCODING_STRING"]);
+                CustomParserEncoding = loc["SETUP_ENCODING_STRING"].PromptString();
             }
 
             WebfrontBindUrl = "http://0.0.0.0:1624";
 
             if (EnableCustomSayName)
             {
-                CustomSayName = Utilities.PromptString(loc["SETUP_SAY_NAME"]);
+                CustomSayName = loc["SETUP_SAY_NAME"].PromptString();
             }
 
-            EnableSocialLink = Utilities.PromptBool(loc["SETUP_DISPLAY_SOCIAL"]);
+            EnableSocialLink = loc["SETUP_DISPLAY_SOCIAL"].PromptBool();
 
             if (EnableSocialLink)
             {
-                SocialLinkTitle = Utilities.PromptString(loc["SETUP_SOCIAL_TITLE"]);
+                SocialLinkTitle = loc["SETUP_SOCIAL_TITLE"].PromptString();
-                SocialLinkAddress = Utilities.PromptString(loc["SETUP_SOCIAL_LINK"]);
+                SocialLinkAddress = loc["SETUP_SOCIAL_LINK"].PromptString();
             }
 
             RConPollRate = 5000;

SharedLibraryCore/Configuration/Attributes/ConfigurationIgnore.cs

@@ -1,10 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace SharedLibraryCore.Configuration.Attributes
 {
-    [AttributeUsage(AttributeTargets.Property, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Property)]
     public class ConfigurationIgnore : Attribute
     {
     }

SharedLibraryCore/Configuration/Attributes/ConfigurationLinked.cs

@@ -2,14 +2,14 @@
 
 namespace SharedLibraryCore.Configuration.Attributes
 {
-    [AttributeUsage(AttributeTargets.Property, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Property)]
     public class ConfigurationLinked : Attribute
     {
-        public string[] LinkedPropertyNames { get; set; }
-
         public ConfigurationLinked(params string[] linkedPropertyNames)
         {
             LinkedPropertyNames = linkedPropertyNames;
         }
+
+        public string[] LinkedPropertyNames { get; set; }
     }
 }

SharedLibraryCore/Configuration/Attributes/ConfigurationOptional.cs

@@ -1,10 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace SharedLibraryCore.Configuration.Attributes
 {
-    [AttributeUsage(AttributeTargets.Property, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Property)]
     public class ConfigurationOptional : Attribute
     {
     }

SharedLibraryCore/Configuration/Attributes/LocalizedDisplayName.cs

@@ -1,13 +1,11 @@
-using System;
+using System.ComponentModel;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Text;
 
 namespace SharedLibraryCore.Configuration.Attributes
 {
-    class LocalizedDisplayName : DisplayNameAttribute
+    internal class LocalizedDisplayName : DisplayNameAttribute
     {
         private readonly string _localizationKey;
+
         public LocalizedDisplayName(string localizationKey)
         {
             _localizationKey = localizationKey;

SharedLibraryCore/Configuration/CommandConfiguration.cs

@@ -1,7 +1,7 @@
-using SharedLibraryCore.Interfaces;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
+using SharedLibraryCore.Interfaces;
 
 namespace SharedLibraryCore.Configuration
 {
@@ -13,7 +13,8 @@ namespace SharedLibraryCore.Configuration
         /// <summary>
         ///     Dict of command class names mapped to configurable properties
         /// </summary>
-        public Dictionary<string, CommandProperties> Commands { get; set; } = new Dictionary<string, CommandProperties>();
+        public Dictionary<string, CommandProperties> Commands { get; set; } =
+            new Dictionary<string, CommandProperties>();
 
         /// <summary>
         ///     prefix indicated the chat message is a command
@@ -32,6 +33,9 @@ namespace SharedLibraryCore.Configuration
             throw new NotImplementedException();
         }
 
-        public string Name() => nameof(CommandConfiguration);
+        public string Name()
+        {
+            return nameof(CommandConfiguration);
+        }
     }
 }

SharedLibraryCore/Configuration/CommunityInformationConfiguration.cs

@@ -1,12 +1,12 @@
-using System.Linq;
+namespace SharedLibraryCore.Configuration
-
-namespace SharedLibraryCore.Configuration
 {
     public class CommunityInformationConfiguration
     {
         public string Name { get; set; } = "IW4MAdmin - Configure In IW4MAdminSettings.json";
+
         public string Description { get; set; } =
             "IW4MAdmin is an administration tool for IW4x, Pluto T6, Pluto IW5, CoD4x, TeknoMW3, and most Call of Duty® dedicated servers. It allows complete control of your server; from changing maps, to banning players, IW4MAdmin monitors and records activity on your server(s). With plugin support, extending its functionality is a breeze.";
+
         public bool EnableBanner { get; set; } = true;
 
         public SocialAccountConfiguration[] SocialAccounts { get; set; } =

SharedLibraryCore/Configuration/DefaultSettings.cs

@@ -12,8 +12,14 @@ namespace SharedLibraryCore.Configuration
         public string[] DisallowedClientNames { get; set; }
         public GameStringConfiguration GameStrings { get; set; }
 
-        public IBaseConfiguration Generate() => this;
+        public IBaseConfiguration Generate()
+        {
+            return this;
+        }
 
-        public string Name() => "DefaultConfiguration";
+        public string Name()
+        {
+            return "DefaultConfiguration";
+        }
     }
 }

SharedLibraryCore/Configuration/Extensions/ConfigurationExtensions.cs

@@ -1,10 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.NetworkInformation;
 using System.Net.Sockets;
+using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using Microsoft.Win32;
 using SharedLibraryCore.Interfaces;
@@ -43,6 +43,11 @@ namespace SharedLibraryCore.Configuration.Extensions
             string searchPath = null;
             var isRegistryKey = parser.Configuration.DefaultInstallationDirectoryHint.Contains("HKEY_");
 
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                return null;
+            }
+
             try
             {
                 if (isRegistryKey)
@@ -51,10 +56,10 @@ namespace SharedLibraryCore.Configuration.Extensions
 
                     if (result == null)
                     {
-                        return new (string, string)[0];
+                        return Array.Empty<(string, string)>();
                     }
 
-                    searchPath = Path.Combine(result.ToString().Split(Path.DirectorySeparatorChar)
+                    searchPath = Path.Combine(result.ToString()!.Split(Path.DirectorySeparatorChar)
                         .Where(p => !p.Contains(".exe"))
                         .Select(p => p.Replace("\"", "")).ToArray());
                 }
@@ -72,14 +77,14 @@ namespace SharedLibraryCore.Configuration.Extensions
 
                 if (string.IsNullOrEmpty(searchPath))
                 {
-                    return new (string, string)[0];
+                    return Array.Empty<(string, string)>();
                 }
 
                 var possibleFiles = Directory.GetFiles(searchPath, "*.cfg", SearchOption.AllDirectories);
 
                 if (!possibleFiles.Any())
                 {
-                    return new (string, string)[0];
+                    return Array.Empty<(string, string)>();
                 }
 
                 var possiblePasswords = possibleFiles.SelectMany(File.ReadAllLines)
@@ -95,7 +100,7 @@ namespace SharedLibraryCore.Configuration.Extensions
             }
             catch
             {
-                return new (string, string)[0];
+                return Array.Empty<(string, string)>();
             }
         }
     }

SharedLibraryCore/Configuration/QuickMessageConfiguration.cs

@@ -1,6 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Text;
 using static SharedLibraryCore.Server;
 
 namespace SharedLibraryCore.Configuration

SharedLibraryCore/Configuration/ServerConfiguration.cs

@@ -1,14 +1,24 @@
-using SharedLibraryCore.Configuration.Attributes;
+using System;
-using SharedLibraryCore.Interfaces;
-using System;
 using System.Collections.Generic;
 using System.Linq;
+using SharedLibraryCore.Configuration.Attributes;
 using SharedLibraryCore.Configuration.Extensions;
+using SharedLibraryCore.Interfaces;
 
 namespace SharedLibraryCore.Configuration
 {
     public class ServerConfiguration : IBaseConfiguration
     {
+        private readonly IList<IRConParser> _rconParsers;
+        private IRConParser _selectedParser;
+
+        public ServerConfiguration()
+        {
+            _rconParsers = new List<IRConParser>();
+            Rules = new string[0];
+            AutoMessages = new string[0];
+        }
+
         [LocalizedDisplayName("WEBFRONT_CONFIGURATION_SERVER_IP")]
         public string IPAddress { get; set; }
 
@@ -45,50 +55,6 @@ namespace SharedLibraryCore.Configuration
         [ConfigurationOptional]
         public string CustomHostname { get; set; }
 
-        private readonly IList<IRConParser> _rconParsers;
-        private IRConParser _selectedParser;
-
-        public ServerConfiguration()
-        {
-            _rconParsers = new List<IRConParser>();
-            Rules = new string[0];
-            AutoMessages = new string[0];
-        }
-
-        public void AddRConParser(IRConParser parser)
-        {
-            _rconParsers.Add(parser);
-        }
-
-        public void AddEventParser(IEventParser parser)
-        {
-        }
-
-        public void ModifyParsers()
-        {
-            var loc = Utilities.CurrentLocalization.LocalizationIndex;
-            var parserVersions = _rconParsers.Select(p => p.Name).ToArray();
-            var (index, parser) = loc["SETUP_SERVER_RCON_PARSER_VERSION"].PromptSelection(parserVersions[0],
-                null, parserVersions);
-
-            if (index < 0)
-            {
-                return;
-            }
-
-            _selectedParser = _rconParsers.FirstOrDefault(p => p.Name == parser);
-            RConParserVersion = _selectedParser?.Version;
-            EventParserVersion = _selectedParser?.Version;
-
-            if (index <= 0 || _rconParsers[index].CanGenerateLogPath)
-            {
-                return;
-            }
-
-            Console.WriteLine(loc["SETUP_SERVER_NO_LOG"]);
-            ManualLogPath = loc["SETUP_SERVER_LOG_PATH"].PromptString();
-        }
-
         public IBaseConfiguration Generate()
         {
             ModifyParsers();
@@ -111,7 +77,7 @@ namespace SharedLibraryCore.Configuration
             }
 
             var defaultPort = _selectedParser.Configuration.DefaultRConPort;
-            Port = loc["SETUP_SERVER_PORT"].PromptInt(null, 1, ushort.MaxValue, defaultValue:defaultPort);
+            Port = loc["SETUP_SERVER_PORT"].PromptInt(null, 1, ushort.MaxValue, defaultPort);
 
             if (!string.IsNullOrEmpty(_selectedParser.Configuration.DefaultInstallationDirectoryHint))
             {
@@ -125,7 +91,8 @@ namespace SharedLibraryCore.Configuration
                         var (index, value) =
                             loc["SETUP_RCON_PASSWORD_PROMPT"].PromptSelection(loc["SETUP_RCON_PASSWORD_MANUAL"], null,
                                 passwords.Select(pw =>
-                                    $"{pw.Item1}{(string.IsNullOrEmpty(pw.Item2) ? "" : "        " + pw.Item2)}").ToArray());
+                                        $"{pw.Item1}{(string.IsNullOrEmpty(pw.Item2) ? "" : "        " + pw.Item2)}")
+                                    .ToArray());
 
                         if (index > 0)
                         {
@@ -157,5 +124,39 @@ namespace SharedLibraryCore.Configuration
         {
             return "ServerConfiguration";
         }
+
+        public void AddRConParser(IRConParser parser)
+        {
+            _rconParsers.Add(parser);
+        }
+
+        public void AddEventParser(IEventParser parser)
+        {
+        }
+
+        public void ModifyParsers()
+        {
+            var loc = Utilities.CurrentLocalization.LocalizationIndex;
+            var parserVersions = _rconParsers.Select(p => p.Name).ToArray();
+            var (index, parser) = loc["SETUP_SERVER_RCON_PARSER_VERSION"].PromptSelection(parserVersions[0],
+                null, parserVersions);
+
+            if (index < 0)
+            {
+                return;
+            }
+
+            _selectedParser = _rconParsers.FirstOrDefault(p => p.Name == parser);
+            RConParserVersion = _selectedParser?.Name;
+            EventParserVersion = _selectedParser?.Name;
+
+            if (index <= 0 || _rconParsers[index].CanGenerateLogPath)
+            {
+                return;
+            }
+
+            Console.WriteLine(loc["SETUP_SERVER_NO_LOG"]);
+            ManualLogPath = loc["SETUP_SERVER_LOG_PATH"].PromptString();
+        }
     }
 }

SharedLibraryCore/Configuration/Validation/ApplicationConfigurationValidator.cs

@@ -1,6 +1,7 @@
-using FluentValidation;
+using System;
-using System;
 using System.Linq;
+using System.Net;
+using FluentValidation;
 
 namespace SharedLibraryCore.Configuration.Validation
 {
@@ -35,7 +36,7 @@ namespace SharedLibraryCore.Configuration.Validation
                 .When(_app => _app.EnableWebfrontConnectionWhitelist);
 
             RuleForEach(_app => _app.WebfrontConnectionWhitelist)
-                .Must(_address => System.Net.IPAddress.TryParse(_address, out _));
+                .Must(_address => IPAddress.TryParse(_address, out _));
 
             RuleFor(_app => _app.CustomLocale)
                 .NotEmpty()

SharedLibraryCore/Configuration/Validation/ServerConfigurationValidator.cs

@@ -1,5 +1,4 @@
 using FluentValidation;
-using System.Net;
 
 namespace SharedLibraryCore.Configuration.Validation
 {

SharedLibraryCore/Dtos/AuditInfo.cs

@@ -7,6 +7,10 @@ namespace SharedLibraryCore.Dtos
     /// </summary>
     public class AuditInfo
     {
+        private string newValue;
+
+        private string oldValue;
+
         /// <summary>
         ///     name of the origin entity
         /// </summary>
@@ -42,16 +46,22 @@ namespace SharedLibraryCore.Dtos
         /// </summary>
         public string Data { get; set; }
 
-        private string oldValue;
         /// <summary>
         ///     previous value
         /// </summary>
-        public string OldValue { get => oldValue ?? "--"; set => oldValue = value; }
+        public string OldValue
+        {
+            get => oldValue ?? "--";
+            set => oldValue = value;
+        }
 
-        private string newValue;
         /// <summary>
         ///     new value
         /// </summary>
-        public string NewValue { get => newValue ?? "--"; set => newValue = value; }
+        public string NewValue
+        {
+            get => newValue ?? "--";
+            set => newValue = value;
+        }
     }
 }

SharedLibraryCore/Dtos/ClientInfo.cs

@@ -1,10 +1,12 @@
-namespace SharedLibraryCore.Dtos
+using Data.Models.Client;
+
+namespace SharedLibraryCore.Dtos
 {
     public class ClientInfo
     {
         public string Name { get; set; }
         public int ClientId { get; set; }
         public int LinkId { get; set; }
-        public Database.Models.EFClient.Permission Level { get; set; }
+        public EFClient.Permission Level { get; set; }
     }
 }

SharedLibraryCore/Dtos/CommandResponseInfo.cs

@@ -1,10 +1,4 @@
-using System;
+namespace SharedLibraryCore.Dtos
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SharedLibraryCore.Dtos
 {
     public class CommandResponseInfo
     {

SharedLibraryCore/Dtos/EntityInfo.cs

@@ -1,8 +1,4 @@
-using System;
+namespace SharedLibraryCore.Dtos
-using System.Collections.Generic;
-using System.Text;
-
-namespace SharedLibraryCore.Dtos
 {
     /// <summary>
     ///     This class holds the basic info for api entities

SharedLibraryCore/Dtos/EventInfo.cs

@@ -1,5 +1,4 @@
 using System;
-using static SharedLibraryCore.GameEvent;
 
 namespace SharedLibraryCore.Dtos
 {
@@ -15,6 +14,6 @@ namespace SharedLibraryCore.Dtos
         public EntityInfo OwnerEntity { get; set; }
         public DateTime EventTime { get; set; }
         public string ExtraInfo { get; set; }
-        public string Id { get; private set; } = Guid.NewGuid().ToString();
+        public string Id { get; } = Guid.NewGuid().ToString();
     }
 }

SharedLibraryCore/Dtos/FindClientRequest.cs

@@ -12,6 +12,9 @@
         /// </summary>
         public string Xuid { get; set; }
 
-        public string ToDebugString() => $"[Name={Name}, Xuid={Xuid}]";
+        public string ToDebugString()
+        {
+            return $"[Name={Name}, Xuid={Xuid}]";
+        }
     }
 }

SharedLibraryCore/Dtos/Meta/Requests/BaseClientMetaRequest.cs

@@ -1,8 +1,4 @@
-using System;
+namespace SharedLibraryCore.Dtos.Meta.Requests
-using System.Collections.Generic;
-using System.Text;
-
-namespace SharedLibraryCore.Dtos.Meta.Requests
 {
     public class BaseClientMetaRequest : PaginationRequest
     {

SharedLibraryCore/Dtos/Meta/Requests/ReceivedPenaltyRequest.cs

@@ -1,9 +1,4 @@
-using SharedLibraryCore.QueryHelper;
+namespace SharedLibraryCore.Dtos.Meta.Requests
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace SharedLibraryCore.Dtos.Meta.Requests
 {
     public class ReceivedPenaltyRequest : BaseClientMetaRequest
     {

SharedLibraryCore/Dtos/Meta/Responses/AdministeredPenaltyResponse.cs

@@ -1,8 +1,4 @@
-using System;
+namespace SharedLibraryCore.Dtos.Meta.Responses
-using System.Collections.Generic;
-using System.Text;
-
-namespace SharedLibraryCore.Dtos.Meta.Responses
 {
     public class AdministeredPenaltyResponse : ReceivedPenaltyResponse
     {

SharedLibraryCore/Dtos/Meta/Responses/BaseMetaResponse.cs

@@ -1,17 +1,17 @@
-using SharedLibraryCore.Interfaces;
+using System;
-using System;
+using SharedLibraryCore.Interfaces;
 
 namespace SharedLibraryCore.Dtos.Meta.Responses
 {
     public class BaseMetaResponse : IClientMeta, IClientMetaResponse
     {
-        public long MetaId { get; set; }
-        public int ClientId { get; set; }
         public MetaType Type { get; set; }
         public DateTime When { get; set; }
         public bool IsSensitive { get; set; }
         public bool ShouldDisplay { get; set; }
         public int? Column { get; set; }
         public int? Order { get; set; }
+        public long MetaId { get; set; }
+        public int ClientId { get; set; }
     }
 }

SharedLibraryCore/Dtos/Meta/Responses/InformationResponse.cs

@@ -1,9 +1,4 @@
-using SharedLibraryCore.Interfaces;
+namespace SharedLibraryCore.Dtos.Meta.Responses
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace SharedLibraryCore.Dtos.Meta.Responses
 {
     public class InformationResponse : BaseMetaResponse
     {

SharedLibraryCore/Dtos/Meta/Responses/ReceivedPenaltyResponse.cs

@@ -14,8 +14,15 @@ namespace SharedLibraryCore.Dtos.Meta.Responses
         public string Offense { get; set; }
         public string AutomatedOffense { get; set; }
         public DateTime? ExpirationDate { get; set; }
-        public string ExpiresInText => ExpirationDate.HasValue && ExpirationDate.Value > DateTime.UtcNow ? (ExpirationDate - DateTime.UtcNow).Value.HumanizeForCurrentCulture() : "";
+
-        public string LengthText => ExpirationDate.HasValue ? (ExpirationDate.Value.AddMinutes(1) - When).HumanizeForCurrentCulture() : "";
+        public string ExpiresInText => ExpirationDate.HasValue && ExpirationDate.Value > DateTime.UtcNow
+            ? (ExpirationDate - DateTime.UtcNow).Value.HumanizeForCurrentCulture()
+            : "";
+
+        public string LengthText => ExpirationDate.HasValue
+            ? (ExpirationDate.Value.AddMinutes(1) - When).HumanizeForCurrentCulture()
+            : "";
+
         public bool IsLinked { get; set; }
         public int LinkedClientId { get; set; }
     }

SharedLibraryCore/Dtos/Meta/Responses/UpdatedAliasResponse.cs

@@ -15,6 +15,9 @@
             return false;
         }
 
-        public override int GetHashCode() => $"{Name.StripColors()}{IPAddress}".GetStableHashCode();
+        public override int GetHashCode()
+        {
+            return $"{Name.StripColors()}{IPAddress}".GetStableHashCode();
+        }
     }
 }

SharedLibraryCore/Dtos/Meta/WebfrontTranslationHelper.cs

@@ -1,8 +1,4 @@
-using System;
+namespace SharedLibraryCore.Dtos.Meta
-using System.Collections.Generic;
-using System.Text;
-
-namespace SharedLibraryCore.Dtos.Meta
 {
     public class WebfrontTranslationHelper
     {

SharedLibraryCore/Dtos/PenaltyInfo.cs

@@ -22,11 +22,20 @@ namespace SharedLibraryCore.Dtos
         public string PenaltyTypeText => PenaltyType.ToString();
         public DateTime TimePunished { get; set; }
         public string TimePunishedString => TimePunished.HumanizeForCurrentCulture();
-        public string TimeRemaining => DateTime.UtcNow > Expires ? "" : $"{((Expires ?? DateTime.MaxValue).Year == DateTime.MaxValue.Year ? TimePunishedString : ((Expires ?? DateTime.MaxValue) - DateTime.UtcNow).HumanizeForCurrentCulture())}";
+
+        public string TimeRemaining => DateTime.UtcNow > Expires
+            ? ""
+            : $"{((Expires ?? DateTime.MaxValue).Year == DateTime.MaxValue.Year ? TimePunishedString : ((Expires ?? DateTime.MaxValue) - DateTime.UtcNow).HumanizeForCurrentCulture())}";
+
         public bool Expired => Expires.HasValue && Expires <= DateTime.UtcNow;
         public DateTime? Expires { get; set; }
-        public override bool Sensitive => PenaltyType == EFPenalty.PenaltyType.Flag || PenaltyType == EFPenalty.PenaltyType.Unflag;
+
+        public override bool Sensitive =>
+            PenaltyType == EFPenalty.PenaltyType.Flag || PenaltyType == EFPenalty.PenaltyType.Unflag;
+
         public bool IsEvade { get; set; }
-        public string AdditionalPenaltyInformation => $"{(!string.IsNullOrEmpty(AutomatedOffense) ? $" ({AutomatedOffense})" : "")}{(IsEvade ? $" ({Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_PENALTY_EVADE"]})" : "")}";
+
+        public string AdditionalPenaltyInformation =>
+            $"{(!string.IsNullOrEmpty(AutomatedOffense) ? $" ({AutomatedOffense})" : "")}{(IsEvade ? $" ({Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_PENALTY_EVADE"]})" : "")}";
     }
 }

SharedLibraryCore/Dtos/PlayerInfo.cs

@@ -1,8 +1,8 @@
-using SharedLibraryCore.Dtos.Meta.Responses;
+using System;
-using SharedLibraryCore.Interfaces;
-using System;
 using System.Collections.Generic;
 using Data.Models;
+using SharedLibraryCore.Dtos.Meta.Responses;
+using SharedLibraryCore.Interfaces;
 
 namespace SharedLibraryCore.Dtos
 {

SharedLibraryCore/Dtos/ServerInfo.cs

@@ -1,8 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
+using SharedLibraryCore.Helpers;
-using System.Threading.Tasks;
 
 namespace SharedLibraryCore.Dtos
 {
@@ -16,7 +15,7 @@ namespace SharedLibraryCore.Dtos
         public int MaxClients { get; set; }
         public List<ChatInfo> ChatHistory { get; set; }
         public List<PlayerInfo> Players { get; set; }
-        public Helpers.PlayerHistory[] PlayerHistory { get; set; }
+        public PlayerHistory[] PlayerHistory { get; set; }
         public List<ClientCountSnapshot> ClientCountHistory { get; set; }
         public long ID { get; set; }
         public bool Online { get; set; }

SharedLibraryCore/Dtos/SharedInfo.cs

@@ -1,5 +1,4 @@
-
+namespace SharedLibraryCore.Dtos
-namespace SharedLibraryCore.Dtos
 {
     public class SharedInfo
     {

SharedLibraryCore/Events/EventAPI.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Collections.Concurrent;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using SharedLibraryCore.Dtos;
 
@@ -7,8 +6,8 @@ namespace SharedLibraryCore.Events
 {
     public class EventApi
     {
-        const int MaxEvents = 25;
+        private const int MaxEvents = 25;
-        static ConcurrentQueue<EventInfo> RecentEvents = new ConcurrentQueue<EventInfo>();
+        private static readonly ConcurrentQueue<EventInfo> RecentEvents = new ConcurrentQueue<EventInfo>();
 
         public static IEnumerable<EventInfo> GetEvents(bool shouldConsume)
         {
@@ -28,32 +27,38 @@ namespace SharedLibraryCore.Events
             var E = gameEvent;
             // don't want to clog up the api with unknown events
             if (E.Type == GameEvent.EventType.Unknown)
+            {
                 return;
+            }
 
-            var apiEvent = new EventInfo()
+            var apiEvent = new EventInfo
             {
                 ExtraInfo = E.Extra?.ToString() ?? E.Data,
-                GameInfo = new EntityInfo()
+                GameInfo = new EntityInfo
                 {
                     Name = E.Owner.GameName.ToString(),
                     Id = (int)E.Owner.GameName
                 },
-                OwnerEntity = new EntityInfo()
+                OwnerEntity = new EntityInfo
                 {
                     Name = E.Owner.Hostname,
                     Id = E.Owner.EndPoint
                 },
-                OriginEntity = E.Origin == null ? null : new EntityInfo()
+                OriginEntity = E.Origin == null
+                    ? null
+                    : new EntityInfo
                     {
                         Id = E.Origin.ClientId,
                         Name = E.Origin.Name
                     },
-                TargetEntity = E.Target == null ? null : new EntityInfo()
+                TargetEntity = E.Target == null
+                    ? null
+                    : new EntityInfo
                     {
                         Id = E.Target.ClientId,
                         Name = E.Target.Name
                     },
-                EventType = new EntityInfo()
+                EventType = new EntityInfo
                 {
                     Id = (int)E.Type,
                     Name = E.Type.ToString()
@@ -73,7 +78,9 @@ namespace SharedLibraryCore.Events
         {
             // remove the first added event
             if (RecentEvents.Count >= MaxEvents)
+            {
                 RecentEvents.TryDequeue(out _);
+            }
 
             RecentEvents.Enqueue(info);
         }

SharedLibraryCore/Events/GameEvent.cs

@@ -1,11 +1,10 @@
-using SharedLibraryCore.Database.Models;
+using System;
-using SharedLibraryCore.Events;
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Serilog.Context;
+using SharedLibraryCore.Database.Models;
 
 namespace SharedLibraryCore
 {
@@ -17,186 +16,35 @@ namespace SharedLibraryCore
             ///     event execution did not fail
             /// </summary>
             None,
+
             /// <summary>
             ///     an internal exception prevented the event
             ///     from executing
             /// </summary>
             Exception,
+
             /// <summary>
             ///     event origin didn't have the necessary privileges
             ///     to execute the command
             /// </summary>
             Permission,
+
             /// <summary>
             ///     executing the event would cause an invalid state
             /// </summary>
             Invalid,
+
             /// <summary>
             ///     client is doing too much of something
             /// </summary>
             Throttle,
+
             /// <summary>
             ///     the event timed out before completion
             /// </summary>
             Timeout
         }
 
-        public enum EventType
-        {
-            /// <summary>
-            /// the event wasn't parsed properly
-            /// </summary>
-            Unknown,
-
-            // events "generated" by the server
-            /// <summary>
-            /// a server started being monitored
-            /// </summary>
-            Start,
-            /// <summary>
-            /// a server stopped being monitored
-            /// </summary>
-            Stop,
-            /// <summary>
-            /// a client was detecting as connecting via log
-            /// </summary>
-            Connect,
-            /// <summary>
-            /// a client was detecting joining by RCon
-            /// </summary>
-            Join,
-            /// <summary>
-            /// a client was detected leaving via log
-            /// </summary>
-            Quit,
-            /// <summary>
-            /// a client was detected leaving by RCon
-            /// </summary>
-            Disconnect,
-            /// <summary>
-            /// the current map ended
-            /// </summary>
-            MapEnd,
-            /// <summary>
-            /// the current map changed
-            /// </summary>
-            MapChange,
-            /// <summary>
-            /// a client was detected as starting to connect
-            /// </summary>
-            PreConnect,
-            /// <summary>
-            /// a client was detecting as starting to disconnect
-            /// </summary>
-            PreDisconnect,
-            /// <summary>
-            /// a client's information was updated
-            /// </summary>
-            Update,
-            /// <summary>
-            /// connection was lost to a server (the server has not responded after a number of attempts)
-            /// </summary>
-            ConnectionLost,
-            /// <summary>
-            /// connection was restored to a server (the server began responding again)
-            /// </summary>
-            ConnectionRestored,
-
-            // events "generated" by clients  
-            /// <summary>
-            /// a client sent a message
-            /// </summary>
-            Say = 100,
-            /// <summary>
-            /// a client was warned
-            /// </summary>
-            Warn = 101,
-            /// <summary>
-            /// all warnings for a client were cleared
-            /// </summary>
-            WarnClear = 102,
-            /// <summary>
-            /// a client was reported
-            /// </summary>
-            Report = 103,
-            /// <summary>
-            /// a client was flagged
-            /// </summary>
-            Flag = 104,
-            /// <summary>
-            /// a client was unflagged
-            /// </summary>
-            Unflag = 105,
-            /// <summary>
-            /// a client was kicked
-            /// </summary>
-            Kick = 106,
-            /// <summary>
-            /// a client was tempbanned
-            /// </summary>
-            TempBan = 107,
-            /// <summary>
-            /// a client was banned
-            /// </summary>
-            Ban = 108,
-            /// <summary>
-            /// a client was unbanned
-            /// </summary>
-            Unban = 109,
-            /// <summary>
-            /// a client entered a command
-            /// </summary>
-            Command = 110,
-            /// <summary>
-            /// a client's permission was changed
-            /// </summary>
-            ChangePermission = 111,
-            /// <summary>
-            /// client logged in to webfront
-            /// </summary>
-            Login = 112,
-            /// <summary>
-            /// client logged out of webfront
-            /// </summary>
-            Logout = 113,
-
-            // events "generated" by IW4MAdmin
-            /// <summary>
-            /// a message is sent to all clients
-            /// </summary>
-            Broadcast = 200,
-            /// <summary>
-            /// a message is sent to a specific client
-            /// </summary>
-            Tell = 201,
-
-            // events "generated" by script/log
-            /// <summary>
-            /// AC Damage Log
-            /// </summary>
-            ScriptDamage = 300,
-            /// <summary>
-            /// AC Kill Log
-            /// </summary>
-            ScriptKill = 301,
-            /// <summary>
-            /// damage info printed out by game script
-            /// </summary>
-            Damage = 302,
-            /// <summary>
-            /// kill info printed out by game script
-            /// </summary>
-            Kill = 303,
-            /// <summary>
-            /// team info printed out by game script
-            /// </summary>
-            JoinTeam = 304,
-            /// <summary>
-            /// used for community generated plugin events
-            /// </summary>
-            Other
-        }
-
         [Flags]
         public enum EventRequiredEntity
         {
@@ -213,12 +61,203 @@ namespace SharedLibraryCore
             Internal
         }
 
-        static long NextEventId;
+        public enum EventType
-        static long GetNextEventId()
         {
-            return Interlocked.Increment(ref NextEventId);
+            /// <summary>
+            ///     the event wasn't parsed properly
+            /// </summary>
+            Unknown,
+
+            // events "generated" by the server
+            /// <summary>
+            ///     a server started being monitored
+            /// </summary>
+            Start,
+
+            /// <summary>
+            ///     a server stopped being monitored
+            /// </summary>
+            Stop,
+
+            /// <summary>
+            ///     a client was detecting as connecting via log
+            /// </summary>
+            Connect,
+
+            /// <summary>
+            ///     a client was detecting joining by RCon
+            /// </summary>
+            Join,
+
+            /// <summary>
+            ///     a client was detected leaving via log
+            /// </summary>
+            Quit,
+
+            /// <summary>
+            ///     a client was detected leaving by RCon
+            /// </summary>
+            Disconnect,
+
+            /// <summary>
+            ///     the current map ended
+            /// </summary>
+            MapEnd,
+
+            /// <summary>
+            ///     the current map changed
+            /// </summary>
+            MapChange,
+
+            /// <summary>
+            ///     a client was detected as starting to connect
+            /// </summary>
+            PreConnect,
+
+            /// <summary>
+            ///     a client was detecting as starting to disconnect
+            /// </summary>
+            PreDisconnect,
+
+            /// <summary>
+            ///     a client's information was updated
+            /// </summary>
+            Update,
+
+            /// <summary>
+            ///     connection was lost to a server (the server has not responded after a number of attempts)
+            /// </summary>
+            ConnectionLost,
+
+            /// <summary>
+            ///     connection was restored to a server (the server began responding again)
+            /// </summary>
+            ConnectionRestored,
+
+            // events "generated" by clients  
+            /// <summary>
+            ///     a client sent a message
+            /// </summary>
+            Say = 100,
+
+            /// <summary>
+            ///     a client was warned
+            /// </summary>
+            Warn = 101,
+
+            /// <summary>
+            ///     all warnings for a client were cleared
+            /// </summary>
+            WarnClear = 102,
+
+            /// <summary>
+            ///     a client was reported
+            /// </summary>
+            Report = 103,
+
+            /// <summary>
+            ///     a client was flagged
+            /// </summary>
+            Flag = 104,
+
+            /// <summary>
+            ///     a client was unflagged
+            /// </summary>
+            Unflag = 105,
+
+            /// <summary>
+            ///     a client was kicked
+            /// </summary>
+            Kick = 106,
+
+            /// <summary>
+            ///     a client was tempbanned
+            /// </summary>
+            TempBan = 107,
+
+            /// <summary>
+            ///     a client was banned
+            /// </summary>
+            Ban = 108,
+
+            /// <summary>
+            ///     a client was unbanned
+            /// </summary>
+            Unban = 109,
+
+            /// <summary>
+            ///     a client entered a command
+            /// </summary>
+            Command = 110,
+
+            /// <summary>
+            ///     a client's permission was changed
+            /// </summary>
+            ChangePermission = 111,
+
+            /// <summary>
+            ///     client logged in to webfront
+            /// </summary>
+            Login = 112,
+
+            /// <summary>
+            ///     client logged out of webfront
+            /// </summary>
+            Logout = 113,
+
+            // events "generated" by IW4MAdmin
+            /// <summary>
+            ///     a message is sent to all clients
+            /// </summary>
+            Broadcast = 200,
+
+            /// <summary>
+            ///     a message is sent to a specific client
+            /// </summary>
+            Tell = 201,
+
+            // events "generated" by script/log
+            /// <summary>
+            ///     AC Damage Log
+            /// </summary>
+            ScriptDamage = 300,
+
+            /// <summary>
+            ///     AC Kill Log
+            /// </summary>
+            ScriptKill = 301,
+
+            /// <summary>
+            ///     damage info printed out by game script
+            /// </summary>
+            Damage = 302,
+
+            /// <summary>
+            ///     kill info printed out by game script
+            /// </summary>
+            Kill = 303,
+
+            /// <summary>
+            ///     team info printed out by game script
+            /// </summary>
+            JoinTeam = 304,
+
+            /// <summary>
+            ///     used for community generated plugin events
+            /// </summary>
+            Other
         }
 
+        private static long NextEventId;
+        private readonly ManualResetEvent _eventFinishedWaiter;
+        public string Data; // Data is usually the message sent by player
+        public string Message;
+        public EFClient Origin;
+        public Server Owner;
+        public EFClient Target;
+
+        public EventType Type;
+
         public GameEvent()
         {
             _eventFinishedWaiter = new ManualResetEvent(false);
@@ -226,34 +265,25 @@ namespace SharedLibraryCore
             Id = GetNextEventId();
         }
 
-        ~GameEvent()
-        {
-            _eventFinishedWaiter.Set();
-            _eventFinishedWaiter.Dispose();
-        }
-
-        public EventType Type;
         public EventSource Source { get; set; }
+
         /// <summary>
         ///     suptype of the event for more detailed classification
         /// </summary>
         public string Subtype { get; set; }
+
         public EventRequiredEntity RequiredEntity { get; set; }
-        public string Data; // Data is usually the message sent by player
+
-        public string Message;
         /// <summary>
         ///     Specifies the game time offset as printed in the log
         /// </summary>
         public long? GameTime { get; set; }
-        public EFClient Origin;
+
-        public EFClient Target;
         public EFClient ImpersonationOrigin { get; set; }
-        public Server Owner;
         public bool IsRemote { get; set; }
         public object Extra { get; set; }
-        private readonly ManualResetEvent _eventFinishedWaiter;
         public DateTime Time { get; set; }
-        public long Id { get; private set; }
+        public long Id { get; }
         public EventFailReason FailReason { get; set; }
         public bool Failed => FailReason != EventFailReason.None;
         public Guid CorrelationId { get; set; } = Guid.NewGuid();
@@ -264,6 +294,17 @@ namespace SharedLibraryCore
         /// </summary>
         public bool IsBlocking { get; set; }
 
+        private static long GetNextEventId()
+        {
+            return Interlocked.Increment(ref NextEventId);
+        }
+
+        ~GameEvent()
+        {
+            _eventFinishedWaiter.Set();
+            _eventFinishedWaiter.Dispose();
+        }
+
         public void Complete()
         {
             _eventFinishedWaiter.Set();
@@ -280,7 +321,7 @@ namespace SharedLibraryCore
         /// <returns>waitable task </returns>
         public async Task<GameEvent> WaitAsync(TimeSpan timeSpan, CancellationToken token)
         {
-            bool processed = false;
+            var processed = false;
             Utilities.DefaultLogger.LogDebug("Begin wait for event {Id}", Id);
             try
             {
@@ -296,7 +337,8 @@ namespace SharedLibraryCore
             {
                 using (LogContext.PushProperty("Server", Owner?.ToString()))
                 {
-                    Utilities.DefaultLogger.LogError("Waiting for event to complete timed out {@eventData}", new { Event = this, Message, Origin = Origin?.ToString(), Target = Target?.ToString()});
+                    Utilities.DefaultLogger.LogError("Waiting for event to complete timed out {@eventData}",
+                        new { Event = this, Message, Origin = Origin?.ToString(), Target = Target?.ToString() });
                 }
             }
 

SharedLibraryCore/Events/GameEventArgs.cs

@@ -1,15 +1,13 @@
 using System;
-using System.Collections.Generic;
+using System.ComponentModel;
-using System.Text;
 
 namespace SharedLibraryCore.Events
 {
     /// <summary>
     ///     represents the state of a game event for event processing
     /// </summary>
-    public class GameEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    public class GameEventArgs : AsyncCompletedEventArgs
     {
-
         public GameEventArgs(Exception error, bool cancelled, GameEvent userState) : base(error, cancelled, userState)
         {
             Event = userState;

SharedLibraryCore/Exceptions/AuthorizationException.cs

@@ -1,11 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace SharedLibraryCore.Exceptions
 {
     public class AuthorizationException : Exception
     {
-        public AuthorizationException(string message) : base (message) { }
+        public AuthorizationException(string message) : base(message)
+        {
+        }
     }
 }

SharedLibraryCore/Exceptions/CommandException.cs

@@ -1,14 +1,11 @@
-using System;
+namespace SharedLibraryCore.Exceptions
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SharedLibraryCore.Exceptions
 {
     public class CommandException : ServerException
     {
-        public CommandException(string msg) : base(msg) { }
+        public CommandException(string msg) : base(msg)
+        {
+        }
+
         // .data contains
         // "command_name"
     }