only send heartbeat when fully initialized

update postgres target version to 12.9

Application/API/Master/ApiInstance.cs

@@ -22,7 +22,7 @@ namespace IW4MAdmin.Application.API.Master
         public int Uptime { get; set; }
 
         /// <summary>
-        /// Specifices the version of the instance
+        /// Specifies the version of the instance
         /// </summary>
         [JsonProperty("version")]
         [JsonConverter(typeof(BuildNumberJsonConverter))]
@@ -33,5 +33,11 @@ namespace IW4MAdmin.Application.API.Master
         /// </summary>
         [JsonProperty("servers")]
         public List<ApiServer> Servers { get; set; }
+        
+        /// <summary>
+        /// Url IW4MAdmin is listening on
+        /// </summary>
+        [JsonProperty("webfront_url")]
+        public string WebfrontUrl { get; set; }
     }
 }

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="RestEase" Version="1.5.1" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+    <PackageReference Include="RestEase" Version="1.5.5" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
   </ItemGroup>
 
   <PropertyGroup>

Application/ApplicationManager.cs

@@ -15,6 +15,7 @@ using System;
 using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using System.Reflection;
 using System.Text;
@@ -26,6 +27,7 @@ using IW4MAdmin.Application.Migration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Serilog.Context;
+using SharedLibraryCore.Formatting;
 using static SharedLibraryCore.GameEvent;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 using ObsoleteLogger = SharedLibraryCore.Interfaces.ILogger;
@@ -217,6 +219,8 @@ namespace IW4MAdmin.Application
             return _commands;
         }
 
+        public IReadOnlyList<IManagerCommand> Commands => _commands.ToImmutableList();
+
         public async Task UpdateServerStates()
         {
             // store the server hash code and task for it
@@ -259,7 +263,11 @@ namespace IW4MAdmin.Application
                     {
                         try
                         {
-                            await server.ProcessUpdatesAsync(_tokenSource.Token).WithWaitCancellation(runningUpdateTasks[server.EndPoint].tokenSource.Token);
+                            if (runningUpdateTasks.ContainsKey(server.EndPoint))
+                            {
+                                await server.ProcessUpdatesAsync(_tokenSource.Token)
+                                    .WithWaitCancellation(runningUpdateTasks[server.EndPoint].tokenSource.Token);
+                            }
                         }
 
                         catch (Exception e)
@@ -347,15 +355,13 @@ namespace IW4MAdmin.Application
             // copy over default config if it doesn't exist
             if (!_appConfig.Servers?.Any() ?? true)
             {
-                var defaultConfig = new BaseConfigurationHandler<DefaultSettings>("DefaultSettings").Configuration();
-                //ConfigHandler.Set((ApplicationConfiguration)new ApplicationConfiguration().Generate());
-                //var newConfig = ConfigHandler.Configuration();
-
+                var defaultHandler = new BaseConfigurationHandler<DefaultSettings>("DefaultSettings");
+                await defaultHandler.BuildAsync();
+                var defaultConfig = defaultHandler.Configuration();
+        
                 _appConfig.AutoMessages = defaultConfig.AutoMessages;
                 _appConfig.GlobalRules = defaultConfig.GlobalRules;
-                _appConfig.Maps = defaultConfig.Maps;
                 _appConfig.DisallowedClientNames = defaultConfig.DisallowedClientNames;
-                _appConfig.QuickMessages = defaultConfig.QuickMessages;
 
                 //if (newConfig.Servers == null)
                 {
@@ -396,6 +402,18 @@ namespace IW4MAdmin.Application
                     await ConfigHandler.Save();
                 }
 
+#pragma warning disable 618
+                if (_appConfig.Maps != null)
+                {
+                    _appConfig.Maps = null;
+                }
+
+                if (_appConfig.QuickMessages != null)
+                {
+                    _appConfig.QuickMessages = null;
+                }
+#pragma warning restore 618
+
                 var validator = new ApplicationConfigurationValidator();
                 var validationResult = validator.Validate(_appConfig);
 
@@ -410,7 +428,7 @@ namespace IW4MAdmin.Application
 
                 foreach (var serverConfig in _appConfig.Servers)
                 {
-                    Migration.ConfigurationMigration.ModifyLogPath020919(serverConfig);
+                    ConfigurationMigration.ModifyLogPath020919(serverConfig);
 
                     if (serverConfig.RConParserVersion == null || serverConfig.EventParserVersion == null)
                     {
@@ -438,6 +456,17 @@ namespace IW4MAdmin.Application
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
             Utilities.EncodingType = Encoding.GetEncoding(!string.IsNullOrEmpty(_appConfig.CustomParserEncoding) ? _appConfig.CustomParserEncoding : "windows-1252");
 
+            foreach (var parser in AdditionalRConParsers)
+            {
+                if (!parser.Configuration.ColorCodeMapping.ContainsKey(ColorCodes.Accent.ToString()))
+                {
+                    parser.Configuration.ColorCodeMapping.Add(ColorCodes.Accent.ToString(),
+                        parser.Configuration.ColorCodeMapping.TryGetValue(_appConfig.IngameAccentColorKey, out var colorCode)
+                            ? colorCode
+                            : "");
+                }
+            }
+
             #endregion
 
             #region COMMANDS
@@ -463,13 +492,17 @@ namespace IW4MAdmin.Application
 
             // this is because I want to store the command prefix in IW4MAdminSettings, but can't easily
             // inject it to all the places that need it
-            cmdConfig.CommandPrefix = _appConfig.CommandPrefix;
-            cmdConfig.BroadcastCommandPrefix = _appConfig.BroadcastCommandPrefix;
+            cmdConfig.CommandPrefix = _appConfig?.CommandPrefix ?? "!";
+            cmdConfig.BroadcastCommandPrefix = _appConfig?.BroadcastCommandPrefix ?? "@";
 
             foreach (var cmd in commandsToAddToConfig)
             {
+                if (cmdConfig.Commands.ContainsKey(cmd.CommandConfigNameForType()))
+                {
+                    continue;
+                }
                 cmdConfig.Commands.Add(cmd.CommandConfigNameForType(),
-                new CommandProperties()
+                new CommandProperties
                 {
                     Name = cmd.Name,
                     Alias = cmd.Alias,
@@ -518,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
@@ -591,6 +624,11 @@ namespace IW4MAdmin.Application
             return _servers.SelectMany(s => s.Clients).ToList().Where(p => p != null).ToList();
         }
 
+        public EFClient FindActiveClient(EFClient client) =>client.ClientNumber < 0 ?
+                GetActiveClients()
+                    .FirstOrDefault(c => c.NetworkId == client.NetworkId) ?? client :
+                client;
+
         public ClientService GetClientService()
         {
             return ClientSvc;

Application/BuildScripts/PostBuild.bat

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

Application/BuildScripts/PostPublish.bat

@@ -23,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
+cacls "%PublishDir%" /t /e /p Everyone:F

Application/Commands/FindPlayerCommand.cs

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

Application/Commands/HelpCommand.cs

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

Application/Commands/ListAdminsCommand.cs

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

Application/Commands/ListAliasesCommand.cs

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

Application/Commands/ListClientsCommand.cs

@@ -0,0 +1,37 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Data.Models.Client;
+using SharedLibraryCore;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Commands
+{
+    /// <summary>
+    /// List online clients
+    /// </summary>
+    public class ListClientsCommand : Command
+    {
+        public ListClientsCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
+        {
+            Name = "list";
+            Description = _translationLookup["COMMANDS_LIST_DESC"];
+            Alias = "l";
+            Permission = EFClient.Permission.Moderator;
+            RequiresTarget = false;
+        }
+
+        public override Task ExecuteAsync(GameEvent gameEvent)
+        {
+            var clientList = gameEvent.Owner.GetClientsAsList()
+                .Select(client =>
+                    $"[(Color::Accent){client.ClientPermission.Name}(Color::White){(string.IsNullOrEmpty(client.Tag) ? "" : $" {client.Tag}")}(Color::White)][(Color::Yellow)#{client.ClientNumber}(Color::White)] {client.Name}")
+                .ToArray();
+
+            gameEvent.Origin.Tell(clientList);
+
+            return Task.CompletedTask;
+        }
+    }
+}

Application/Commands/ListPluginsCommand.cs

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

Application/Commands/ListReportsCommand.cs

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

Application/Commands/MapAndGameTypeCommand.cs

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

Application/Commands/OfflineMessageCommand.cs

@@ -0,0 +1,78 @@
+using System;
+using System.Threading.Tasks;
+using Data.Abstractions;
+using Data.Models.Client;
+using Data.Models.Misc;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
+
+namespace IW4MAdmin.Application.Commands
+{
+    public class OfflineMessageCommand : Command
+    {
+        private readonly IDatabaseContextFactory _contextFactory;
+        private readonly ILogger _logger;
+        private const short MaxLength = 1024;
+        
+        public OfflineMessageCommand(CommandConfiguration config, ITranslationLookup layout,
+            IDatabaseContextFactory contextFactory, ILogger<IDatabaseContextFactory> logger) : base(config, layout)
+        {
+            Name = "offlinemessage";
+            Description = _translationLookup["COMMANDS_OFFLINE_MESSAGE_DESC"];
+            Alias = "om";
+            Permission = EFClient.Permission.Moderator;
+            RequiresTarget = true;
+            
+            _contextFactory = contextFactory;
+            _logger = logger;
+        }
+
+        public override async Task ExecuteAsync(GameEvent gameEvent)
+        {
+            if (gameEvent.Data.Length > MaxLength)
+            {
+                gameEvent.Origin.Tell(_translationLookup["COMMANDS_OFFLINE_MESSAGE_TOO_LONG"].FormatExt(MaxLength));
+                return;
+            }
+            
+            if (gameEvent.Target.ClientId == gameEvent.Origin.ClientId)
+            {
+                gameEvent.Origin.Tell(_translationLookup["COMMANDS_OFFLINE_MESSAGE_SELF"].FormatExt(MaxLength));
+                return;
+            }
+            
+            if (gameEvent.Target.IsIngame)
+            {
+                gameEvent.Origin.Tell(_translationLookup["COMMANDS_OFFLINE_MESSAGE_INGAME"].FormatExt(gameEvent.Target.Name));
+                return;
+            }
+            
+            await using var context = _contextFactory.CreateContext(enableTracking: false);
+            var server = await context.Servers.FirstAsync(srv => srv.EndPoint == gameEvent.Owner.ToString());
+
+            var newMessage = new EFInboxMessage()
+            {
+                SourceClientId = gameEvent.Origin.ClientId,
+                DestinationClientId = gameEvent.Target.ClientId,
+                ServerId = server.Id,
+                Message = gameEvent.Data,
+            };
+
+            try
+            {
+                context.Set<EFInboxMessage>().Add(newMessage);
+                await context.SaveChangesAsync();
+                gameEvent.Origin.Tell(_translationLookup["COMMANDS_OFFLINE_MESSAGE_SUCCESS"]);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Could not save offline message {@Message}", newMessage);
+                throw;
+            }
+        }
+    }
+}

Application/Commands/PrivateMessageCommand.cs

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

Application/Commands/ReadMessageCommand.cs

@@ -0,0 +1,79 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Data.Abstractions;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+using EFClient = Data.Models.Client.EFClient;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
+
+
+namespace IW4MAdmin.Application.Commands
+{
+    public class ReadMessageCommand : Command
+    {
+        private readonly IDatabaseContextFactory _contextFactory;
+        private readonly ILogger _logger;
+
+        public ReadMessageCommand(CommandConfiguration config, ITranslationLookup layout,
+            IDatabaseContextFactory contextFactory, ILogger<IDatabaseContextFactory> logger) : base(config, layout)
+        {
+            Name = "readmessage";
+            Description = _translationLookup["COMMANDS_READ_MESSAGE_DESC"];
+            Alias = "rm";
+            Permission = EFClient.Permission.Flagged;
+
+            _contextFactory = contextFactory;
+            _logger = logger;
+        }
+
+        public override async Task ExecuteAsync(GameEvent gameEvent)
+        {
+            try
+            {
+                await using var context = _contextFactory.CreateContext();
+
+                var inboxItems = await context.InboxMessages
+                    .Include(message => message.SourceClient)
+                    .ThenInclude(client => client.CurrentAlias)
+                    .Where(message => message.DestinationClientId == gameEvent.Origin.ClientId)
+                    .Where(message => !message.IsDelivered)
+                    .ToListAsync();
+
+                if (!inboxItems.Any())
+                {
+                    gameEvent.Origin.Tell(_translationLookup["COMMANDS_READ_MESSAGE_NONE"]);
+                    return;
+                }
+
+                var index = 1;
+                foreach (var inboxItem in inboxItems)
+                {
+                    await gameEvent.Origin.Tell(_translationLookup["COMMANDS_READ_MESSAGE_SUCCESS"]
+                            .FormatExt($"{index}/{inboxItems.Count}", inboxItem.SourceClient.CurrentAlias.Name))
+                        .WaitAsync();
+
+                    foreach (var messageFragment in inboxItem.Message.FragmentMessageForDisplay())
+                    {
+                        await gameEvent.Origin.Tell(messageFragment).WaitAsync();
+                    }
+
+                    index++;
+                }
+
+                inboxItems.ForEach(item => { item.IsDelivered = true; });
+
+                context.UpdateRange(inboxItems);
+                await context.SaveChangesAsync();
+            }
+            catch (Exception ex)
+            {
+                logger.LogError(ex, "Could not retrieve offline messages for {Client}", gameEvent.Origin.ToString());
+                throw;
+            }
+        }
+    }
+}

Application/Commands/ReportClientCommand.cs

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

Application/Commands/SayAllCommand.cs

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

Application/Commands/SayCommand.cs

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

Application/Commands/WhoAmICommand.cs

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

Application/Configuration/LoggingConfiguration.json

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

Application/DefaultSettings.json

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

Application/EventParsers/BaseEventParser.cs

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

Application/Extensions/CommandExtensions.cs

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

Application/Extensions/StartupExtensions.cs

@@ -78,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;
@@ -101,4 +103,4 @@ namespace IW4MAdmin.Application.Extensions
             }
         }
     }
-}
+}

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

@@ -1,4 +1,5 @@
 using System;
+using System.Net;
 using SharedLibraryCore.Interfaces;
 using System.Text;
 using Integrations.Cod;
@@ -6,6 +7,7 @@ using Integrations.Source;
 using Integrations.Source.Interfaces;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using SharedLibraryCore.Configuration;
 
 namespace IW4MAdmin.Application.Factories
 {
@@ -26,21 +28,17 @@ namespace IW4MAdmin.Application.Factories
             _serviceProvider = serviceProvider;
         }
 
-        /// <summary>
-        /// creates a new rcon connection instance
-        /// </summary>
-        /// <param name="ipAddress">ip address of the server</param>
-        /// <param name="port">port of the server</param>
-        /// <param name="password">rcon password of the server</param>
-        /// <returns></returns>
-        public IRConConnection CreateConnection(string ipAddress, int port, string password, string rconEngine)
+        /// <inheritdoc/>
+        public IRConConnection CreateConnection(IPEndPoint ipEndpoint, string password, string rconEngine)
         {
             return rconEngine switch
             {
-                "COD" => new CodRConConnection(ipAddress, port, password,
-                    _serviceProvider.GetRequiredService<ILogger<CodRConConnection>>(), GameEncoding),
-                "Source"  => new SourceRConConnection(_serviceProvider.GetRequiredService<ILogger<SourceRConConnection>>(),
-                    _serviceProvider.GetRequiredService<IRConClientFactory>(), ipAddress, port, password),
+                "COD" => new CodRConConnection(ipEndpoint, password,
+                    _serviceProvider.GetRequiredService<ILogger<CodRConConnection>>(), GameEncoding,
+                    _serviceProvider.GetRequiredService<ApplicationConfiguration>()?.ServerConnectionAttempts ?? 6),
+                "Source" => new SourceRConConnection(
+                    _serviceProvider.GetRequiredService<ILogger<SourceRConConnection>>(),
+                    _serviceProvider.GetRequiredService<IRConClientFactory>(), ipEndpoint, password),
                 _ => throw new ArgumentException($"No supported RCon engine available for '{rconEngine}'")
             };
         }

Application/GameEventHandler.cs

@@ -13,6 +13,7 @@ namespace IW4MAdmin.Application
     {
         private readonly EventLog _eventLog;
         private readonly ILogger _logger;
+        private readonly IEventPublisher _eventPublisher;
         private static readonly GameEvent.EventType[] overrideEvents = new[]
         {
             GameEvent.EventType.Connect,
@@ -21,10 +22,11 @@ namespace IW4MAdmin.Application
             GameEvent.EventType.Stop
         };
 
-        public GameEventHandler(ILogger<GameEventHandler> logger)
+        public GameEventHandler(ILogger<GameEventHandler> logger, IEventPublisher eventPublisher)
         {
             _eventLog = new EventLog();
             _logger = logger;
+            _eventPublisher = eventPublisher;
         }
 
         public void HandleEvent(IManager manager, GameEvent gameEvent)
@@ -32,6 +34,7 @@ namespace IW4MAdmin.Application
             if (manager.IsRunning || overrideEvents.Contains(gameEvent.Type))
             {
                 EventApi.OnGameEvent(gameEvent);
+                _eventPublisher.Publish(gameEvent);
                 Task.Factory.StartNew(() => manager.ExecuteEvent(gameEvent));
             }
             else

Application/IW4MServer.cs

@@ -11,6 +11,8 @@ using System;
 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;
@@ -22,6 +24,8 @@ using Serilog.Context;
 using static SharedLibraryCore.Database.Models.EFClient;
 using Data.Models;
 using Data.Models.Server;
+using IW4MAdmin.Application.Commands;
+using Microsoft.EntityFrameworkCore;
 using static Data.Models.Client.EFClient;
 
 namespace IW4MAdmin
@@ -49,11 +53,13 @@ namespace IW4MAdmin
             IServiceProvider serviceProvider,
             IClientNoticeMessageFormatter messageFormatter,
             ILookupCache<EFServer> serverCache) : base(serviceProvider.GetRequiredService<ILogger<Server>>(), 
+#pragma warning disable CS0612
             serviceProvider.GetRequiredService<SharedLibraryCore.Interfaces.ILogger>(), 
+#pragma warning restore CS0612
             serverConfiguration,
             serviceProvider.GetRequiredService<IManager>(), 
             serviceProvider.GetRequiredService<IRConConnectionFactory>(),
-            serviceProvider.GetRequiredService<IGameLogReaderFactory>())
+            serviceProvider.GetRequiredService<IGameLogReaderFactory>(), serviceProvider)
         {
             _translationLookup = lookup;
             _metaService = metaService;
@@ -240,11 +246,11 @@ namespace IW4MAdmin
 
             try
             {
-                await (plugin.OnEventAsync(gameEvent, this)).WithWaitCancellation(tokenSource.Token);
+                await plugin.OnEventAsync(gameEvent, this).WithWaitCancellation(tokenSource.Token);
             }
             catch (Exception ex)
             {
-                Console.WriteLine(loc["SERVER_PLUGIN_ERROR"]);
+                Console.WriteLine(loc["SERVER_PLUGIN_ERROR"].FormatExt(plugin.Name, ex.GetType().Name));
                 ServerLogger.LogError(ex, "Could not execute {methodName} for plugin {plugin}", 
                     nameof(plugin.OnEventAsync), plugin.Name);
             }
@@ -308,6 +314,11 @@ namespace IW4MAdmin
                         Console.WriteLine(loc["MANAGER_CONNECTION_REST"].FormatExt($"[{IP}:{Port}]"));
                     }
 
+                    if (!string.IsNullOrEmpty(CustomSayName))
+                    {
+                        await this.SetDvarAsync("sv_sayname", CustomSayName);
+                    }
+
                     Throttled = false;
                 }
 
@@ -341,7 +352,26 @@ namespace IW4MAdmin
                             E.Origin.Tag = clientTag.LinkedMeta.Value;
                         }
 
-                        await E.Origin.OnJoin(E.Origin.IPAddress);
+                        try
+                        {
+                            var factory = _serviceProvider.GetRequiredService<IDatabaseContextFactory>();
+                            await using var context = factory.CreateContext(enableTracking: false);
+
+                            var messageCount = await context.InboxMessages
+                                .CountAsync(msg => msg.DestinationClientId == E.Origin.ClientId && !msg.IsDelivered);
+      
+                            if (messageCount > 0)
+                            {
+                                E.Origin.Tell(_translationLookup["SERVER_JOIN_OFFLINE_MESSAGES"]);
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            ServerLogger.LogError(ex, "Could not get offline message count for {Client}", E.Origin.ToString());
+                            throw;
+                        }
+                        
+                        await E.Origin.OnJoin(E.Origin.IPAddress, Manager.GetApplicationSettings().Configuration().EnableImplicitAccountLinking);
                     }
                 }
 
@@ -407,7 +437,7 @@ namespace IW4MAdmin
 
                         if (E.Origin.Level > Permission.Moderator)
                         {
-                            E.Origin.Tell(string.Format(loc["SERVER_REPORT_COUNT"], E.Owner.Reports.Count));
+                            E.Origin.Tell(loc["SERVER_REPORT_COUNT_V2"].FormatExt(E.Owner.Reports.Count));
                         }
                     }
 
@@ -441,7 +471,7 @@ namespace IW4MAdmin
                         Link = E.Target.AliasLink
                     };
 
-                    var addedPenalty = await Manager.GetPenaltyService().Create(newPenalty);
+                    await Manager.GetPenaltyService().Create(newPenalty);
                     E.Target.SetLevel(Permission.Flagged, E.Origin);
                 }
 
@@ -593,7 +623,7 @@ namespace IW4MAdmin
                         {
                             try
                             {
-                                message = Manager.GetApplicationSettings().Configuration()
+                                message = _serviceProvider.GetRequiredService<DefaultSettings>()
                                     .QuickMessages
                                     .First(_qm => _qm.Game == GameName)
                                     .Messages[E.Data.Substring(1)];
@@ -699,11 +729,11 @@ namespace IW4MAdmin
 
         private async Task OnClientUpdate(EFClient origin)
         {
-            var client = GetClientsAsList().FirstOrDefault(_client => _client.Equals(origin));
+            var client = Manager.GetActiveClients().FirstOrDefault(c => c.NetworkId == origin.NetworkId);
 
             if (client == null)
             {
-                ServerLogger.LogWarning("{origin} expected to exist in client list for update, but they do not", origin.ToString());
+                ServerLogger.LogWarning("{Origin} expected to exist in client list for update, but they do not", origin.ToString());
                 return;
             }
 
@@ -717,7 +747,7 @@ namespace IW4MAdmin
             {
                 try
                 {
-                    await client.OnJoin(origin.IPAddress);
+                    await client.OnJoin(origin.IPAddress, Manager.GetApplicationSettings().Configuration().EnableImplicitAccountLinking);
                 }
 
                 catch (Exception e)
@@ -729,11 +759,11 @@ namespace IW4MAdmin
                 }
             }
 
-            else if ((client.IPAddress != null && client.State == ClientState.Disconnecting) ||
+            else if (client.IPAddress != null && client.State == ClientState.Disconnecting ||
                 client.Level == Permission.Banned)
             {
-                ServerLogger.LogWarning("{client} state is Unknown (probably kicked), but they are still connected. trying to kick again...", origin.ToString());
-                await client.CanConnect(client.IPAddress);
+                ServerLogger.LogWarning("{Client} state is Unknown (probably kicked), but they are still connected. trying to kick again...", origin.ToString());
+                await client.CanConnect(client.IPAddress, Manager.GetApplicationSettings().Configuration().EnableImplicitAccountLinking);
             }
         }
 
@@ -771,8 +801,10 @@ namespace IW4MAdmin
             };
         }
         
-        private async Task<long> GetIdForServer(Server server)
+        public override async Task<long> GetIdForServer(Server server = null)
         {
+            server ??= this;
+            
             if ($"{server.IP}:{server.Port.ToString()}" == "66.150.121.184:28965")
             {
                 return 886229536;
@@ -979,10 +1011,13 @@ namespace IW4MAdmin
                 LastMessage = DateTime.Now - start;
                 lastCount = DateTime.Now;
 
+                var appConfig = _serviceProvider.GetService<ApplicationConfiguration>();
                 // update the player history 
-                if ((lastCount - playerCountStart).TotalMinutes >= PlayerHistory.UpdateInterval)
+                if (lastCount - playerCountStart >= appConfig.ServerDataCollectionInterval)
                 {
-                    while (ClientHistory.Count > ((60 / PlayerHistory.UpdateInterval) * 12)) // 12 times a hour for 12 hours
+                    var maxItems = Math.Ceiling(appConfig.MaxClientHistoryTime.TotalMinutes /
+                                                appConfig.ServerDataCollectionInterval.TotalMinutes);
+                    while ( ClientHistory.Count > maxItems) 
                     {
                         ClientHistory.Dequeue();
                     }
@@ -1039,16 +1074,33 @@ namespace IW4MAdmin
 
         public async Task Initialize()
         {
+            try
+            {
+                ResolvedIpEndPoint =
+                    new IPEndPoint(
+                        (await Dns.GetHostAddressesAsync(IP)).First(address =>
+                            address.AddressFamily == AddressFamily.InterNetwork), Port);
+            }
+            catch (Exception ex)
+            {
+                ServerLogger.LogWarning(ex, "Could not resolve hostname or IP for RCon connection {IP}:{Port}", IP, Port);
+                ResolvedIpEndPoint = new IPEndPoint(IPAddress.Parse(IP), Port);
+            }
+
             RconParser = Manager.AdditionalRConParsers
-                .FirstOrDefault(_parser => _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];
 
-            RemoteConnection = RConConnectionFactory.CreateConnection(IP, Port, Password, RconParser.RConEngine);
+            RemoteConnection = RConConnectionFactory.CreateConnection(ResolvedIpEndPoint, Password, RconParser.RConEngine);
             RemoteConnection.SetConfiguration(RconParser);
 
             var version = await this.GetMappedDvarValueOrDefaultAsync<string>("version");
@@ -1060,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;
@@ -1081,8 +1133,9 @@ namespace IW4MAdmin
             string mapname = (await this.GetMappedDvarValueOrDefaultAsync<string>("mapname", infoResponse: infoResponse)).Value;
             int maxplayers = (await this.GetMappedDvarValueOrDefaultAsync<int>("sv_maxclients", infoResponse: infoResponse)).Value;
             string gametype = (await this.GetMappedDvarValueOrDefaultAsync<string>("g_gametype", "gametype", infoResponse)).Value;
-            var basepath = (await this.GetMappedDvarValueOrDefaultAsync<string>("fs_basepath"));
-            var basegame = (await this.GetMappedDvarValueOrDefaultAsync<string>("fs_basegame"));
+            var basepath = await this.GetMappedDvarValueOrDefaultAsync<string>("fs_basepath");
+            var basegame = await this.GetMappedDvarValueOrDefaultAsync<string>("fs_basegame");
+            var homepath = await this.GetMappedDvarValueOrDefaultAsync<string>("fs_homepath");
             var game = (await this.GetMappedDvarValueOrDefaultAsync<string>("fs_game", infoResponse: infoResponse));
             var logfile = await this.GetMappedDvarValueOrDefaultAsync<string>("g_log");
             var logsync = await this.GetMappedDvarValueOrDefaultAsync<int>("g_logsync");
@@ -1118,8 +1171,14 @@ namespace IW4MAdmin
             {
                 Manager.GetApplicationSettings().Configuration().ContactUri = Website;
             }
+            
+            var defaultConfig = _serviceProvider.GetRequiredService<DefaultSettings>();
+            var gameMaps = defaultConfig?.Maps?.FirstOrDefault(map => map.Game == GameName);
 
-            InitializeMaps();
+            if (gameMaps != null)
+            {
+                Maps.AddRange(gameMaps.Maps);
+            }
 
             WorkingDirectory = basepath.Value;
             this.Hostname = hostname;
@@ -1177,6 +1236,7 @@ namespace IW4MAdmin
                 {
                     BaseGameDirectory = basegame.Value,
                     BasePathDirectory = basepath.Value,
+                    HomePathDirectory = homepath.Value,
                     GameDirectory = EventParser.Configuration.GameDirectory ?? "",
                     ModDirectory = game.Value ?? "",
                     LogFile = logfile.Value,
@@ -1227,15 +1287,25 @@ namespace IW4MAdmin
         {
             string logPath;
             var workingDirectory = logInfo.BasePathDirectory;
+            
+            bool IsValidGamePath (string path)
+            {
+                var baseGameIsDirectory = !string.IsNullOrWhiteSpace(path) &&
+                                          path.IndexOfAny(Utilities.DirectorySeparatorChars) != -1;
 
-            var baseGameIsDirectory = !string.IsNullOrWhiteSpace(logInfo.BaseGameDirectory) &&
-                logInfo.BaseGameDirectory.IndexOfAny(Utilities.DirectorySeparatorChars) != -1;
+                var baseGameIsRelative = path.FixDirectoryCharacters()
+                    .Equals(logInfo.GameDirectory.FixDirectoryCharacters(), StringComparison.InvariantCultureIgnoreCase);
 
-            var baseGameIsRelative = logInfo.BaseGameDirectory.FixDirectoryCharacters()
-                .Equals(logInfo.GameDirectory.FixDirectoryCharacters(), StringComparison.InvariantCultureIgnoreCase);
+                return baseGameIsDirectory && !baseGameIsRelative;
+            }
 
             // we want to see if base game is provided and it 'looks' like a directory
-            if (baseGameIsDirectory && !baseGameIsRelative)
+            if (IsValidGamePath(logInfo.HomePathDirectory))
+            {
+                workingDirectory = logInfo.HomePathDirectory;
+            }
+            
+            else if (IsValidGamePath(logInfo.BaseGameDirectory))
             {
                 workingDirectory = logInfo.BaseGameDirectory;
             }
@@ -1262,12 +1332,9 @@ namespace IW4MAdmin
         public override async Task Warn(string reason, EFClient targetClient, EFClient targetOrigin)
         {
             // ensure player gets warned if command not performed on them in game
-            targetClient = targetClient.ClientNumber < 0 ?
-                Manager.GetActiveClients()
-                .FirstOrDefault(c => c.ClientId == targetClient?.ClientId) ?? targetClient :
-                targetClient;
+            var activeClient = Manager.FindActiveClient(targetClient);
 
-            var newPenalty = new EFPenalty()
+            var newPenalty = new EFPenalty
             {
                 Type = EFPenalty.PenaltyType.Warning,
                 Expires = DateTime.UtcNow,
@@ -1277,31 +1344,28 @@ namespace IW4MAdmin
                 Link = targetClient.AliasLink
             };
 
-            ServerLogger.LogDebug("Creating warn penalty for {targetClient}", targetClient.ToString());
+            ServerLogger.LogDebug("Creating warn penalty for {TargetClient}", targetClient.ToString());
             await newPenalty.TryCreatePenalty(Manager.GetPenaltyService(), ServerLogger);
 
-            if (targetClient.IsIngame)
+            if (activeClient.IsIngame)
             {
-                if (targetClient.Warnings >= 4)
+                if (activeClient.Warnings >= 4)
                 {
-                    targetClient.Kick(loc["SERVER_WARNLIMT_REACHED"], Utilities.IW4MAdminClient(this));
+                    activeClient.Kick(loc["SERVER_WARNLIMT_REACHED"], Utilities.IW4MAdminClient(this));
                     return;
                 }
 
-                // todo: move to translation sheet
-                string message = $"^1{loc["SERVER_WARNING"]} ^7[^3{targetClient.Warnings}^7]: ^3{targetClient.Name}^7, {reason}";
-                targetClient.CurrentServer.Broadcast(message);
+                var message = loc["COMMANDS_WARNING_FORMAT_V2"]
+                    .FormatExt(activeClient.Warnings, activeClient.Name, reason);
+                activeClient.CurrentServer.Broadcast(message);
             }
         }
 
         public override async Task Kick(string reason, EFClient targetClient, EFClient originClient, EFPenalty previousPenalty)
         {
-            targetClient = targetClient.ClientNumber < 0 ?
-                Manager.GetActiveClients()
-                .FirstOrDefault(c => c.ClientId == targetClient?.ClientId) ?? targetClient :
-                targetClient;
+            var activeClient = Manager.FindActiveClient(targetClient);
 
-            var newPenalty = new EFPenalty()
+            var newPenalty = new EFPenalty
             {
                 Type = EFPenalty.PenaltyType.Kick,
                 Expires = DateTime.UtcNow,
@@ -1311,77 +1375,64 @@ namespace IW4MAdmin
                 Link = targetClient.AliasLink
             };
 
-            ServerLogger.LogDebug("Creating kick penalty for {targetClient}", targetClient.ToString());
+            ServerLogger.LogDebug("Creating kick penalty for {TargetClient}", targetClient.ToString());
             await newPenalty.TryCreatePenalty(Manager.GetPenaltyService(), ServerLogger);
 
-            if (targetClient.IsIngame)
+            if (activeClient.IsIngame)
             {
-                var e = new GameEvent()
+                var gameEvent = new GameEvent
                 {
                     Type = GameEvent.EventType.PreDisconnect,
-                    Origin = targetClient,
+                    Origin = activeClient,
                     Owner = this
                 };
 
-                Manager.AddEvent(e);
-
-                var temporalClientId = targetClient.GetAdditionalProperty<string>("ConnectionClientId");
-                var parsedClientId = string.IsNullOrEmpty(temporalClientId) ? (int?)null : int.Parse(temporalClientId);
-                var clientNumber = parsedClientId ?? targetClient.ClientNumber;
+                Manager.AddEvent(gameEvent);
 
                 var formattedKick = string.Format(RconParser.Configuration.CommandPrefixes.Kick, 
-                    clientNumber, 
+                    activeClient.TemporalClientNumber, 
                     _messageFormatter.BuildFormattedMessage(RconParser.Configuration, 
                         newPenalty, 
                         previousPenalty));
-                await targetClient.CurrentServer.ExecuteCommandAsync(formattedKick);
+                ServerLogger.LogDebug("Executing tempban kick command for {ActiveClient}", activeClient.ToString());
+                await activeClient.CurrentServer.ExecuteCommandAsync(formattedKick);
             }
         }
 
-        public override async Task TempBan(string Reason, TimeSpan length, EFClient targetClient, EFClient originClient)
+        public override async Task TempBan(string reason, TimeSpan length, EFClient targetClient, EFClient originClient)
         {
             // ensure player gets kicked if command not performed on them in the same server
-            targetClient = targetClient.ClientNumber < 0 ?
-                Manager.GetActiveClients()
-                .FirstOrDefault(c => c.ClientId == targetClient?.ClientId) ?? targetClient :
-                targetClient;
+            var activeClient = Manager.FindActiveClient(targetClient);
 
-            var newPenalty = new EFPenalty()
+            var newPenalty = new EFPenalty
             {
                 Type = EFPenalty.PenaltyType.TempBan,
                 Expires = DateTime.UtcNow + length,
                 Offender = targetClient,
-                Offense = Reason,
+                Offense = reason,
                 Punisher = originClient,
                 Link = targetClient.AliasLink
             };
 
-            ServerLogger.LogDebug("Creating tempban penalty for {targetClient}", targetClient.ToString());
+            ServerLogger.LogDebug("Creating tempban penalty for {TargetClient}", targetClient.ToString());
             await newPenalty.TryCreatePenalty(Manager.GetPenaltyService(), ServerLogger);
 
-            if (targetClient.IsIngame)
+            if (activeClient.IsIngame)
             {
-                var temporalClientId = targetClient.GetAdditionalProperty<string>("ConnectionClientId");
-                var parsedClientId = string.IsNullOrEmpty(temporalClientId) ? (int?)null : int.Parse(temporalClientId);
-                var clientNumber = parsedClientId ?? targetClient.ClientNumber;
-                
                 var formattedKick = string.Format(RconParser.Configuration.CommandPrefixes.Kick,
-                    clientNumber,
+                    activeClient.TemporalClientNumber,
                     _messageFormatter.BuildFormattedMessage(RconParser.Configuration, newPenalty));
-                ServerLogger.LogDebug("Executing tempban kick command for {targetClient}", targetClient.ToString());
-                await targetClient.CurrentServer.ExecuteCommandAsync(formattedKick);
+                ServerLogger.LogDebug("Executing tempban kick command for {ActiveClient}", activeClient.ToString());
+                await activeClient.CurrentServer.ExecuteCommandAsync(formattedKick);
             }
         }
 
         public override async Task Ban(string reason, EFClient targetClient, EFClient originClient, bool isEvade = false)
         {
             // ensure player gets kicked if command not performed on them in the same server
-            targetClient = targetClient.ClientNumber < 0 ?
-                Manager.GetActiveClients()
-                .FirstOrDefault(c => c.ClientId == targetClient?.ClientId) ?? targetClient :
-                targetClient;
+            var activeClient = Manager.FindActiveClient(targetClient);
 
-            EFPenalty newPenalty = new EFPenalty()
+            var newPenalty = new EFPenalty
             {
                 Type = EFPenalty.PenaltyType.Ban,
                 Expires = null,
@@ -1392,51 +1443,47 @@ namespace IW4MAdmin
                 IsEvadedOffense = isEvade
             };
 
-            ServerLogger.LogDebug("Creating ban penalty for {targetClient}", targetClient.ToString());
-            targetClient.SetLevel(Permission.Banned, originClient);
+            ServerLogger.LogDebug("Creating ban penalty for {TargetClient}", targetClient.ToString());
+            activeClient.SetLevel(Permission.Banned, originClient);
             await newPenalty.TryCreatePenalty(Manager.GetPenaltyService(), ServerLogger);
 
-            if (targetClient.IsIngame)
+            if (activeClient.IsIngame)
             {
-                ServerLogger.LogDebug("Attempting to kicking newly banned client {targetClient}", targetClient.ToString());
-                
-                var temporalClientId = targetClient.GetAdditionalProperty<string>("ConnectionClientId");
-                var parsedClientId = string.IsNullOrEmpty(temporalClientId) ? (int?)null : int.Parse(temporalClientId);
-                var clientNumber = parsedClientId ?? targetClient.ClientNumber;
+                ServerLogger.LogDebug("Attempting to kicking newly banned client {ActiveClient}", activeClient.ToString());
                 
                 var formattedString = string.Format(RconParser.Configuration.CommandPrefixes.Kick, 
-                    clientNumber, 
+                    activeClient.TemporalClientNumber, 
                     _messageFormatter.BuildFormattedMessage(RconParser.Configuration, newPenalty));
-                await targetClient.CurrentServer.ExecuteCommandAsync(formattedString);
+                await activeClient.CurrentServer.ExecuteCommandAsync(formattedString);
             }
         }
 
-        override public async Task Unban(string reason, EFClient Target, EFClient Origin)
+        public override async Task Unban(string reason, EFClient targetClient, EFClient originClient)
         {
-            var unbanPenalty = new EFPenalty()
+            var unbanPenalty = new EFPenalty
             {
                 Type = EFPenalty.PenaltyType.Unban,
                 Expires = DateTime.Now,
-                Offender = Target,
+                Offender = targetClient,
                 Offense = reason,
-                Punisher = Origin,
+                Punisher = originClient,
                 When = DateTime.UtcNow,
                 Active = true,
-                Link = Target.AliasLink
+                Link = targetClient.AliasLink
             };
 
-            ServerLogger.LogDebug("Creating unban penalty for {targetClient}", Target.ToString());
-            Target.SetLevel(Permission.User, Origin);
-            await Manager.GetPenaltyService().RemoveActivePenalties(Target.AliasLink.AliasLinkId);
+            ServerLogger.LogDebug("Creating unban penalty for {targetClient}", targetClient.ToString());
+            targetClient.SetLevel(Permission.User, originClient);
+            await Manager.GetPenaltyService().RemoveActivePenalties(targetClient.AliasLink.AliasLinkId);
             await Manager.GetPenaltyService().Create(unbanPenalty);
         }
 
-        override public void InitializeTokens()
+        public override void InitializeTokens()
         {
             Manager.GetMessageTokens().Add(new MessageToken("TOTALPLAYERS", (Server s) => Task.Run(async () => (await Manager.GetClientService().GetTotalClientsAsync()).ToString())));
             Manager.GetMessageTokens().Add(new MessageToken("VERSION", (Server s) => Task.FromResult(Application.Program.Version.ToString())));
             Manager.GetMessageTokens().Add(new MessageToken("NEXTMAP", (Server s) => SharedLibraryCore.Commands.NextMapCommand.GetNextMap(s, _translationLookup)));
-            Manager.GetMessageTokens().Add(new MessageToken("ADMINS", (Server s) => Task.FromResult(SharedLibraryCore.Commands.ListAdminsCommand.OnlineAdmins(s, _translationLookup))));
+            Manager.GetMessageTokens().Add(new MessageToken("ADMINS", (Server s) => Task.FromResult(ListAdminsCommand.OnlineAdmins(s, _translationLookup))));
         }
     }
 }

Application/Main.cs

@@ -19,6 +19,7 @@ using SharedLibraryCore.Services;
 using Stats.Dtos;
 using System;
 using System.Linq;
+using System.Net.Http;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -33,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 ApplicationManager ServerManager;
-        private static Task ApplicationTask;
-        private static ServiceProvider serviceProvider;
+        public static BuildNumber Version { get; } = BuildNumber.Parse(Utilities.GetVersionAsString());
+        private static ApplicationManager _serverManager;
+        private static Task _applicationTask;
+        private static ServiceProvider _serviceProvider;
 
         /// <summary>
         /// entrypoint of the application
@@ -55,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");
@@ -74,10 +76,10 @@ namespace IW4MAdmin.Application
         /// <param name="e"></param>
         private static async void OnCancelKey(object sender, ConsoleCancelEventArgs e)
         {
-            ServerManager?.Stop();
-            if (ApplicationTask != null)
+            _serverManager?.Stop();
+            if (_applicationTask != null)
             {
-                await ApplicationTask;
+                await _applicationTask;
             }
         }
 
@@ -91,9 +93,8 @@ 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
             {
                 // do any needed housekeeping file/folder migrations
@@ -101,22 +102,29 @@ namespace IW4MAdmin.Application
                 ConfigurationMigration.CheckDirectories();
                 ConfigurationMigration.RemoveObsoletePlugins20210322();
                 logger.LogDebug("Configuring services...");
-                services = ConfigureServices(args);
-                serviceProvider = services.BuildServiceProvider();
-                var versionChecker = serviceProvider.GetRequiredService<IMasterCommunication>();
-                ServerManager = (ApplicationManager) serviceProvider.GetRequiredService<IManager>();
-                translationLookup = serviceProvider.GetRequiredService<ITranslationLookup>();
+                var services = await ConfigureServices(args);
+                _serviceProvider = services.BuildServiceProvider();
+                var versionChecker = _serviceProvider.GetRequiredService<IMasterCommunication>();
+                _serverManager = (ApplicationManager) _serviceProvider.GetRequiredService<IManager>();
+                translationLookup = _serviceProvider.GetRequiredService<ITranslationLookup>();
 
-                await versionChecker.CheckVersion();
-                await ServerManager.Init();
+                _applicationTask = RunApplicationTasksAsync(logger, services);
+                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"];
 
@@ -136,7 +144,7 @@ namespace IW4MAdmin.Application
                             .FormatExt(configException.ConfigurationFileName));
                     }
 
-                    foreach (string error in configException.Errors)
+                    foreach (var error in configException.Errors)
                     {
                         Console.WriteLine(error);
                     }
@@ -152,27 +160,12 @@ namespace IW4MAdmin.Application
                 return;
             }
 
-            try
-            {
-                ApplicationTask = RunApplicationTasksAsync(logger, services);
-                await ApplicationTask;
-            }
-
-            catch (Exception e)
-            {
-                logger.LogCritical(e, "Failed to launch IW4MAdmin");
-                string failMessage = translationLookup == null
-                    ? "Failed to launch IW4MAdmin"
-                    : translationLookup["MANAGER_INIT_FAIL"];
-                Console.WriteLine($"{failMessage}: {e.GetExceptionInfo()}");
-            }
-
-            if (ServerManager.IsRestartRequested)
+            if (_serverManager.IsRestartRequested)
             {
                 goto restart;
             }
 
-            serviceProvider.Dispose();
+            await _serviceProvider.DisposeAsync();
         }
 
         /// <summary>
@@ -181,21 +174,26 @@ namespace IW4MAdmin.Application
         /// <returns></returns>
         private static async Task RunApplicationTasksAsync(ILogger logger, IServiceCollection services)
         {
-            var webfrontTask = ServerManager.GetApplicationSettings().Configuration().EnableWebFront
-                ? WebfrontCore.Program.Init(ServerManager, serviceProvider, services, ServerManager.CancellationToken)
+            var webfrontTask = _serverManager.GetApplicationSettings().Configuration().EnableWebFront
+                ? WebfrontCore.Program.Init(_serverManager, _serviceProvider, services, _serverManager.CancellationToken)
                 : Task.CompletedTask;
 
+            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>()
-                    .RunUploadStatus(ServerManager.CancellationToken)
+                _serverManager.Start(),
+                _serviceProvider.GetRequiredService<IMasterCommunication>()
+                    .RunUploadStatus(_serverManager.CancellationToken),
+                collectionService.BeginCollectionAsync(cancellationToken: _serverManager.CancellationToken)
             };
 
             logger.LogDebug("Starting webfront and input tasks");
@@ -204,8 +202,7 @@ namespace IW4MAdmin.Application
             logger.LogInformation("Shutdown completed successfully");
             Console.WriteLine(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_SHUTDOWN_SUCCESS"]);
         }
-
-
+        
         /// <summary>
         /// reads input from the console and executes entered commands on the default server
         /// </summary>
@@ -218,32 +215,41 @@ namespace IW4MAdmin.Application
                 return;
             }
 
-            string lastCommand;
-            var Origin = Utilities.IW4MAdminClient(ServerManager.Servers[0]);
+            EFClient origin = null;
 
             try
             {
-                while (!ServerManager.CancellationToken.IsCancellationRequested)
+                while (!_serverManager.CancellationToken.IsCancellationRequested)
                 {
-                    lastCommand = await Console.In.ReadLineAsync();
-
-                    if (lastCommand?.Length > 0)
+                    if (!_serverManager.IsInitialized)
                     {
-                        if (lastCommand?.Length > 0)
-                        {
-                            GameEvent E = new GameEvent()
-                            {
-                                Type = GameEvent.EventType.Command,
-                                Data = lastCommand,
-                                Origin = Origin,
-                                Owner = ServerManager.Servers[0]
-                            };
-
-                            ServerManager.AddEvent(E);
-                            await E.WaitAsync(Utilities.DefaultCommandTimeout, ServerManager.CancellationToken);
-                            Console.Write('>');
-                        }
+                        await Task.Delay(1000);
+                        continue;
                     }
+                    
+                    var lastCommand = await Console.In.ReadLineAsync();
+
+                    if (lastCommand == null)
+                    {
+                        continue;
+                    }
+
+                    if (!lastCommand.Any())
+                    {
+                        continue;
+                    }
+
+                    var gameEvent = new GameEvent
+                    {
+                        Type = GameEvent.EventType.Command,
+                        Data = lastCommand,
+                        Origin = origin ??= Utilities.IW4MAdminClient(_serverManager.Servers.FirstOrDefault()),
+                        Owner = _serverManager.Servers[0]
+                    };
+
+                    _serverManager.AddEvent(gameEvent);
+                    await gameEvent.WaitAsync(Utilities.DefaultCommandTimeout, _serverManager.CancellationToken);
+                    Console.Write('>');
                 }
             }
             catch (OperationCanceledException)
@@ -271,9 +277,10 @@ namespace IW4MAdmin.Application
 
             // register the native commands
             foreach (var commandType in typeof(SharedLibraryCore.Commands.QuitCommand).Assembly.GetTypes()
-                .Where(_command => _command.BaseType == typeof(Command)))
+                .Concat(typeof(Program).Assembly.GetTypes().Where(type => type.Namespace == "IW4MAdmin.Application.Commands"))
+                .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);
             }
 
@@ -281,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);
@@ -311,10 +318,10 @@ namespace IW4MAdmin.Application
 
             // register any eventable types
             foreach (var assemblyType in typeof(Program).Assembly.GetTypes()
-                .Where(_asmType => typeof(IRegisterEvent).IsAssignableFrom(_asmType))
-                .Union(plugins.SelectMany(_asm => _asm.Assembly.GetTypes())
+                .Where(asmType => typeof(IRegisterEvent).IsAssignableFrom(asmType))
+                .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);
@@ -327,23 +334,39 @@ 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
                 ? new Uri("http://127.0.0.1:8080")
                 : appConfig?.MasterUrl ?? new ApplicationConfiguration().MasterUrl;
-            var masterRestClient = RestClient.For<IMasterApi>(masterUri);
+            var httpClient = new HttpClient
+            {
+                BaseAddress = masterUri,
+                Timeout = TimeSpan.FromSeconds(15)
+            };
+            var masterRestClient = RestClient.For<IMasterApi>(httpClient);
             var translationLookup = Configure.Initialize(Utilities.DefaultLogger, masterRestClient, appConfig);
 
             if (appConfig == null)
             {
                 appConfig = (ApplicationConfiguration) new ApplicationConfiguration().Generate();
                 appConfigHandler.Set(appConfig);
-                appConfigHandler.Save();
+                await appConfigHandler.Save();
             }
 
             // register override level names
@@ -360,15 +383,15 @@ namespace IW4MAdmin.Application
 
             serviceCollection
                 .AddBaseLogger(appConfig)
-                .AddSingleton<IServiceCollection>(_serviceProvider => serviceCollection)
+                .AddSingleton(defaultConfig)
+                .AddSingleton<IServiceCollection>(serviceCollection)
                 .AddSingleton<IConfigurationHandler<DefaultSettings>, BaseConfigurationHandler<DefaultSettings>>()
                 .AddSingleton((IConfigurationHandler<ApplicationConfiguration>) appConfigHandler)
-                .AddSingleton(
-                    new BaseConfigurationHandler<CommandConfiguration>("CommandConfiguration") as
-                        IConfigurationHandler<CommandConfiguration>)
+                .AddSingleton<IConfigurationHandler<CommandConfiguration>>(commandConfigHandler)
                 .AddSingleton(appConfig)
-                .AddSingleton(_serviceProvider =>
-                    _serviceProvider.GetRequiredService<IConfigurationHandler<CommandConfiguration>>()
+                .AddSingleton(statsCommandHandler.Configuration() ?? new StatsConfiguration())
+                .AddSingleton(serviceProvider =>
+                    serviceProvider.GetRequiredService<IConfigurationHandler<CommandConfiguration>>()
                         .Configuration() ?? new CommandConfiguration())
                 .AddSingleton<IPluginImporter, PluginImporter>()
                 .AddSingleton<IMiddlewareActionHandler, MiddlewareActionHandler>()
@@ -394,11 +417,14 @@ namespace IW4MAdmin.Application
                 .AddSingleton<IResourceQueryHelper<ClientPaginationRequest, UpdatedAliasResponse>,
                     UpdatedAliasResourceQueryHelper>()
                 .AddSingleton<IResourceQueryHelper<ChatSearchQuery, MessageResponse>, ChatResourceQueryHelper>()
+                .AddSingleton<IResourceQueryHelper<ClientPaginationRequest, ConnectionHistoryResponse>, ConnectionsResourceQueryHelper>()
                 .AddTransient<IParserPatternMatcher, ParserPatternMatcher>()
                 .AddSingleton<IRemoteAssemblyHandler, RemoteAssemblyHandler>()
                 .AddSingleton<IMasterCommunication, MasterCommunication>()
                 .AddSingleton<IManager, ApplicationManager>()
+#pragma warning disable CS0612
                 .AddSingleton<SharedLibraryCore.Interfaces.ILogger, Logger>()
+#pragma warning restore CS0612
                 .AddSingleton<IClientNoticeMessageFormatter, ClientNoticeMessageFormatter>()
                 .AddSingleton<IClientStatisticCalculator, HitCalculator>()
                 .AddSingleton<IServerDistributionCalculator, ServerDistributionCalculator>()
@@ -406,6 +432,9 @@ namespace IW4MAdmin.Application
                 .AddSingleton<IHitInfoBuilder, HitInfoBuilder>()
                 .AddSingleton(typeof(ILookupCache<>), typeof(LookupCache<>))
                 .AddSingleton(typeof(IDataValueCache<,>), typeof(DataValueCache<,>))
+                .AddSingleton<IServerDataViewer, ServerDataViewer>()
+                .AddSingleton<IServerDataCollector, ServerDataCollector>()
+                .AddSingleton<IEventPublisher, EventPublisher>()
                 .AddSingleton(translationLookup)
                 .AddDatabaseContextOptions(appConfig);
 
@@ -432,4 +461,4 @@ namespace IW4MAdmin.Application
             return collection.GetRequiredService<ILogger<T>>();
         }
     }
-}
+}

Application/Meta/ConnectionsResourceQueryHelper.cs

@@ -0,0 +1,60 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Data.Abstractions;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore.Dtos.Meta.Responses;
+using SharedLibraryCore.Helpers;
+using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.QueryHelper;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
+
+namespace IW4MAdmin.Application.Meta
+{
+    public class
+        ConnectionsResourceQueryHelper : IResourceQueryHelper<ClientPaginationRequest, ConnectionHistoryResponse>
+    {
+        private readonly ILogger _logger;
+        private readonly IDatabaseContextFactory _contextFactory;
+
+        public ConnectionsResourceQueryHelper(ILogger<ConnectionsResourceQueryHelper> logger,
+            IDatabaseContextFactory contextFactory)
+        {
+            _contextFactory = contextFactory;
+            _logger = logger;
+        }
+
+        public async Task<ResourceQueryHelperResult<ConnectionHistoryResponse>> QueryResource(
+            ClientPaginationRequest query)
+        {
+            _logger.LogDebug("{Class} {@Request}", nameof(ConnectionsResourceQueryHelper), query);
+
+            await using var context = _contextFactory.CreateContext(enableTracking: false);
+
+            var iqConnections = context.ConnectionHistory.AsNoTracking()
+                .Where(history => query.ClientId == history.ClientId)
+                .Where(history => history.CreatedDateTime < query.Before)
+                .OrderByDescending(history => history.CreatedDateTime);
+
+            var connections = await iqConnections.Select(history => new ConnectionHistoryResponse
+                {
+                    MetaId = history.ClientConnectionId,
+                    ClientId = history.ClientId,
+                    Type = MetaType.ConnectionHistory,
+                    ShouldDisplay = true,
+                    When = history.CreatedDateTime,
+                    ServerName = history.Server.HostName,
+                    ConnectionType = history.ConnectionType
+                })
+                .ToListAsync();
+
+            _logger.LogDebug("{Class} retrieved {Number} items", nameof(ConnectionsResourceQueryHelper),
+                connections.Count);
+
+            return new ResourceQueryHelperResult<ConnectionHistoryResponse>
+            {
+                Results = connections
+            };
+        }
+    }
+}

Application/Meta/MetaRegistration.cs

@@ -20,11 +20,14 @@ namespace IW4MAdmin.Application.Meta
         private readonly IResourceQueryHelper<ClientPaginationRequest, ReceivedPenaltyResponse> _receivedPenaltyHelper;
         private readonly IResourceQueryHelper<ClientPaginationRequest, AdministeredPenaltyResponse> _administeredPenaltyHelper;
         private readonly IResourceQueryHelper<ClientPaginationRequest, UpdatedAliasResponse> _updatedAliasHelper;
+        private readonly IResourceQueryHelper<ClientPaginationRequest, ConnectionHistoryResponse>
+            _connectionHistoryHelper;
 
         public MetaRegistration(ILogger<MetaRegistration> logger, IMetaService metaService, ITranslationLookup transLookup, IEntityService<EFClient> clientEntityService,
             IResourceQueryHelper<ClientPaginationRequest, ReceivedPenaltyResponse> receivedPenaltyHelper,
             IResourceQueryHelper<ClientPaginationRequest, AdministeredPenaltyResponse> administeredPenaltyHelper,
-            IResourceQueryHelper<ClientPaginationRequest, UpdatedAliasResponse> updatedAliasHelper)
+            IResourceQueryHelper<ClientPaginationRequest, UpdatedAliasResponse> updatedAliasHelper,
+            IResourceQueryHelper<ClientPaginationRequest, ConnectionHistoryResponse> connectionHistoryHelper)
         {
             _logger = logger;
             _transLookup = transLookup;
@@ -33,6 +36,7 @@ namespace IW4MAdmin.Application.Meta
             _receivedPenaltyHelper = receivedPenaltyHelper;
             _administeredPenaltyHelper = administeredPenaltyHelper;
             _updatedAliasHelper = updatedAliasHelper;
+            _connectionHistoryHelper = connectionHistoryHelper;
         }
 
         public void Register()
@@ -41,6 +45,7 @@ namespace IW4MAdmin.Application.Meta
             _metaService.AddRuntimeMeta<ClientPaginationRequest, ReceivedPenaltyResponse>(MetaType.ReceivedPenalty, GetReceivedPenaltiesMeta);
             _metaService.AddRuntimeMeta<ClientPaginationRequest, AdministeredPenaltyResponse>(MetaType.Penalized, GetAdministeredPenaltiesMeta);
             _metaService.AddRuntimeMeta<ClientPaginationRequest, UpdatedAliasResponse>(MetaType.AliasUpdate, GetUpdatedAliasMeta);
+            _metaService.AddRuntimeMeta<ClientPaginationRequest, ConnectionHistoryResponse>(MetaType.ConnectionHistory, GetConnectionHistoryMeta);
         }
 
         private async Task<IEnumerable<InformationResponse>> GetProfileMeta(ClientPaginationRequest request)
@@ -163,5 +168,11 @@ namespace IW4MAdmin.Application.Meta
             var aliases = await _updatedAliasHelper.QueryResource(request);
             return aliases.Results;
         }
+        
+        private async Task<IEnumerable<ConnectionHistoryResponse>> GetConnectionHistoryMeta(ClientPaginationRequest request)
+        {
+            var connections = await _connectionHistoryHelper.QueryResource(request);
+            return connections.Results;
+        }
     }
 }

Application/Meta/ReceivedPenaltyResourceQueryHelper.cs

@@ -1,10 +1,12 @@
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Data.Abstractions;
 using Data.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using SharedLibraryCore;
+using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Dtos.Meta.Responses;
 using SharedLibraryCore.Helpers;
 using SharedLibraryCore.Interfaces;
@@ -21,11 +23,14 @@ namespace IW4MAdmin.Application.Meta
     {
         private readonly ILogger _logger;
         private readonly IDatabaseContextFactory _contextFactory;
+        private readonly ApplicationConfiguration _appConfig;
 
-        public ReceivedPenaltyResourceQueryHelper(ILogger<ReceivedPenaltyResourceQueryHelper> logger, IDatabaseContextFactory contextFactory)
+        public ReceivedPenaltyResourceQueryHelper(ILogger<ReceivedPenaltyResourceQueryHelper> logger, 
+            IDatabaseContextFactory contextFactory, ApplicationConfiguration appConfig)
         {
             _contextFactory = contextFactory;
             _logger = logger;
+            _appConfig = appConfig;
         }
 
         public async Task<ResourceQueryHelperResult<ReceivedPenaltyResponse>> QueryResource(ClientPaginationRequest query)
@@ -35,15 +40,40 @@ namespace IW4MAdmin.Application.Meta
 
             var linkId = await ctx.Clients.AsNoTracking()
                     .Where(_client => _client.ClientId == query.ClientId)
-                    .Select(_client => _client.AliasLinkId)
+                    .Select(_client => new {_client.AliasLinkId, _client.CurrentAliasId })
                     .FirstOrDefaultAsync();
 
             var iqPenalties = ctx.Penalties.AsNoTracking()
-                .Where(_penalty => _penalty.OffenderId == query.ClientId || (linkedPenaltyType.Contains(_penalty.Type) && _penalty.LinkId == linkId))
-                .Where(_penalty => _penalty.When < query.Before)
-                .OrderByDescending(_penalty => _penalty.When);
+                .Where(_penalty => _penalty.OffenderId == query.ClientId ||
+                                   linkedPenaltyType.Contains(_penalty.Type) && _penalty.LinkId == linkId.AliasLinkId);
 
-            var penalties = await iqPenalties
+            IQueryable<EFPenalty> iqIpLinkedPenalties = null;
+            
+            if (!_appConfig.EnableImplicitAccountLinking)
+            {
+                var usedIps = await ctx.Aliases.AsNoTracking()
+                    .Where(alias => (alias.LinkId == linkId.AliasLinkId || alias.AliasId == linkId.CurrentAliasId) && alias.IPAddress != null)
+                    .Select(alias => alias.IPAddress).ToListAsync();
+
+                var aliasedIds = await ctx.Aliases.AsNoTracking().Where(alias => usedIps.Contains(alias.IPAddress))
+                    .Select(alias => alias.LinkId)
+                    .ToListAsync();
+
+                iqIpLinkedPenalties = ctx.Penalties.AsNoTracking()
+                    .Where(penalty =>
+                        linkedPenaltyType.Contains(penalty.Type) && aliasedIds.Contains(penalty.LinkId));
+            }
+
+            var iqAllPenalties = iqPenalties;
+            
+            if (iqIpLinkedPenalties != null)
+            {
+                iqAllPenalties = iqPenalties.Union(iqIpLinkedPenalties);
+            }
+
+             var penalties = await iqAllPenalties
+                .Where(_penalty => _penalty.When < query.Before)
+                .OrderByDescending(_penalty => _penalty.When)
                 .Take(query.Count)
                 .Select(_penalty => new ReceivedPenaltyResponse()
                 {

Application/Migration/DatabaseHousekeeping.cs

@@ -4,8 +4,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Data.Abstractions;
 using Data.Models.Client.Stats;
-using SharedLibraryCore.Database;
-using SharedLibraryCore.Interfaces;
 
 namespace IW4MAdmin.Application.Migration
 {

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");
-            Build();
+            _serializerOptions = new JsonSerializerOptions
+            {
+                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);
-                _configuration = JsonConvert.DeserializeObject<T>(configContent);
+                await using var fileStream = File.OpenRead(FileName);
+                _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
-            };
-            settings.Converters.Add(new Newtonsoft.Json.Converters.StringEnumConverter());
+                await _onSaving.WaitAsync();
 
-            var appConfigJSON = JsonConvert.SerializeObject(_configuration, settings);
-            return File.WriteAllTextAsync(FileName, appConfigJSON);
+                await using var fileStream = File.Create(FileName);
+                await JsonSerializer.SerializeAsync(fileStream, _configuration, _serializerOptions);
+            }
+
+            finally
+            {
+                if (_onSaving.CurrentCount == 0)
+                {
+                    _onSaving.Release(1);
+                }
+            }
         }
 
         public T Configuration()

Application/Misc/EventPublisher.cs

@@ -0,0 +1,44 @@
+using System;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore;
+using SharedLibraryCore.Interfaces;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
+
+namespace IW4MAdmin.Application.Misc
+{
+    public class EventPublisher : IEventPublisher
+    {
+        public event EventHandler<GameEvent> OnClientDisconnect;
+        public event EventHandler<GameEvent> OnClientConnect;
+
+        private readonly ILogger _logger;
+
+        public EventPublisher(ILogger<EventPublisher> logger)
+        {
+            _logger = logger;
+        }
+
+        public void Publish(GameEvent gameEvent)
+        {
+            _logger.LogDebug("Handling publishing event of type {EventType}", gameEvent.Type);
+
+            try
+            {
+                if (gameEvent.Type == GameEvent.EventType.Connect)
+                {
+                    OnClientConnect?.Invoke(this, gameEvent);
+                }
+
+                if (gameEvent.Type == GameEvent.EventType.Disconnect)
+                {
+                    OnClientDisconnect?.Invoke(this, gameEvent);
+                }
+            }
+
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Could not publish event of type {EventType}", gameEvent.Type);
+            }
+        }
+    }
+}

Application/Misc/LogPathGeneratorInfo.cs

@@ -19,6 +19,12 @@ namespace IW4MAdmin.Application.Misc
         /// </summary>
         public string BasePathDirectory { get; set; } = "";
 
+        /// <summary>
+        /// directory for local storage
+        /// <remarks>fs_homepath</remarks>
+        /// </summary>
+        public string HomePathDirectory { get; set; } = "";
+
         /// <summary>
         /// overide game directory
         /// <remarks>plugin driven</remarks>

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
                 {
-                    await UploadStatus();
-                }
-
-                catch (System.Net.Http.HttpRequestException e)
-                {
-                    _logger.LogWarning(e, "Could not send heartbeat");
-                }
-
-                catch (AggregateException e)
-                {
-                    _logger.LogWarning(e, "Could not send heartbeat");
-                    var exceptions = e.InnerExceptions.Where(ex => ex.GetType() == typeof(ApiException));
-
-                    foreach (var ex in exceptions)
+                    if (_manager.IsRunning)
                     {
-                        if (((ApiException)ex).StatusCode == System.Net.HttpStatusCode.Unauthorized)
-                        {
-                            connected = false;
-                        }
+                        await UploadStatus();
                     }
                 }
 
-                catch (ApiException e)
+                catch (Exception ex)
                 {
-                    _logger.LogWarning(e, "Could not send heartbeat");
-                    if (e.StatusCode == System.Net.HttpStatusCode.Unauthorized)
-                    {
-                        connected = false;
-                    }
+                    _logger.LogWarning(ex, "Could not send heartbeat");
                 }
 
-                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
                 {
@@ -179,12 +151,13 @@ namespace IW4MAdmin.Application.Misc
                                 Id = s.EndPoint,
                                 Port = (short)s.Port,
                                 IPAddress = s.IP
-                            }).ToList()
+                            }).ToList(),
+                WebfrontUrl = _appConfig.WebfrontUrl
             };
 
             Response<ResultMessage> response = null;
 
-            if (firstHeartBeat)
+            if (_firstHeartBeat)
             {
                 response = await _apiInstance.AddInstance(instance);
             }
@@ -192,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)
-            {
-                // information is not listed chronologically
-                if (type != MetaType.Information)
-                {
-                    var metaItems = await actions[0](request);
-                    meta.AddRange(metaItems);
-                }
-            }
-
-            return meta.OrderByDescending(_meta => _meta.When)
+            return metas.SelectMany(m => (IEnumerable<IClientMeta>)m)
+                .OrderByDescending(m => m.When)
                 .Take(request.Count)
                 .ToList();
         }
 
         public async Task<IEnumerable<T>> GetRuntimeMeta<T>(ClientPaginationRequest request, MetaType metaType) where T : IClientMeta
         {
-            IEnumerable<T> meta;
             if (metaType == MetaType.Information)
             {
                 var allMeta = new List<T>();
 
-                foreach (var individualMetaRegistration in _metaActions[metaType])
-                {
-                    allMeta.AddRange(await individualMetaRegistration(request));
-                }
-
+                var completedMeta = await Task.WhenAll(_metaActions[metaType].Select(async individualMetaRegistration =>
+                    (IEnumerable<T>)await individualMetaRegistration(request)));
+                
+                allMeta.AddRange(completedMeta.SelectMany(meta => meta));
+                
                 return ProcessInformationMeta(allMeta);
             }
 
-            else
-            {
-                meta = await _metaActions[metaType][0](request) as IEnumerable<T>;
-            }
+            var 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();
-                        IRConParser rconParser = (IRConParser)_scriptEngine.GetValue("rconParser").ToObject();
+                        var eventParser = (IEventParser)_scriptEngine.GetValue("eventParser").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;
@@ -87,4 +92,4 @@ namespace IW4MAdmin.Application.Misc
             return JsValue.FromObject(_scriptEngine, item);
         }
     }
-}
+}

Application/Misc/ServerDataCollector.cs

@@ -0,0 +1,147 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Data.Abstractions;
+using Data.Models;
+using Data.Models.Client;
+using Data.Models.Client.Stats.Reference;
+using Data.Models.Server;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore;
+using SharedLibraryCore.Configuration;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Misc
+{
+    /// <inheritdoc/>
+    public class ServerDataCollector : IServerDataCollector
+    {
+        private readonly ILogger _logger;
+        private readonly IManager _manager;
+        private readonly IDatabaseContextFactory _contextFactory;
+        private readonly ApplicationConfiguration _appConfig;
+        private readonly IEventPublisher _eventPublisher;
+
+        private bool _inProgress;
+        private TimeSpan _period;
+
+        public ServerDataCollector(ILogger<ServerDataCollector> logger, ApplicationConfiguration appConfig,
+            IManager manager, IDatabaseContextFactory contextFactory, IEventPublisher eventPublisher)
+        {
+            _logger = logger;
+            _appConfig = appConfig;
+            _manager = manager;
+            _contextFactory = contextFactory;
+            _eventPublisher = eventPublisher;
+
+            _eventPublisher.OnClientConnect += SaveConnectionInfo;
+            _eventPublisher.OnClientDisconnect += SaveConnectionInfo;
+        }
+
+        ~ServerDataCollector()
+        {
+            _eventPublisher.OnClientConnect -= SaveConnectionInfo;
+            _eventPublisher.OnClientDisconnect -= SaveConnectionInfo;
+        }
+
+        public async Task BeginCollectionAsync(TimeSpan? period = null, CancellationToken cancellationToken = default)
+        {
+            if (_inProgress)
+            {
+                throw new InvalidOperationException($"{nameof(ServerDataCollector)} is already collecting data");
+            }
+
+            _logger.LogDebug("Initializing data collection with {Name}", nameof(ServerDataCollector));
+            _inProgress = true;
+            _period = period ?? (Utilities.IsDevelopment
+                ? TimeSpan.FromMinutes(1)
+                : _appConfig.ServerDataCollectionInterval);
+
+            while (!cancellationToken.IsCancellationRequested)
+            {
+                try
+                {
+                    await Task.Delay(_period, cancellationToken);
+                    _logger.LogDebug("{Name} is collecting server data", nameof(ServerDataCollector));
+
+                    var data = await BuildCollectionData(cancellationToken);
+                    await SaveData(data, cancellationToken);
+                }
+                catch (TaskCanceledException)
+                {
+                    _logger.LogInformation("Shutdown requested for {Name}", nameof(ServerDataCollector));
+                    return;
+                }
+
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Unexpected error encountered collecting server data for {Name}",
+                        nameof(ServerDataCollector));
+                }
+            }
+        }
+
+        private async Task<IEnumerable<EFServerSnapshot>> BuildCollectionData(CancellationToken token)
+        {
+            var data = await Task.WhenAll(_manager.GetServers()
+                .Select(async server => new EFServerSnapshot
+                {
+                    CapturedAt = DateTime.UtcNow,
+                    PeriodBlock = (int) (DateTimeOffset.UtcNow - DateTimeOffset.UnixEpoch).TotalMinutes,
+                    ServerId = await server.GetIdForServer(),
+                    MapId = await GetOrCreateMap(server.CurrentMap.Name, (Reference.Game) server.GameName, token),
+                    ClientCount = server.ClientNum
+                }));
+
+            return data;
+        }
+
+        private async Task<int> GetOrCreateMap(string mapName, Reference.Game game, CancellationToken token)
+        {
+            await using var context = _contextFactory.CreateContext();
+            var existingMap =
+                await context.Maps.FirstOrDefaultAsync(map => map.Name == mapName && map.Game == game, token);
+
+            if (existingMap != null)
+            {
+                return existingMap.MapId;
+            }
+
+            var newMap = new EFMap
+            {
+                Name = mapName,
+                Game = game
+            };
+
+            context.Maps.Add(newMap);
+            await context.SaveChangesAsync(token);
+
+            return newMap.MapId;
+        }
+
+        private async Task SaveData(IEnumerable<EFServerSnapshot> snapshots, CancellationToken token)
+        {
+            await using var context = _contextFactory.CreateContext();
+            context.ServerSnapshots.AddRange(snapshots);
+            await context.SaveChangesAsync(token);
+        }
+
+        private void SaveConnectionInfo(object sender, GameEvent gameEvent)
+        {
+            using var context = _contextFactory.CreateContext(enableTracking: false);
+            context.ConnectionHistory.Add(new EFClientConnectionHistory
+            {
+                ClientId = gameEvent.Origin.ClientId,
+                ServerId = gameEvent.Owner.GetIdForServer().Result,
+                ConnectionType = gameEvent.Type == GameEvent.EventType.Connect
+                    ? Reference.ConnectionType.Connect
+                    : Reference.ConnectionType.Disconnect
+            });
+            context.SaveChanges();
+        }
+    }
+}

Application/Misc/ServerDataViewer.cs

@@ -0,0 +1,162 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Data.Abstractions;
+using Data.Models.Client;
+using Data.Models.Server;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore;
+using SharedLibraryCore.Dtos;
+using SharedLibraryCore.Interfaces;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
+
+namespace IW4MAdmin.Application.Misc
+{
+    /// <inheritdoc/>
+    public class ServerDataViewer : IServerDataViewer
+    {
+        private readonly ILogger _logger;
+        private readonly IDataValueCache<EFServerSnapshot, (int?, DateTime?)> _snapshotCache;
+        private readonly IDataValueCache<EFClient, (int, int)> _serverStatsCache;
+        private readonly IDataValueCache<EFServerSnapshot, List<ClientHistoryInfo>> _clientHistoryCache;
+
+        private readonly TimeSpan? _cacheTimeSpan =
+            Utilities.IsDevelopment ? TimeSpan.FromSeconds(30) : (TimeSpan?) TimeSpan.FromMinutes(10);
+
+        public ServerDataViewer(ILogger<ServerDataViewer> logger, IDataValueCache<EFServerSnapshot, (int?, DateTime?)> snapshotCache,
+            IDataValueCache<EFClient, (int, int)> serverStatsCache,
+            IDataValueCache<EFServerSnapshot, List<ClientHistoryInfo>> clientHistoryCache)
+        {
+            _logger = logger;
+            _snapshotCache = snapshotCache;
+            _serverStatsCache = serverStatsCache;
+            _clientHistoryCache = clientHistoryCache;
+        }
+
+        public async Task<(int?, DateTime?)> 
+            MaxConcurrentClientsAsync(long? serverId = null, TimeSpan? overPeriod = null,
+            CancellationToken token = default)
+        {
+            _snapshotCache.SetCacheItem(async (snapshots, cancellationToken) =>
+            {
+                var oldestEntry = overPeriod.HasValue
+                    ? DateTime.UtcNow - overPeriod.Value
+                    : DateTime.UtcNow.AddDays(-1);
+                
+                int? maxClients;
+                DateTime? maxClientsTime;
+
+                if (serverId != null)
+                {
+                    var clients = await snapshots.Where(snapshot => snapshot.ServerId == serverId)
+                        .Where(snapshot => snapshot.CapturedAt >= oldestEntry)
+                        .OrderByDescending(snapshot => snapshot.ClientCount)
+                        .Select(snapshot => new
+                        {
+                            snapshot.ClientCount,
+                            snapshot.CapturedAt
+                        })
+                        .FirstOrDefaultAsync(cancellationToken);
+
+                    maxClients = clients?.ClientCount;
+                    maxClientsTime = clients?.CapturedAt;
+                }
+
+                else
+                {
+                    var clients = await snapshots.Where(snapshot => snapshot.CapturedAt >= oldestEntry)
+                        .GroupBy(snapshot => snapshot.PeriodBlock)
+                        .Select(grp => new
+                        {
+                            ClientCount = grp.Sum(snapshot => (int?) snapshot.ClientCount),
+                            Time = grp.Max(snapshot => (DateTime?) snapshot.CapturedAt)
+                        })
+                        .OrderByDescending(snapshot => snapshot.ClientCount)
+                        .FirstOrDefaultAsync(cancellationToken);
+                    
+                    maxClients = clients?.ClientCount;
+                    maxClientsTime = clients?.Time;
+                }
+
+                _logger.LogDebug("Max concurrent clients since {Start} is {Clients}", oldestEntry, maxClients);
+
+                return (maxClients, maxClientsTime);
+            }, nameof(MaxConcurrentClientsAsync), _cacheTimeSpan, true);
+
+            try
+            {
+                return await _snapshotCache.GetCacheItem(nameof(MaxConcurrentClientsAsync), token);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Could not retrieve data for {Name}", nameof(MaxConcurrentClientsAsync));
+                return (null, null);
+            }
+        }
+
+        public async Task<(int, int)> ClientCountsAsync(TimeSpan? overPeriod = null, CancellationToken token = default)
+        {
+            _serverStatsCache.SetCacheItem(async (set, cancellationToken) =>
+            {
+                var count = await set.CountAsync(cancellationToken);
+                var startOfPeriod =
+                    DateTime.UtcNow.AddHours(-overPeriod?.TotalHours ?? -24);
+                var recentCount = await set.CountAsync(client => client.LastConnection >= startOfPeriod,
+                    cancellationToken);
+
+                return (count, recentCount);
+            }, nameof(_serverStatsCache), _cacheTimeSpan, true);
+
+            try
+            {
+                return await _serverStatsCache.GetCacheItem(nameof(_serverStatsCache), token);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Could not retrieve data for {Name}", nameof(ClientCountsAsync));
+                return (0, 0);
+            }
+        }
+
+        public async Task<IEnumerable<ClientHistoryInfo>> ClientHistoryAsync(TimeSpan? overPeriod = null, CancellationToken token = default)
+        {
+            _clientHistoryCache.SetCacheItem(async (set, cancellationToken) =>
+            {
+                var oldestEntry = overPeriod.HasValue
+                    ? DateTime.UtcNow - overPeriod.Value
+                    : DateTime.UtcNow.AddHours(-12);
+
+                var history = await set.Where(snapshot => snapshot.CapturedAt >= oldestEntry)
+                    .Select(snapshot =>
+                        new
+                        {
+                            snapshot.ServerId,
+                            snapshot.CapturedAt,
+                            snapshot.ClientCount
+                        })
+                    .OrderBy(snapshot => snapshot.CapturedAt)
+                    .ToListAsync(cancellationToken);
+
+                return history.GroupBy(snapshot => snapshot.ServerId).Select(byServer => new ClientHistoryInfo
+                {
+                    ServerId = byServer.Key,
+                    ClientCounts = byServer.Select(snapshot => new ClientCountSnapshot()
+                        {Time = snapshot.CapturedAt, ClientCount = snapshot.ClientCount}).ToList()
+                }).ToList();
+            }, nameof(_clientHistoryCache), TimeSpan.MaxValue);
+
+            try
+            {
+                return await _clientHistoryCache.GetCacheItem(nameof(_clientHistoryCache), token);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Could not retrieve data for {Name}", nameof(ClientHistoryAsync));
+                return Enumerable.Empty<ClientHistoryInfo>();
+            }
+        }
+    }
+}

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 static TimeSpan _timeoutPeriod = new TimeSpan(0, 0, 120);
-        private const short TOKEN_LENGTH = 4;
+        private readonly RandomNumberGenerator _random;
+        private static readonly TimeSpan TimeoutPeriod = new TimeSpan(0, 0, 120);
+        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]);
                 }

Application/RConParsers/DynamicRConParserConfiguration.cs

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

Data/Abstractions/IAuditFields.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace Data.Abstractions
+{
+    public class IAuditFields
+    {
+        DateTime CreatedDateTime { get; set; }
+        DateTime? UpdatedDateTime { get; set; } 
+    }
+}

Data/Abstractions/IDataValueCache.cs

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

Data/Context/ContextSeed.cs

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

Data/Context/DatabaseContext.cs

@@ -7,6 +7,7 @@ using Data.Models;
 using Data.Models.Client;
 using Data.Models.Client.Stats;
 using Data.Models.Client.Stats.Reference;
+using Data.Models.Misc;
 using Data.Models.Server;
 
 namespace Data.Context
@@ -35,6 +36,14 @@ namespace Data.Context
         public DbSet<EFWeapon> Weapons { get; set; }
         public DbSet<EFWeaponAttachment> WeaponAttachments { get; set; }
         public DbSet<EFMap> Maps { get; set; }
+        
+        #endregion
+
+        #region MISC
+
+        public DbSet<EFInboxMessage> InboxMessages { get; set; }
+        public DbSet<EFServerSnapshot> ServerSnapshots { get;set; }
+        public DbSet<EFClientConnectionHistory> ConnectionHistory { get; set; }
 
         #endregion
 
@@ -109,7 +118,7 @@ namespace Data.Context
                 ent.HasIndex(a => a.Name);
                 ent.Property(_alias => _alias.SearchableName).HasMaxLength(24);
                 ent.HasIndex(_alias => _alias.SearchableName);
-                ent.HasIndex(_alias => new {_alias.Name, _alias.IPAddress}).IsUnique();
+                ent.HasIndex(_alias => new {_alias.Name, _alias.IPAddress});
             });
 
             modelBuilder.Entity<EFMeta>(ent =>
@@ -121,15 +130,19 @@ namespace Data.Context
                     .OnDelete(DeleteBehavior.SetNull);
             });
 
+            modelBuilder.Entity<EFClientConnectionHistory>(ent => ent.HasIndex(history => history.CreatedDateTime));
+
             // force full name for database conversion
             modelBuilder.Entity<EFClient>().ToTable("EFClients");
             modelBuilder.Entity<EFAlias>().ToTable("EFAlias");
             modelBuilder.Entity<EFAliasLink>().ToTable("EFAliasLinks");
             modelBuilder.Entity<EFPenalty>().ToTable("EFPenalties");
+            modelBuilder.Entity<EFServerSnapshot>().ToTable(nameof(EFServerSnapshot));
+            modelBuilder.Entity<EFClientConnectionHistory>().ToTable(nameof(EFClientConnectionHistory));
 
             Models.Configuration.StatsModelConfiguration.Configure(modelBuilder);
 
             base.OnModelCreating(modelBuilder);
         }
     }
-}
+}

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.0.3</PackageVersion>
+    <PackageVersion>1.2.0</PackageVersion>
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.10">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
+    <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.EntityFrameworkCore.PostgreSQL" Version="3.1.4" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.2.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.10" />
-  </ItemGroup>
-  
-  <ItemGroup Condition="'$(Configuration)'=='Debug'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.10" />
+    <PackageReference Include="Npgsql" Version="6.0.2" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.2" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.1" />
   </ItemGroup>
   
 </Project>

Data/Helpers/DataValueCache.cs

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

Data/Helpers/LookupCache.cs

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

Data/MigrationContext/MySqlDatabaseContext.cs

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

Data/MigrationContext/PostgresqlDatabaseContext.cs

@@ -25,10 +25,10 @@ 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/Migrations/MySql/20210709010749_AddEFInboxMessage.cs

@@ -0,0 +1,70 @@
+using System;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Data.Migrations.MySql
+{
+    public partial class AddEFInboxMessage : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "InboxMessages",
+                columns: table => new
+                {
+                    InboxMessageId = table.Column<int>(nullable: false)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+                    CreatedDateTime = table.Column<DateTime>(nullable: false),
+                    UpdatedDateTime = table.Column<DateTime>(nullable: true),
+                    SourceClientId = table.Column<int>(nullable: false),
+                    DestinationClientId = table.Column<int>(nullable: false),
+                    ServerId = table.Column<long>(nullable: true),
+                    Message = table.Column<string>(nullable: true),
+                    IsDelivered = table.Column<bool>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_InboxMessages", x => x.InboxMessageId);
+                    table.ForeignKey(
+                        name: "FK_InboxMessages_EFClients_DestinationClientId",
+                        column: x => x.DestinationClientId,
+                        principalTable: "EFClients",
+                        principalColumn: "ClientId",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_InboxMessages_EFServers_ServerId",
+                        column: x => x.ServerId,
+                        principalTable: "EFServers",
+                        principalColumn: "ServerId",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_InboxMessages_EFClients_SourceClientId",
+                        column: x => x.SourceClientId,
+                        principalTable: "EFClients",
+                        principalColumn: "ClientId",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_InboxMessages_DestinationClientId",
+                table: "InboxMessages",
+                column: "DestinationClientId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_InboxMessages_ServerId",
+                table: "InboxMessages",
+                column: "ServerId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_InboxMessages_SourceClientId",
+                table: "InboxMessages",
+                column: "SourceClientId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "InboxMessages");
+        }
+    }
+}

Data/Migrations/MySql/20210826222452_AddEFServerSnapshot.cs

@@ -0,0 +1,58 @@
+using System;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Data.Migrations.MySql
+{
+    public partial class AddEFServerSnapshot : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "EFServerSnapshot",
+                columns: table => new
+                {
+                    ServerSnapshotId = table.Column<long>(nullable: false)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+                    Active = table.Column<bool>(nullable: false),
+                    CapturedAt = table.Column<DateTime>(nullable: false),
+                    PeriodBlock = table.Column<int>(nullable: false),
+                    ServerId = table.Column<long>(nullable: false),
+                    MapId = table.Column<int>(nullable: false),
+                    ClientCount = table.Column<int>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_EFServerSnapshot", x => x.ServerSnapshotId);
+                    table.ForeignKey(
+                        name: "FK_EFServerSnapshot_EFMaps_MapId",
+                        column: x => x.MapId,
+                        principalTable: "EFMaps",
+                        principalColumn: "MapId",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_EFServerSnapshot_EFServers_ServerId",
+                        column: x => x.ServerId,
+                        principalTable: "EFServers",
+                        principalColumn: "ServerId",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFServerSnapshot_MapId",
+                table: "EFServerSnapshot",
+                column: "MapId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFServerSnapshot_ServerId",
+                table: "EFServerSnapshot",
+                column: "ServerId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "EFServerSnapshot");
+        }
+    }
+}

Data/Migrations/MySql/20210831231006_AddEFClientConnectionHistory.cs

@@ -0,0 +1,62 @@
+using System;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Data.Migrations.MySql
+{
+    public partial class AddEFClientConnectionHistory : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "EFClientConnectionHistory",
+                columns: table => new
+                {
+                    ClientConnectionId = table.Column<long>(nullable: false)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+                    CreatedDateTime = table.Column<DateTime>(nullable: false),
+                    UpdatedDateTime = table.Column<DateTime>(nullable: true),
+                    ClientId = table.Column<int>(nullable: false),
+                    ServerId = table.Column<long>(nullable: false),
+                    ConnectionType = table.Column<int>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_EFClientConnectionHistory", x => x.ClientConnectionId);
+                    table.ForeignKey(
+                        name: "FK_EFClientConnectionHistory_EFClients_ClientId",
+                        column: x => x.ClientId,
+                        principalTable: "EFClients",
+                        principalColumn: "ClientId",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_EFClientConnectionHistory_EFServers_ServerId",
+                        column: x => x.ServerId,
+                        principalTable: "EFServers",
+                        principalColumn: "ServerId",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFClientConnectionHistory_ClientId",
+                table: "EFClientConnectionHistory",
+                column: "ClientId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFClientConnectionHistory_CreatedDateTime",
+                table: "EFClientConnectionHistory",
+                column: "CreatedDateTime");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFClientConnectionHistory_ServerId",
+                table: "EFClientConnectionHistory",
+                column: "ServerId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "EFClientConnectionHistory");
+        }
+    }
+}

Data/Migrations/MySql/20220102221729_RemoveUniqueAliasIndexConstraint.cs

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

Data/Migrations/MySql/MySqlDatabaseContextModelSnapshot.cs

@@ -95,6 +95,38 @@ namespace Data.Migrations.MySql
                     b.ToTable("EFClients");
                 });
 
+            modelBuilder.Entity("Data.Models.Client.EFClientConnectionHistory", b =>
+                {
+                    b.Property<long>("ClientConnectionId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    b.Property<int>("ClientId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("ConnectionType")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("CreatedDateTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<long>("ServerId")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime?>("UpdatedDateTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("ClientConnectionId");
+
+                    b.HasIndex("ClientId");
+
+                    b.HasIndex("CreatedDateTime");
+
+                    b.HasIndex("ServerId");
+
+                    b.ToTable("EFClientConnectionHistory");
+                });
+
             modelBuilder.Entity("Data.Models.Client.EFClientKill", b =>
                 {
                     b.Property<long>("KillId")
@@ -784,8 +816,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("SearchableName");
 
-                    b.HasIndex("Name", "IPAddress")
-                        .IsUnique();
+                    b.HasIndex("Name", "IPAddress");
 
                     b.ToTable("EFAlias");
                 });
@@ -935,6 +966,44 @@ namespace Data.Migrations.MySql
                     b.ToTable("EFPenalties");
                 });
 
+            modelBuilder.Entity("Data.Models.Misc.EFInboxMessage", b =>
+                {
+                    b.Property<int>("InboxMessageId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("CreatedDateTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int>("DestinationClientId")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("IsDelivered")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Message")
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
+
+                    b.Property<long?>("ServerId")
+                        .HasColumnType("bigint");
+
+                    b.Property<int>("SourceClientId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("UpdatedDateTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("InboxMessageId");
+
+                    b.HasIndex("DestinationClientId");
+
+                    b.HasIndex("ServerId");
+
+                    b.HasIndex("SourceClientId");
+
+                    b.ToTable("InboxMessages");
+                });
+
             modelBuilder.Entity("Data.Models.Server.EFServer", b =>
                 {
                     b.Property<long>("ServerId")
@@ -963,6 +1032,39 @@ namespace Data.Migrations.MySql
                     b.ToTable("EFServers");
                 });
 
+            modelBuilder.Entity("Data.Models.Server.EFServerSnapshot", b =>
+                {
+                    b.Property<long>("ServerSnapshotId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime>("CapturedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int>("ClientCount")
+                        .HasColumnType("int");
+
+                    b.Property<int>("MapId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("PeriodBlock")
+                        .HasColumnType("int");
+
+                    b.Property<long>("ServerId")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("ServerSnapshotId");
+
+                    b.HasIndex("MapId");
+
+                    b.HasIndex("ServerId");
+
+                    b.ToTable("EFServerSnapshot");
+                });
+
             modelBuilder.Entity("Data.Models.Server.EFServerStatistics", b =>
                 {
                     b.Property<int>("StatisticId")
@@ -1038,6 +1140,21 @@ namespace Data.Migrations.MySql
                         .IsRequired();
                 });
 
+            modelBuilder.Entity("Data.Models.Client.EFClientConnectionHistory", b =>
+                {
+                    b.HasOne("Data.Models.Client.EFClient", "Client")
+                        .WithMany()
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Data.Models.Server.EFServer", "Server")
+                        .WithMany()
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
             modelBuilder.Entity("Data.Models.Client.EFClientKill", b =>
                 {
                     b.HasOne("Data.Models.Client.EFClient", "Attacker")
@@ -1282,6 +1399,40 @@ namespace Data.Migrations.MySql
                         .IsRequired();
                 });
 
+            modelBuilder.Entity("Data.Models.Misc.EFInboxMessage", b =>
+                {
+                    b.HasOne("Data.Models.Client.EFClient", "DestinationClient")
+                        .WithMany()
+                        .HasForeignKey("DestinationClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Data.Models.Server.EFServer", "Server")
+                        .WithMany()
+                        .HasForeignKey("ServerId");
+
+                    b.HasOne("Data.Models.Client.EFClient", "SourceClient")
+                        .WithMany()
+                        .HasForeignKey("SourceClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Data.Models.Server.EFServerSnapshot", b =>
+                {
+                    b.HasOne("Data.Models.Client.Stats.Reference.EFMap", "Map")
+                        .WithMany()
+                        .HasForeignKey("MapId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Data.Models.Server.EFServer", "Server")
+                        .WithMany()
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
             modelBuilder.Entity("Data.Models.Server.EFServerStatistics", b =>
                 {
                     b.HasOne("Data.Models.Server.EFServer", "Server")

Data/Migrations/Postgresql/20210709010920_AddEFInboxMessage.cs

@@ -0,0 +1,70 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+namespace Data.Migrations.Postgresql
+{
+    public partial class AddEFInboxMessage : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "InboxMessages",
+                columns: table => new
+                {
+                    InboxMessageId = table.Column<int>(nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn),
+                    CreatedDateTime = table.Column<DateTime>(nullable: false),
+                    UpdatedDateTime = table.Column<DateTime>(nullable: true),
+                    SourceClientId = table.Column<int>(nullable: false),
+                    DestinationClientId = table.Column<int>(nullable: false),
+                    ServerId = table.Column<long>(nullable: true),
+                    Message = table.Column<string>(nullable: true),
+                    IsDelivered = table.Column<bool>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_InboxMessages", x => x.InboxMessageId);
+                    table.ForeignKey(
+                        name: "FK_InboxMessages_EFClients_DestinationClientId",
+                        column: x => x.DestinationClientId,
+                        principalTable: "EFClients",
+                        principalColumn: "ClientId",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_InboxMessages_EFServers_ServerId",
+                        column: x => x.ServerId,
+                        principalTable: "EFServers",
+                        principalColumn: "ServerId",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_InboxMessages_EFClients_SourceClientId",
+                        column: x => x.SourceClientId,
+                        principalTable: "EFClients",
+                        principalColumn: "ClientId",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_InboxMessages_DestinationClientId",
+                table: "InboxMessages",
+                column: "DestinationClientId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_InboxMessages_ServerId",
+                table: "InboxMessages",
+                column: "ServerId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_InboxMessages_SourceClientId",
+                table: "InboxMessages",
+                column: "SourceClientId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "InboxMessages");
+        }
+    }
+}

Data/Migrations/Postgresql/20210826222523_AddEFServerSnapshot.cs

@@ -0,0 +1,58 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+namespace Data.Migrations.Postgresql
+{
+    public partial class AddEFServerSnapshot : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "EFServerSnapshot",
+                columns: table => new
+                {
+                    ServerSnapshotId = table.Column<long>(nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn),
+                    Active = table.Column<bool>(nullable: false),
+                    CapturedAt = table.Column<DateTime>(nullable: false),
+                    PeriodBlock = table.Column<int>(nullable: false),
+                    ServerId = table.Column<long>(nullable: false),
+                    MapId = table.Column<int>(nullable: false),
+                    ClientCount = table.Column<int>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_EFServerSnapshot", x => x.ServerSnapshotId);
+                    table.ForeignKey(
+                        name: "FK_EFServerSnapshot_EFMaps_MapId",
+                        column: x => x.MapId,
+                        principalTable: "EFMaps",
+                        principalColumn: "MapId",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_EFServerSnapshot_EFServers_ServerId",
+                        column: x => x.ServerId,
+                        principalTable: "EFServers",
+                        principalColumn: "ServerId",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFServerSnapshot_MapId",
+                table: "EFServerSnapshot",
+                column: "MapId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFServerSnapshot_ServerId",
+                table: "EFServerSnapshot",
+                column: "ServerId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "EFServerSnapshot");
+        }
+    }
+}

Data/Migrations/Postgresql/20210831231031_AddEFClientConnectionHistory.cs

@@ -0,0 +1,62 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+namespace Data.Migrations.Postgresql
+{
+    public partial class AddEFClientConnectionHistory : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "EFClientConnectionHistory",
+                columns: table => new
+                {
+                    ClientConnectionId = table.Column<long>(nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn),
+                    CreatedDateTime = table.Column<DateTime>(nullable: false),
+                    UpdatedDateTime = table.Column<DateTime>(nullable: true),
+                    ClientId = table.Column<int>(nullable: false),
+                    ServerId = table.Column<long>(nullable: false),
+                    ConnectionType = table.Column<int>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_EFClientConnectionHistory", x => x.ClientConnectionId);
+                    table.ForeignKey(
+                        name: "FK_EFClientConnectionHistory_EFClients_ClientId",
+                        column: x => x.ClientId,
+                        principalTable: "EFClients",
+                        principalColumn: "ClientId",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_EFClientConnectionHistory_EFServers_ServerId",
+                        column: x => x.ServerId,
+                        principalTable: "EFServers",
+                        principalColumn: "ServerId",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFClientConnectionHistory_ClientId",
+                table: "EFClientConnectionHistory",
+                column: "ClientId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFClientConnectionHistory_CreatedDateTime",
+                table: "EFClientConnectionHistory",
+                column: "CreatedDateTime");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFClientConnectionHistory_ServerId",
+                table: "EFClientConnectionHistory",
+                column: "ServerId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "EFClientConnectionHistory");
+        }
+    }
+}

Data/Migrations/Postgresql/20220102221801_RemoveUniqueAliasIndexConstraint.cs

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

Data/Migrations/Postgresql/PostgresqlDatabaseContextModelSnapshot.cs

@@ -99,6 +99,39 @@ namespace Data.Migrations.Postgresql
                     b.ToTable("EFClients");
                 });
 
+            modelBuilder.Entity("Data.Models.Client.EFClientConnectionHistory", b =>
+                {
+                    b.Property<long>("ClientConnectionId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+
+                    b.Property<int>("ClientId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("ConnectionType")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("CreatedDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<long>("ServerId")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime?>("UpdatedDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.HasKey("ClientConnectionId");
+
+                    b.HasIndex("ClientId");
+
+                    b.HasIndex("CreatedDateTime");
+
+                    b.HasIndex("ServerId");
+
+                    b.ToTable("EFClientConnectionHistory");
+                });
+
             modelBuilder.Entity("Data.Models.Client.EFClientKill", b =>
                 {
                     b.Property<long>("KillId")
@@ -803,8 +836,7 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("SearchableName");
 
-                    b.HasIndex("Name", "IPAddress")
-                        .IsUnique();
+                    b.HasIndex("Name", "IPAddress");
 
                     b.ToTable("EFAlias");
                 });
@@ -958,6 +990,45 @@ namespace Data.Migrations.Postgresql
                     b.ToTable("EFPenalties");
                 });
 
+            modelBuilder.Entity("Data.Models.Misc.EFInboxMessage", b =>
+                {
+                    b.Property<int>("InboxMessageId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+
+                    b.Property<DateTime>("CreatedDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<int>("DestinationClientId")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("IsDelivered")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Message")
+                        .HasColumnType("text");
+
+                    b.Property<long?>("ServerId")
+                        .HasColumnType("bigint");
+
+                    b.Property<int>("SourceClientId")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("UpdatedDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.HasKey("InboxMessageId");
+
+                    b.HasIndex("DestinationClientId");
+
+                    b.HasIndex("ServerId");
+
+                    b.HasIndex("SourceClientId");
+
+                    b.ToTable("InboxMessages");
+                });
+
             modelBuilder.Entity("Data.Models.Server.EFServer", b =>
                 {
                     b.Property<long>("ServerId")
@@ -986,6 +1057,40 @@ namespace Data.Migrations.Postgresql
                     b.ToTable("EFServers");
                 });
 
+            modelBuilder.Entity("Data.Models.Server.EFServerSnapshot", b =>
+                {
+                    b.Property<long>("ServerSnapshotId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn);
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime>("CapturedAt")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<int>("ClientCount")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("MapId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("PeriodBlock")
+                        .HasColumnType("integer");
+
+                    b.Property<long>("ServerId")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("ServerSnapshotId");
+
+                    b.HasIndex("MapId");
+
+                    b.HasIndex("ServerId");
+
+                    b.ToTable("EFServerSnapshot");
+                });
+
             modelBuilder.Entity("Data.Models.Server.EFServerStatistics", b =>
                 {
                     b.Property<int>("StatisticId")
@@ -1063,6 +1168,21 @@ namespace Data.Migrations.Postgresql
                         .IsRequired();
                 });
 
+            modelBuilder.Entity("Data.Models.Client.EFClientConnectionHistory", b =>
+                {
+                    b.HasOne("Data.Models.Client.EFClient", "Client")
+                        .WithMany()
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Data.Models.Server.EFServer", "Server")
+                        .WithMany()
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
             modelBuilder.Entity("Data.Models.Client.EFClientKill", b =>
                 {
                     b.HasOne("Data.Models.Client.EFClient", "Attacker")
@@ -1307,6 +1427,40 @@ namespace Data.Migrations.Postgresql
                         .IsRequired();
                 });
 
+            modelBuilder.Entity("Data.Models.Misc.EFInboxMessage", b =>
+                {
+                    b.HasOne("Data.Models.Client.EFClient", "DestinationClient")
+                        .WithMany()
+                        .HasForeignKey("DestinationClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Data.Models.Server.EFServer", "Server")
+                        .WithMany()
+                        .HasForeignKey("ServerId");
+
+                    b.HasOne("Data.Models.Client.EFClient", "SourceClient")
+                        .WithMany()
+                        .HasForeignKey("SourceClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Data.Models.Server.EFServerSnapshot", b =>
+                {
+                    b.HasOne("Data.Models.Client.Stats.Reference.EFMap", "Map")
+                        .WithMany()
+                        .HasForeignKey("MapId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Data.Models.Server.EFServer", "Server")
+                        .WithMany()
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
             modelBuilder.Entity("Data.Models.Server.EFServerStatistics", b =>
                 {
                     b.HasOne("Data.Models.Server.EFServer", "Server")

Data/Migrations/Sqlite/20210703141113_AddEFInboxMessage.cs

@@ -0,0 +1,69 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Data.Migrations.Sqlite
+{
+    public partial class AddEFInboxMessage : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "InboxMessages",
+                columns: table => new
+                {
+                    InboxMessageId = table.Column<int>(nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    CreatedDateTime = table.Column<DateTime>(nullable: false),
+                    UpdatedDateTime = table.Column<DateTime>(nullable: true),
+                    SourceClientId = table.Column<int>(nullable: false),
+                    DestinationClientId = table.Column<int>(nullable: false),
+                    ServerId = table.Column<long>(nullable: true),
+                    Message = table.Column<string>(nullable: true),
+                    IsDelivered = table.Column<bool>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_InboxMessages", x => x.InboxMessageId);
+                    table.ForeignKey(
+                        name: "FK_InboxMessages_EFClients_DestinationClientId",
+                        column: x => x.DestinationClientId,
+                        principalTable: "EFClients",
+                        principalColumn: "ClientId",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_InboxMessages_EFServers_ServerId",
+                        column: x => x.ServerId,
+                        principalTable: "EFServers",
+                        principalColumn: "ServerId",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_InboxMessages_EFClients_SourceClientId",
+                        column: x => x.SourceClientId,
+                        principalTable: "EFClients",
+                        principalColumn: "ClientId",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_InboxMessages_DestinationClientId",
+                table: "InboxMessages",
+                column: "DestinationClientId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_InboxMessages_ServerId",
+                table: "InboxMessages",
+                column: "ServerId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_InboxMessages_SourceClientId",
+                table: "InboxMessages",
+                column: "SourceClientId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "InboxMessages");
+        }
+    }
+}

Data/Migrations/Sqlite/20210826222412_AddEFServerSnapshot.cs

@@ -0,0 +1,57 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Data.Migrations.Sqlite
+{
+    public partial class AddEFServerSnapshot : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "EFServerSnapshot",
+                columns: table => new
+                {
+                    ServerSnapshotId = table.Column<long>(nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    Active = table.Column<bool>(nullable: false),
+                    CapturedAt = table.Column<DateTime>(nullable: false),
+                    PeriodBlock = table.Column<int>(nullable: false),
+                    ServerId = table.Column<long>(nullable: false),
+                    MapId = table.Column<int>(nullable: false),
+                    ClientCount = table.Column<int>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_EFServerSnapshot", x => x.ServerSnapshotId);
+                    table.ForeignKey(
+                        name: "FK_EFServerSnapshot_EFMaps_MapId",
+                        column: x => x.MapId,
+                        principalTable: "EFMaps",
+                        principalColumn: "MapId",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_EFServerSnapshot_EFServers_ServerId",
+                        column: x => x.ServerId,
+                        principalTable: "EFServers",
+                        principalColumn: "ServerId",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFServerSnapshot_MapId",
+                table: "EFServerSnapshot",
+                column: "MapId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFServerSnapshot_ServerId",
+                table: "EFServerSnapshot",
+                column: "ServerId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "EFServerSnapshot");
+        }
+    }
+}

Data/Migrations/Sqlite/20210831230904_AddEFClientConnectionHistory.cs

@@ -0,0 +1,61 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Data.Migrations.Sqlite
+{
+    public partial class AddEFClientConnectionHistory : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "EFClientConnectionHistory",
+                columns: table => new
+                {
+                    ClientConnectionId = table.Column<long>(nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    CreatedDateTime = table.Column<DateTime>(nullable: false),
+                    UpdatedDateTime = table.Column<DateTime>(nullable: true),
+                    ClientId = table.Column<int>(nullable: false),
+                    ServerId = table.Column<long>(nullable: false),
+                    ConnectionType = table.Column<int>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_EFClientConnectionHistory", x => x.ClientConnectionId);
+                    table.ForeignKey(
+                        name: "FK_EFClientConnectionHistory_EFClients_ClientId",
+                        column: x => x.ClientId,
+                        principalTable: "EFClients",
+                        principalColumn: "ClientId",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_EFClientConnectionHistory_EFServers_ServerId",
+                        column: x => x.ServerId,
+                        principalTable: "EFServers",
+                        principalColumn: "ServerId",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFClientConnectionHistory_ClientId",
+                table: "EFClientConnectionHistory",
+                column: "ClientId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFClientConnectionHistory_CreatedDateTime",
+                table: "EFClientConnectionHistory",
+                column: "CreatedDateTime");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFClientConnectionHistory_ServerId",
+                table: "EFClientConnectionHistory",
+                column: "ServerId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "EFClientConnectionHistory");
+        }
+    }
+}

Data/Migrations/Sqlite/20220102214442_RemoveUniqueAliasIndexConstraint.cs

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

Data/Migrations/Sqlite/SqliteDatabaseContextModelSnapshot.cs

@@ -94,6 +94,38 @@ namespace Data.Migrations.Sqlite
                     b.ToTable("EFClients");
                 });
 
+            modelBuilder.Entity("Data.Models.Client.EFClientConnectionHistory", b =>
+                {
+                    b.Property<long>("ClientConnectionId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ClientId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ConnectionType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("CreatedDateTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("ServerId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("UpdatedDateTime")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ClientConnectionId");
+
+                    b.HasIndex("ClientId");
+
+                    b.HasIndex("CreatedDateTime");
+
+                    b.HasIndex("ServerId");
+
+                    b.ToTable("EFClientConnectionHistory");
+                });
+
             modelBuilder.Entity("Data.Models.Client.EFClientKill", b =>
                 {
                     b.Property<long>("KillId")
@@ -783,8 +815,7 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("SearchableName");
 
-                    b.HasIndex("Name", "IPAddress")
-                        .IsUnique();
+                    b.HasIndex("Name", "IPAddress");
 
                     b.ToTable("EFAlias");
                 });
@@ -934,6 +965,44 @@ namespace Data.Migrations.Sqlite
                     b.ToTable("EFPenalties");
                 });
 
+            modelBuilder.Entity("Data.Models.Misc.EFInboxMessage", b =>
+                {
+                    b.Property<int>("InboxMessageId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("CreatedDateTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DestinationClientId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDelivered")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Message")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long?>("ServerId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SourceClientId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("UpdatedDateTime")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("InboxMessageId");
+
+                    b.HasIndex("DestinationClientId");
+
+                    b.HasIndex("ServerId");
+
+                    b.HasIndex("SourceClientId");
+
+                    b.ToTable("InboxMessages");
+                });
+
             modelBuilder.Entity("Data.Models.Server.EFServer", b =>
                 {
                     b.Property<long>("ServerId")
@@ -962,6 +1031,39 @@ namespace Data.Migrations.Sqlite
                     b.ToTable("EFServers");
                 });
 
+            modelBuilder.Entity("Data.Models.Server.EFServerSnapshot", b =>
+                {
+                    b.Property<long>("ServerSnapshotId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("CapturedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ClientCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("MapId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("PeriodBlock")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("ServerId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ServerSnapshotId");
+
+                    b.HasIndex("MapId");
+
+                    b.HasIndex("ServerId");
+
+                    b.ToTable("EFServerSnapshot");
+                });
+
             modelBuilder.Entity("Data.Models.Server.EFServerStatistics", b =>
                 {
                     b.Property<int>("StatisticId")
@@ -1037,6 +1139,21 @@ namespace Data.Migrations.Sqlite
                         .IsRequired();
                 });
 
+            modelBuilder.Entity("Data.Models.Client.EFClientConnectionHistory", b =>
+                {
+                    b.HasOne("Data.Models.Client.EFClient", "Client")
+                        .WithMany()
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Data.Models.Server.EFServer", "Server")
+                        .WithMany()
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
             modelBuilder.Entity("Data.Models.Client.EFClientKill", b =>
                 {
                     b.HasOne("Data.Models.Client.EFClient", "Attacker")
@@ -1281,6 +1398,40 @@ namespace Data.Migrations.Sqlite
                         .IsRequired();
                 });
 
+            modelBuilder.Entity("Data.Models.Misc.EFInboxMessage", b =>
+                {
+                    b.HasOne("Data.Models.Client.EFClient", "DestinationClient")
+                        .WithMany()
+                        .HasForeignKey("DestinationClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Data.Models.Server.EFServer", "Server")
+                        .WithMany()
+                        .HasForeignKey("ServerId");
+
+                    b.HasOne("Data.Models.Client.EFClient", "SourceClient")
+                        .WithMany()
+                        .HasForeignKey("SourceClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Data.Models.Server.EFServerSnapshot", b =>
+                {
+                    b.HasOne("Data.Models.Client.Stats.Reference.EFMap", "Map")
+                        .WithMany()
+                        .HasForeignKey("MapId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Data.Models.Server.EFServer", "Server")
+                        .WithMany()
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
             modelBuilder.Entity("Data.Models.Server.EFServerStatistics", b =>
                 {
                     b.HasOne("Data.Models.Server.EFServer", "Server")

Data/Models/AuditFields.cs

@@ -1,9 +1,10 @@
 using System;
 using System.ComponentModel.DataAnnotations;
+using Data.Abstractions;
 
 namespace Stats.Models
 {
-    public class AuditFields
+    public class AuditFields : IAuditFields
     {
         [Required]
         public DateTime CreatedDateTime { get; set; } = DateTime.UtcNow;

Data/Models/Client/EFClientConnectionHistory.cs

@@ -0,0 +1,25 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Data.Models.Server;
+using Stats.Models;
+
+namespace Data.Models.Client
+{
+    public class EFClientConnectionHistory : AuditFields
+    {
+        [Key] 
+        public long ClientConnectionId { get; set; }
+
+        public int ClientId { get; set; }
+        
+        [ForeignKey(nameof(ClientId))]
+        public EFClient Client { get;set; }
+        
+        public long ServerId { get; set; }
+        
+        [ForeignKey(nameof(ServerId))]
+        public EFServer Server { get;set; }
+        
+        public Reference.ConnectionType ConnectionType { get; set; }
+    }
+}

Data/Models/Client/Stats/EFClientStatistics.cs

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

Data/Models/Misc/EFInboxMessage.cs

@@ -0,0 +1,35 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Data.Models.Client;
+using Data.Models.Server;
+using Stats.Models;
+
+namespace Data.Models.Misc
+{
+    public class EFInboxMessage : AuditFields
+    {
+        [Key]
+        public int InboxMessageId { get; set; }
+        
+        [Required]
+        public int SourceClientId { get; set; }
+        
+        [ForeignKey(nameof(SourceClientId))]
+        public EFClient SourceClient { get; set; }
+        
+        [Required]
+        public int DestinationClientId { get; set; }
+        
+        [ForeignKey(nameof(DestinationClientId))]
+        public EFClient DestinationClient { get; set; }
+        
+        public long? ServerId { get; set; }
+        
+        [ForeignKey(nameof(ServerId))]
+        public EFServer Server { get; set; }
+
+        public string Message { get; set; }
+        
+        public bool IsDelivered { get; set; }
+    }
+}

Data/Models/Reference.cs

@@ -17,5 +17,11 @@
             SHG1 = 9,
             CSGO = 10
         }
+        
+        public enum ConnectionType
+        {
+            Connect,
+            Disconnect
+        }
     }
 }

Data/Models/Server/EFServerSnapshot.cs

@@ -0,0 +1,36 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Data.Models.Client.Stats.Reference;
+
+namespace Data.Models.Server
+{
+    public class EFServerSnapshot : SharedEntity
+    {
+        [Key]
+        public long ServerSnapshotId { get; set; }
+        
+        public DateTime CapturedAt { get; set; }
+        
+        /// <summary>
+        /// Specifies at which time block during a period the snapshot occured
+        /// | 1:00      | 1:05      | 1:10      |
+        /// | 5 minutes | 5 minutes | 5 minutes |
+        /// | 0         | 1         | 2         | 
+        /// </summary>
+        public int PeriodBlock { get; set; }
+
+        [Required]
+        public long ServerId { get; set; }
+        
+        [ForeignKey(nameof(ServerId))]
+        public EFServer Server { get; set; }
+        
+        public int MapId { get; set; }
+        
+        [ForeignKey(nameof(MapId))]
+        public EFMap Map { get; set; }
+        
+        public int ClientCount { get; set; }
+    }
+}

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
 {
@@ -110,4 +112,4 @@ namespace Data.Models
 
         public double AngleBetween(Vector3 a) => Math.Acos(this.DotProduct(a) / (a.Magnitude() * this.Magnitude()));
     }
-}
+}

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')
@@ -31,7 +40,7 @@ steps:
             echo '##vso[task.setvariable variable=buildConfiguration]Prerelease'
             echo '##vso[task.setvariable variable=isPreRelease]true'
     failOnStderr: true
-
+  
 - task: NuGetCommand@2
   displayName: 'Restore nuget packages'
   inputs:
@@ -55,6 +64,20 @@ steps:
     msbuildArgs: '/p:DeployOnBuild=false /p:PackageAsSingleFile=false /p:SkipInvalidConfigurations=true /p:PackageLocation="$(build.artifactStagingDirectory)" /p:Version=$(Build.BuildNumber)'
     platform: '$(buildPlatform)'
     configuration: '$(buildConfiguration)'
+      
+- task: PowerShell@2
+  displayName: 'Bundle JS Files'
+  inputs:
+    targetType: 'inline'
+    script: |
+      Write-Host 'Getting dotnet bundle'
+      wget http://raidmax.org/IW4MAdmin/res/dotnet-bundle.zip -o $(Build.Repository.LocalPath)\dotnet-bundle.zip
+      Write-Host 'Unzipping download'
+      Expand-Archive -LiteralPath $(Build.Repository.LocalPath)\dotnet-bundle.zip -DestinationPath $(Build.Repository.LocalPath)
+      Write-Host 'Executing dotnet-bundle'
+      $(Build.Repository.LocalPath)\dotnet-bundle.exe $(Build.Repository.LocalPath)\WebfrontCore\bundleconfig.json
+    failOnStderr: true
+    workingDirectory: '$(Build.Repository.LocalPath)\WebfrontCore'
 
 - task: DotNetCoreCLI@2
   displayName: 'Publish projects'
@@ -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:

GameFiles/IW4x/userraw/scripts/_customcallbacks.gsc

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

GameFiles/IW5/storage/iw5/scripts/README.MD

@@ -0,0 +1,23 @@
+# IW5
+
+This expands IW4M-Admins's Anti-cheat to Plutonium IW5
+## Installation
+
+Add ``_customcallbacks.gsc`` into the scripts folder. (%localappdata%\Plutonium\storage\iw5\scripts)
+
+For more info check out Chase's [how-to guide](https://forum.plutonium.pw/topic/10738/tutorial-loading-custom-gsc-scripts).
+
+You need to add this to you ``StatsPluginSettings.json`` found in your IW4M-Admin configuration folder.
+
+```
+      "IW5": {
+        "Recoil": [
+          "iw5_1887_mp.*",
+          "turret_minigun_mp"
+        ],
+        "Button": [
+          ".*akimbo.*"
+        ]
+      }
+```
+[Example](https://imgur.com/Ji9AafI)

GameFiles/IW5/storage/iw5/scripts/_customcallbacks.gsc

@@ -0,0 +1,249 @@
+#include maps\mp\_utility;
+#include maps\mp\gametypes\_hud_util;
+#include common_scripts\utility;
+
+init()
+{
+	Print("IW4MADMIN Anti-Cheat Loaded");
+	SetDvarIfUninitialized( "sv_customcallbacks", true );
+	SetDvarIfUninitialized( "sv_framewaittime", 0.05 );
+	SetDvarIfUninitialized( "sv_additionalwaittime", 0.1 );
+	SetDvarIfUninitialized( "sv_maxstoredframes", 12 );
+	SetDvarIfUninitialized( "sv_printradarupdates", 0 );
+	SetDvarIfUninitialized( "sv_printradar_updateinterval", 500 );
+	SetDvarIfUninitialized( "sv_iw4madmin_url", "http://127.0.0.1:1624" );
+	
+	level thread onPlayerConnect();
+	if (getDvarInt("sv_printradarupdates") == 1)
+	{
+		level thread runRadarUpdates();
+	}
+	
+	level waittill( "prematch_over" );
+	level.callbackPlayerKilled = ::Callback_PlayerKilled;
+	level.callbackPlayerDamage = ::Callback_PlayerDamage;
+	level.callbackPlayerDisconnect = ::Callback_PlayerDisconnect;
+}
+
+onPlayerConnect( player )
+{
+	for( ;; )
+	{
+		level waittill( "connected", player );	
+		player setClientDvar("cl_demo_enabled", 1);
+		player thread waitForFrameThread();
+		player thread waitForAttack();
+	}
+}
+
+waitForAttack()
+{
+	self endon( "disconnect" );
+	
+	self.lastAttackTime = 0;
+	
+	for( ;; )
+	{
+		self notifyOnPlayerCommand( "player_shot", "+attack" );
+		self waittill( "player_shot" );
+		
+		self.lastAttackTime = getTime();
+	}
+}
+
+runRadarUpdates()
+{
+	interval = int(getDvar("sv_printradar_updateinterval"));
+
+	for ( ;; )
+	{
+		for ( i = 0; i <= 17; i++ )
+		{
+			player = level.players[i];
+
+			if ( isDefined( player ) )
+			{
+				payload = player.guid + ";" + player.origin + ";" + player getPlayerAngles() + ";" + player.team + ";" + player.kills + ";" + player.deaths + ";" + player.score + ";" + player GetCurrentWeapon() + ";" + player.health + ";" + isAlive(player) + ";" + player.timePlayed["total"];
+				logPrint( "LiveRadar;" + payload + "\n" );
+			}	
+		}
+
+		wait( interval / 1000 );
+	}	
+}
+
+hitLocationToBone( hitloc )
+{
+	switch( hitloc )
+	{
+		case "helmet":
+			return "j_helmet";
+		case "head":
+			return "j_head";
+		case "neck":
+			return "j_neck";
+		case "torso_upper":
+			return "j_spineupper";
+		case "torso_lower":
+			return "j_spinelower";
+		case "right_arm_upper":
+			return "j_shoulder_ri";
+		case "left_arm_upper":
+			return "j_shoulder_le";
+		case "right_arm_lower":
+			return "j_elbow_ri";
+		case "left_arm_lower":
+			return "j_elbow_le";
+		case "right_hand":
+			return "j_wrist_ri";
+		case "left_hand":
+			return "j_wrist_le";
+		case "right_leg_upper":
+			return "j_hip_ri";
+		case "left_leg_upper":
+			return "j_hip_le";
+		case "right_leg_lower":
+			return "j_knee_ri";
+		case "left_leg_lower":
+			return "j_knee_le";
+		case "right_foot":
+			return "j_ankle_ri";
+		case "left_foot":
+			return "j_ankle_le";
+		default:
+			return "tag_origin";
+	}
+}
+
+waitForFrameThread()
+{
+	self endon( "disconnect" );
+	
+	self.currentAnglePosition = 0;
+	self.anglePositions = [];
+
+	for (i = 0; i < getDvarInt( "sv_maxstoredframes" ); i++)
+	{
+		self.anglePositions[i] = self getPlayerAngles();
+	}
+		
+	for( ;; )
+	{
+		self.anglePositions[self.currentAnglePosition] = self getPlayerAngles();
+		wait( getDvarFloat( "sv_framewaittime" ) );	
+		self.currentAnglePosition = (self.currentAnglePosition + 1) % getDvarInt( "sv_maxstoredframes" );
+	}
+}
+
+waitForAdditionalAngles( logString, beforeFrameCount, afterFrameCount )
+{
+	currentIndex = self.currentAnglePosition;
+	wait( 0.05 * afterFrameCount );
+	
+	self.angleSnapshot = [];
+	
+	for( j = 0; j < self.anglePositions.size; j++ )
+	{
+		self.angleSnapshot[j] = self.anglePositions[j];
+	}
+
+	anglesStr = "";
+	collectedFrames = 0;
+	i = currentIndex - beforeFrameCount;
+
+	while (collectedFrames < beforeFrameCount)
+	{
+		fixedIndex = i;
+		if (i < 0)
+		{
+			fixedIndex = self.angleSnapshot.size - abs(i);
+		}
+		anglesStr += self.angleSnapshot[int(fixedIndex)] + ":";
+		collectedFrames++;
+		i++;
+	}
+
+	if (i == currentIndex)
+	{
+		anglesStr += self.angleSnapshot[i] + ":";
+		i++;
+	}
+
+	collectedFrames = 0;
+
+	while (collectedFrames < afterFrameCount)
+	{
+		fixedIndex = i;
+		if (i > self.angleSnapshot.size - 1)
+		{
+			fixedIndex = i % self.angleSnapshot.size;
+		}
+		anglesStr += self.angleSnapshot[int(fixedIndex)] + ":";
+		collectedFrames++;
+		i++;
+	}
+
+	lastAttack = int(getTime()) - int(self.lastAttackTime);
+	isAlive = isAlive(self);
+
+	logPrint(logString + ";" + anglesStr + ";" + isAlive + ";" + lastAttack + "\n" ); 
+}
+
+vectorScale( vector, scale )
+{
+	return ( vector[0] * scale, vector[1] * scale, vector[2] * scale );
+}
+
+Process_Hit( type, attacker, sHitLoc, sMeansOfDeath, iDamage, sWeapon )
+{
+	if (sMeansOfDeath == "MOD_FALLING" || !isPlayer(attacker))
+	{
+		return;
+	}
+
+	victim = self;
+	_attacker = attacker;
+
+	if ( !isPlayer( attacker ) && isDefined( attacker.owner ) )
+	{
+		_attacker = attacker.owner;
+	}
+
+	else if( !isPlayer( attacker ) && sMeansOfDeath == "MOD_FALLING" )
+	{
+		_attacker = victim;
+	}
+	
+	location = victim GetTagOrigin( hitLocationToBone( sHitLoc ) );
+	isKillstreakKill = !isPlayer( attacker ) || isKillstreakWeapon( sWeapon );
+
+	logLine = "Script" + type + ";" + _attacker.guid + ";" + victim.guid + ";" + _attacker GetTagOrigin("tag_eye") + ";" + location + ";" + iDamage + ";" + sWeapon + ";" + sHitLoc + ";" + sMeansOfDeath + ";" + _attacker getPlayerAngles() + ";" + int(gettime()) + ";" + isKillstreakKill + ";" +  _attacker playerADS() + ";0;0";
+	attacker thread waitForAdditionalAngles( logLine, 2, 2 );
+}
+
+Callback_PlayerDamage( eInflictor, attacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, psOffsetTime )
+{
+	if ( self.health - iDamage > 0 )
+	{
+		isFriendlyFire = level.teamBased && isDefined( attacker ) && ( self != attacker ) && isDefined( attacker.team ) && ( self.pers[ "team" ] == attacker.team );
+		
+		if ( !isFriendlyFire )
+		{
+			self Process_Hit( "Damage", attacker, sHitLoc, sMeansOfDeath, iDamage, sWeapon );
+		}
+	}
+
+	self maps\mp\gametypes\_damage::Callback_PlayerDamage( eInflictor, attacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, psOffsetTime );
+}
+
+Callback_PlayerKilled( eInflictor, attacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, psOffsetTime, deathAnimDuration )
+{
+	Process_Hit( "Kill", attacker, sHitLoc, sMeansOfDeath, iDamage, sWeapon );
+	self maps\mp\gametypes\_damage::Callback_PlayerKilled( eInflictor, attacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, psOffsetTime, deathAnimDuration );
+}
+
+Callback_PlayerDisconnect()
+{
+	level notify( "disconnected", self );
+	self maps\mp\gametypes\_playerlogic::Callback_PlayerDisconnect();
+}

GameFiles/PT6/README.MD

@@ -0,0 +1,35 @@
+# T6
+
+This brings IW4M-Admins's Anti-cheat to Plutonium T6
+The following limitations are known:
+* Can't get the recoil from weapons fire; you have to disable this detection type manually.
+* in extreme cases it can produce false positives for Snap and Offset detection.
+
+## Installation
+
+
+Move `_customcallbacks.gsc` to `%localappdata%\Plutonium\storage\t6\scripts\mp\`
+
+Add this to the WeaponNameParserConfigurations List in the StatsPluginSettings.json file:
+
+```
+    {
+      "Game": "T6",
+      "Delimiters": [
+        "_",
+        "+"
+      ],
+      "WeaponSuffix": "mp",
+      "WeaponPrefix": null
+    }
+```
+
+Now create the following entry for __EVERY__ T6 server you are using this on in the ServerDetectionTypes list:
+
+```
+    "1270014976": [
+        "Offset",
+        "Strain",
+        "Snap"
+      ]
+```

GameFiles/PT6/storage/t6/scripts/mp/_customcallbacks.gsc.src

@@ -3,24 +3,6 @@
 #include common_scripts\utility;
 
 init()
-{
-	level.clientid = 0;
-	level thread onplayerconnect();
-    level thread IW4MA_init();
-}
-
-onplayerconnect()
-{
-	for ( ;; )
-	{
-		level waittill( "connecting", player );
-		player.clientid = level.clientid;
-		level.clientid++;
-	}
-}
-
-
-IW4MA_init()
 {
 	SetDvarIfUninitialized( "sv_customcallbacks", true );
 	SetDvarIfUninitialized( "sv_framewaittime", 0.05 );
@@ -29,53 +11,52 @@ IW4MA_init()
 	SetDvarIfUninitialized( "sv_printradarupdates", 0 );
 	SetDvarIfUninitialized( "sv_printradar_updateinterval", 500 );
 	SetDvarIfUninitialized( "sv_iw4madmin_url", "http://127.0.0.1:1624" );
-	
-	level thread IW4MA_onPlayerConnect();
+
+	level thread onPlayerConnect();
 	if (getDvarInt("sv_printradarupdates") == 1)
 	{
 		level thread runRadarUpdates();
 	}
-	
+
 	level waittill( "prematch_over" );
 	level.callbackPlayerKilled = ::Callback_PlayerKilled;
 	level.callbackPlayerDamage = ::Callback_PlayerDamage;
 	level.callbackPlayerDisconnect = ::Callback_PlayerDisconnect;
 }
 
-//Does not exist in T6
+//It's called slightly different in T6
+//set_dvar_if_unset(dvar, val, reset)
 SetDvarIfUninitialized(dvar, val)
 {
-	curval = getDvar(dvar);
-	if (curval == "")
-		SetDvar(dvar,val);
+	set_dvar_if_unset(dvar,val);
 }
 
-IW4MA_onPlayerConnect( player )
+onPlayerConnect( player )
 {
 	for( ;; )
 	{
 		level waittill( "connected", player );	
 		player thread waitForFrameThread();
-		//player thread waitForAttack();
+		player thread waitForAttack();
 	}
 }
 
 
-//Does not work in T6
-/*waitForAttack()
+//Got added to T6 on April 2020
+waitForAttack()
 {
 	self endon( "disconnect" );
-	
+
 	self.lastAttackTime = 0;
-	
+
 	for( ;; )
 	{
 		self notifyOnPlayerCommand( "player_shot", "+attack" );
 		self waittill( "player_shot" );
-		
+
 		self.lastAttackTime = getTime();
 	}
-}*/
+}
 
 runRadarUpdates()
 {
@@ -95,7 +76,7 @@ runRadarUpdates()
 		}
 
 		wait( interval / 1000 );
-	}	
+	}
 }
 
 hitLocationToBone( hitloc )
@@ -144,7 +125,7 @@ hitLocationToBone( hitloc )
 waitForFrameThread()
 {
 	self endon( "disconnect" );
-	
+
 	self.currentAnglePosition = 0;
 	self.anglePositions = [];
 
@@ -152,7 +133,7 @@ waitForFrameThread()
 	{
 		self.anglePositions[i] = self getPlayerAngles();
 	}
-		
+
 	for( ;; )
 	{
 		self.anglePositions[self.currentAnglePosition] = self getPlayerAngles();
@@ -165,9 +146,9 @@ waitForAdditionalAngles( logString, beforeFrameCount, afterFrameCount )
 {
 	currentIndex = self.currentAnglePosition;
 	wait( 0.05 * afterFrameCount );
-	
+
 	self.angleSnapshot = [];
-	
+
 	for( j = 0; j < self.anglePositions.size; j++ )
 	{
 		self.angleSnapshot[j] = self.anglePositions[j];
@@ -209,7 +190,7 @@ waitForAdditionalAngles( logString, beforeFrameCount, afterFrameCount )
 		i++;
 	}
 
-	lastAttack = 100;//int(getTime()) - int(self.lastAttackTime);
+	lastAttack = int(getTime()) - int(self.lastAttackTime);
 	isAlive = isAlive(self);
 
 	logPrint(logString + ";" + anglesStr + ";" + isAlive + ";" + lastAttack + "\n" ); 
@@ -261,7 +242,7 @@ Callback_PlayerDamage( eInflictor, attacker, iDamage, iDFlags, sMeansOfDeath, sW
 	{
 		return;
 	}
-		
+
 	if ( self.health - iDamage > 0 )
 	{
 		self Process_Hit( "Damage", attacker, sHitLoc, sMeansOfDeath, iDamage, sWeapon );

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