temporarily disable ftp release integration to bypass unknown Error: connect ETIMEDOUT *:21 (control socket)

Application/Application.csproj

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

Application/ApplicationManager.cs

@@ -15,7 +15,6 @@ using System;
 using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Linq;
 using System.Reflection;
 using System.Text;
@@ -27,7 +26,6 @@ using IW4MAdmin.Application.Migration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Serilog.Context;
-using SharedLibraryCore.Formatting;
 using static SharedLibraryCore.GameEvent;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 using ObsoleteLogger = SharedLibraryCore.Interfaces.ILogger;
@@ -219,8 +217,6 @@ namespace IW4MAdmin.Application
             return _commands;
         }
 
-        public IReadOnlyList<IManagerCommand> Commands => _commands.ToImmutableList();
-
         public async Task UpdateServerStates()
         {
             // store the server hash code and task for it
@@ -355,10 +351,10 @@ namespace IW4MAdmin.Application
             // copy over default config if it doesn't exist
             if (!_appConfig.Servers?.Any() ?? true)
             {
-                var defaultHandler = new BaseConfigurationHandler<DefaultSettings>("DefaultSettings");
-                await defaultHandler.BuildAsync();
-                var defaultConfig = defaultHandler.Configuration();
-        
+                var defaultConfig = new BaseConfigurationHandler<DefaultSettings>("DefaultSettings").Configuration();
+                //ConfigHandler.Set((ApplicationConfiguration)new ApplicationConfiguration().Generate());
+                //var newConfig = ConfigHandler.Configuration();
+
                 _appConfig.AutoMessages = defaultConfig.AutoMessages;
                 _appConfig.GlobalRules = defaultConfig.GlobalRules;
                 _appConfig.DisallowedClientNames = defaultConfig.DisallowedClientNames;
@@ -456,17 +452,6 @@ namespace IW4MAdmin.Application
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
             Utilities.EncodingType = Encoding.GetEncoding(!string.IsNullOrEmpty(_appConfig.CustomParserEncoding) ? _appConfig.CustomParserEncoding : "windows-1252");
 
-            foreach (var parser in AdditionalRConParsers)
-            {
-                if (!parser.Configuration.ColorCodeMapping.ContainsKey(ColorCodes.Accent.ToString()))
-                {
-                    parser.Configuration.ColorCodeMapping.Add(ColorCodes.Accent.ToString(),
-                        parser.Configuration.ColorCodeMapping.TryGetValue(_appConfig.IngameAccentColorKey, out var colorCode)
-                            ? colorCode
-                            : "");
-                }
-            }
-
             #endregion
 
             #region COMMANDS
@@ -492,17 +477,13 @@ namespace IW4MAdmin.Application
 
             // this is because I want to store the command prefix in IW4MAdminSettings, but can't easily
             // inject it to all the places that need it
-            cmdConfig.CommandPrefix = _appConfig?.CommandPrefix ?? "!";
-            cmdConfig.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,
@@ -551,7 +532,7 @@ namespace IW4MAdmin.Application
 
                         _servers.Add(ServerInstance);
                         Console.WriteLine(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_MONITORING_TEXT"].FormatExt(ServerInstance.Hostname.StripColors()));
-                        _logger.LogInformation("Finishing initialization and now monitoring [{Server}]", ServerInstance.Hostname);
+                        _logger.LogInformation("Finishing initialization and now monitoring [{server}]", ServerInstance.Hostname, ServerInstance.ToString());
                     }
 
                     // add the start event for this server

Application/BuildScripts/PostBuild.bat

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

Application/BuildScripts/PostPublish.bat

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

Application/Commands/FindPlayerCommand.cs

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

Application/Commands/HelpCommand.cs

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

Application/Commands/ListAdminsCommand.cs

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

Application/Commands/ListAliasesCommand.cs

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

Application/Commands/ListClientsCommand.cs

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

Application/Commands/ListPluginsCommand.cs

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

Application/Commands/ListReportsCommand.cs

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

Application/Commands/MapAndGameTypeCommand.cs

@@ -1,128 +0,0 @@
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using Data.Models.Client;
-using IW4MAdmin.Application.Extensions;
-using Microsoft.Extensions.Logging;
-using SharedLibraryCore;
-using SharedLibraryCore.Commands;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
-
-namespace IW4MAdmin.Application.Commands
-{
-    public class MapAndGameTypeCommand : Command
-    {
-        private const string ArgumentRegexPattern = "(?:\"([^\"]+)\"|([^\\s]+)) (?:\"([^\"]+)\"|([^\\s]+))";
-        private readonly ILogger _logger;
-        private readonly DefaultSettings _defaultSettings;
-
-        public MapAndGameTypeCommand(ILogger<MapAndGameTypeCommand> logger, CommandConfiguration config,
-            DefaultSettings defaultSettings, ITranslationLookup layout) : base(config, layout)
-        {
-            Name = "mapandgametype";
-            Description = _translationLookup["COMMANDS_MAG_DESCRIPTION"];
-            Alias = "mag";
-            Permission = EFClient.Permission.Administrator;
-            RequiresTarget = false;
-            Arguments = new[]
-            {
-                new CommandArgument
-                {
-                    Name = _translationLookup["COMMADS_MAG_ARG_1"],
-                    Required = true
-                },
-                new CommandArgument
-                {
-                    Name = _translationLookup["COMMADS_MAG_ARG_2"],
-                    Required = true
-                }
-            };
-            _logger = logger;
-            _defaultSettings = defaultSettings;
-        }
-
-        public override async Task ExecuteAsync(GameEvent gameEvent)
-        {
-            var match = Regex.Match(gameEvent.Data.Trim(), ArgumentRegexPattern,
-                RegexOptions.Compiled | RegexOptions.IgnoreCase);
-
-            if (!match.Success)
-            {
-                gameEvent.Origin.Tell(Syntax);
-                return;
-            }
-
-            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/PrivateMessageCommand.cs

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

Application/Commands/ReportClientCommand.cs

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

Application/Commands/SayAllCommand.cs

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

Application/Commands/SayCommand.cs

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

Application/Commands/WhoAmICommand.cs

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

Application/Configuration/LoggingConfiguration.json

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

Application/DefaultSettings.json

@@ -1,11 +1,11 @@
 {
   "AutoMessagePeriod": 60,
   "AutoMessages": [
-    "This server uses (Color::Accent)IW4M Admin v{{VERSION}} (Color::White)get it at (Color::Accent)raidmax.org/IW4MAdmin",
-    "(Color::Accent)IW4M Admin (Color::White)sees (Color::Accent)YOU!",
+    "This server uses ^5IW4M Admin v{{VERSION}} ^7get it at ^5raidmax.org/IW4MAdmin",
+    "^5IW4M Admin ^7sees ^5YOU!",
     "{{TOPSTATS}}",
-    "This server has seen a total of (Color::Accent){{TOTALPLAYERS}} (Color::White)players!",
-    "Cheaters are (Color::Red)unwelcome (Color::White)on this server",
+    "This server has seen a total of ^5{{TOTALPLAYERS}} ^7players!",
+    "Cheaters are ^1unwelcome ^7 on this server",
     "Did you know 8/10 people agree with unverified statistics?"
   ],
   "GlobalRules": [
@@ -68,504 +68,6 @@
       }
     }
   ],
-  "Gametypes": [
-    {
-      "Game": "IW4",
-      "Gametypes": [
-        {
-          "Name": "arena",
-          "Alias": "Arena"
-        },
-        {
-          "Name": "ctf",
-          "Alias": "Capture The Flag"
-        },
-        {
-          "Name": "dd",
-          "Alias": "Demolition"
-        },
-        {
-          "Name": "dm",
-          "Alias": "Free For All"
-        },
-        {
-          "Name": "dom",
-          "Alias": "Domination"
-        },
-        {
-          "Name": "gtnw",
-          "Alias": "Global Thermo-Nuclear War"
-        },
-        {
-          "Name": "koth",
-          "Alias": "Headquarters"
-        },
-        {
-          "Name": "oneflag",
-          "Alias": "One-Flag CTF"
-        },
-        {
-          "Name": "sab",
-          "Alias": "Sabotage"
-        },
-        {
-          "Name": "sd",
-          "Alias": "Search & Destroy"
-        },
-        {
-          "Name": "war",
-          "Alias": "Team Deathmatch"
-        }
-      ]
-    },
-    {
-      "Game": "T4",
-      "Gametypes": [
-        {
-          "Name": "ctf",
-          "Alias": "Capture The Flag"
-        },
-        {
-          "Name": "dom",
-          "Alias": "Domination"
-        },
-        {
-          "Name": "dm",
-          "Alias": "Free For All"
-        },
-        {
-          "Name": "koth",
-          "Alias": "Headquarters"
-        },
-        {
-          "Name": "tdm",
-          "Alias": "Team Deathmatch"
-        },
-        {
-          "Name": "sab",
-          "Alias": "Sabotage"
-        },
-        {
-          "Name": "sd",
-          "Alias": "Search & Destroy"
-        },
-        {
-          "Name": "twar",
-          "Alias": "War"
-        }
-      ]
-    },
-    {
-      "Game": "IW5",
-      "Gametypes": [
-        {
-          "Name": "tdm",
-          "Alias": "Team Deathmatch"
-        },
-        {
-          "Name": "dom",
-          "Alias": "Domination"
-        },
-        {
-          "Name": "ctf",
-          "Alias": "Capture The Flag"
-        },
-        {
-          "Name": "dd",
-          "Alias": "Demolition"
-        },
-        {
-          "Name": "dz",
-          "Alias": "Drop Zone"
-        },
-        {
-          "Name": "ffa",
-          "Alias": "Free For All"
-        },
-        {
-          "Name": "gg",
-          "Alias": "Gun Game"
-        },
-        {
-          "Name": "hq",
-          "Alias": "Headquarters"
-        },
-        {
-          "Name": "koth",
-          "Alias": "Headquarters"
-        },
-        {
-          "Name": "inf",
-          "Alias": "Infected"
-        },
-        {
-          "Name": "jug",
-          "Alias": "Juggernaut"
-        },
-        {
-          "Name": "kc",
-          "Alias": "Kill Confirmed"
-        },
-        {
-          "Name": "oic",
-          "Alias": "One In The Chamber"
-        },
-        {
-          "Name": "sab",
-          "Alias": "Sabotage"
-        },
-        {
-          "Name": "sd",
-          "Alias": "Search & Destroy"
-        },
-        {
-          "Name": "tdef",
-          "Alias": "Team Defender"
-        },
-        {
-          "Name": "tj",
-          "Alias": "Team Juggernaut"
-        }
-      ]
-    },
-    {
-      "Game": "T5",
-      "Gametypes": [
-        {
-          "Name": "ctf",
-          "Alias": "Capture The Flag"
-        },
-        {
-          "Name": "dem",
-          "Alias": "Demolition"
-        },
-        {
-          "Name": "dom",
-          "Alias": "Domination"
-        },
-        {
-          "Name": "dm",
-          "Alias": "Free For All"
-        },
-        {
-          "Name": "gun",
-          "Alias": "Gun Game"
-        },
-        {
-          "Name": "hlnd",
-          "Alias": "Sticks & Stones"
-        },
-        {
-          "Name": "koth",
-          "Alias": "Headquarters"
-        },
-        {
-          "Name": "oic",
-          "Alias": "One In The Chamber"
-        },
-        {
-          "Name": "sab",
-          "Alias": "Sabotage"
-        },
-        {
-          "Name": "sd",
-          "Alias": "Search & Destroy"
-        },
-        {
-          "Name": "shrp",
-          "Alias": "Sharpshooter"
-        },
-        {
-          "Name": "tdm",
-          "Alias": "Team Deathmatch"
-        }
-      ]
-    },
-    {
-      "Game": "IW6",
-      "Gametypes": [
-        {
-          "Name": "blitz",
-          "Alias": "Blitz"
-        },
-        {
-          "Name": "conf",
-          "Alias": "Kill Confirmed"
-        },
-        {
-          "Name": "cranked",
-          "Alias": "Cranked"
-        },
-        {
-          "Name": "dm",
-          "Alias": "Free For All"
-        },
-        {
-          "Name": "dom",
-          "Alias": "Domination"
-        },
-        {
-          "Name": "grind",
-          "Alias": "Grind"
-        },
-        {
-          "Name": "grnd",
-          "Alias": "Drop Zone"
-        },
-        {
-          "Name": "gun",
-          "Alias": "Gun Game"
-        },
-        {
-          "Name": "horde",
-          "Alias": "Safeguard"
-        },
-        {
-          "Name": "infect",
-          "Alias": "Infected"
-        },
-        {
-          "Name": "sd",
-          "Alias": "Search & Destroy"
-        },
-        {
-          "Name": "siege",
-          "Alias": "Reinforce"
-        },
-        {
-          "Name": "sotf",
-          "Alias": "Hunted"
-        },
-        {
-          "Name": "sotf_ffa",
-          "Alias": "Hunted FFA"
-        },
-        {
-          "Name": "sr",
-          "Alias": "Search & Rescue"
-        },
-        {
-          "Name": "war",
-          "Alias": "Team Deathmatch"
-        }
-      ]
-    },
-    {
-      "Game": "T6",
-      "Gametypes": [
-        {
-          "Name": "conf",
-          "Alias": "Kill Confirmed"
-        },
-        {
-          "Name": "ctf",
-          "Alias": "Capture The Flag"
-        },
-        {
-          "Name": "dem",
-          "Alias": "Demolition"
-        },
-        {
-          "Name": "dm",
-          "Alias": "Free For All"
-        },
-        {
-          "Name": "dom",
-          "Alias": "Domination"
-        },
-        {
-          "Name": "gun",
-          "Alias": "Gun Game"
-        },
-        {
-          "Name": "hq",
-          "Alias": "Headquarters"
-        },
-        {
-          "Name": "koth",
-          "Alias": "Hardpoint"
-        },
-        {
-          "Name": "oic",
-          "Alias": "One In The Chamber"
-        },
-        {
-          "Name": "oneflag",
-          "Alias": "One-Flag CTF"
-        },
-        {
-          "Name": "sas",
-          "Alias": "Sticks & Stones"
-        },
-        {
-          "Name": "sd",
-          "Alias": "Search & Destroy"
-        },
-        {
-          "Name": "shrp",
-          "Alias": "Sharpshooter"
-        },
-        {
-          "Name": "tdm",
-          "Alias": "Team Deathmatch"
-        }
-      ]
-    },
-    {
-      "Game": "T7",
-      "Gametypes": [
-        {
-          "Name": "ball",
-          "Alias": "Uplink"
-        },
-        {
-          "Name": "clean",
-          "Alias": "Fracture"
-        },
-        {
-          "Name": "conf",
-          "Alias": "Kill Confirmed"
-        },
-        {
-          "Name": "ctf",
-          "Alias": "Capture The Flag"
-        },
-        {
-          "Name": "dom",
-          "Alias": "Domination"
-        },
-        {
-          "Name": "dem",
-          "Alias": "Demolition"
-        },
-        {
-          "Name": "dm",
-          "Alias": "Free For All"
-        },
-        {
-          "Name": "escort",
-          "Alias": "Safeguard"
-        },
-        {
-          "Name": "gun",
-          "Alias": "Gun Game"
-        },
-        {
-          "Name": "koth",
-          "Alias": "Hardpoint"
-        },
-        {
-          "Name": "sd",
-          "Alias": "Search & Destroy"
-        },
-        {
-          "Name": "tdm",
-          "Alias": "Team Deathmatch"
-        },
-        {
-          "Name": "hc_ball",
-          "Alias": "Hardcore Uplink"
-        },
-        {
-          "Name": "hc_clean",
-          "Alias": "Hardcore Fracture"
-        },
-        {
-          "Name": "hc_conf",
-          "Alias": "Hardcore Kill Confirmed"
-        },
-        {
-          "Name": "hc_ctf",
-          "Alias": "Hardcore Capture The Flag"
-        },
-        {
-          "Name": "hc_dom",
-          "Alias": "Hardcore Domination"
-        },
-        {
-          "Name": "hc_dem",
-          "Alias": "Hardcore Demolition"
-        },
-        {
-          "Name": "hc_dm",
-          "Alias": "Hardcore Free For All"
-        },
-        {
-          "Name": "hc_escort",
-          "Alias": "Hardcore Safeguard"
-        },
-        {
-          "Name": "hc_gun",
-          "Alias": "Hardcore Gun Game"
-        },
-        {
-          "Name": "hc_koth",
-          "Alias": "Hardcore Hardpoint"
-        },
-        {
-          "Name": "hc_sd",
-          "Alias": "Hardcore Search & Destroy"
-        },
-        {
-          "Name": "hc_tdm",
-          "Alias": "Hardcore Team Deathmatch"
-        }
-      ]
-    },
-    {
-      "Game": "SHG1",
-      "Gametypes": [
-        {
-          "Name": "ball",
-          "Alias": "Uplink"
-        },
-        {
-          "Name": "conf",
-          "Alias": "Kill Confirmed"
-        },
-        {
-          "Name": "ctf",
-          "Alias": "Capture The Flag"
-        },
-        {
-          "Name": "dom",
-          "Alias": "Domination"
-        },
-        {
-          "Name": "dm",
-          "Alias": "Free For All"
-        },
-        {
-          "Name": "gun",
-          "Alias": "Gun Game"
-        },
-        {
-          "Name": "hp",
-          "Alias": "Hardpoint"
-        },
-        {
-          "Name": "infect",
-          "Alias": "Infected"
-        },
-        {
-          "Name": "sd",
-          "Alias": "Search & Destroy"
-        },
-        {
-          "Name": "sr",
-          "Alias": "Search & Rescue"
-        },
-        {
-          "Name": "war",
-          "Alias": "Team Deathmatch"
-        },
-        {
-          "Name": "twar",
-          "Alias": "Momentum"
-        }
-      ]
-    }
-  ],
   "Maps": [
     {
       "Game": "IW3",
@@ -1201,18 +703,6 @@
         {
           "Alias": "Highrise",
           "Name": "mp_highrise"
-        },
-        {
-          "Alias": "Favela",
-          "Name": "mp_favela"
-        },
-        {
-          "Alias": "Nuketown",
-          "Name": "mp_nuked"
-        },
-        {
-          "Alias": "Skidrow",
-          "Name": "mp_nightshift"
         }
       ]
     },
@@ -2027,62 +1517,62 @@
       "winchester1200": "W1200",
       "concussion": "Stun",
       "melee": "Knife",
-      "Frag": "Grenade",
+      "Frag" : "Grenade",
       "airstrike": "Airstrike",
       "helicopter": "Attack Helicopter",
       "player": "",
       "attach": ""
     },
-    "T4": {
-      "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,32});(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0)?;(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,32})?;((?:[0-9]+|[a-z]+|_|\+)+);([0-9]+);((?:[A-Z]|_)+);((?:[a-z]|_)+)$";
+            Configuration.Damage.Pattern = @"^(D);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,24});(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0)?;(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,24})?;((?:[0-9]+|[a-z]+|_|\+)+);([0-9]+);((?:[A-Z]|_)+);((?:[a-z]|_)+)$";
             Configuration.Damage.AddMapping(ParserRegex.GroupType.EventType, 1);
             Configuration.Damage.AddMapping(ParserRegex.GroupType.TargetNetworkId, 2);
             Configuration.Damage.AddMapping(ParserRegex.GroupType.TargetClientNumber, 3);
@@ -65,7 +65,7 @@ namespace IW4MAdmin.Application.EventParsers
             Configuration.Damage.AddMapping(ParserRegex.GroupType.MeansOfDeath, 12);
             Configuration.Damage.AddMapping(ParserRegex.GroupType.HitLocation, 13);
 
-            Configuration.Kill.Pattern = @"^(K);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,32});(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0)?;(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,32})?;((?:[0-9]+|[a-z]+|_|\+)+);([0-9]+);((?:[A-Z]|_)+);((?:[a-z]|_)+)$";
+            Configuration.Kill.Pattern = @"^(K);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,24});(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0)?;(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,24})?;((?:[0-9]+|[a-z]+|_|\+)+);([0-9]+);((?:[A-Z]|_)+);((?:[a-z]|_)+)$";
             Configuration.Kill.AddMapping(ParserRegex.GroupType.EventType, 1);
             Configuration.Kill.AddMapping(ParserRegex.GroupType.TargetNetworkId, 2);
             Configuration.Kill.AddMapping(ParserRegex.GroupType.TargetClientNumber, 3);

Application/Extensions/CommandExtensions.cs

@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using IW4MAdmin.Application.Misc;
+using IW4MAdmin.Application.Misc;
 using SharedLibraryCore.Interfaces;
 using System.Linq;
-using SharedLibraryCore;
-using SharedLibraryCore.Configuration;
 
 namespace IW4MAdmin.Application.Extensions
 {
@@ -17,19 +13,9 @@ namespace IW4MAdmin.Application.Extensions
         /// <returns></returns>
         public static string CommandConfigNameForType(this IManagerCommand command)
         {
-            return command.GetType() == typeof(ScriptCommand)
-                ? $"{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,10 +78,8 @@ namespace IW4MAdmin.Application.Extensions
                 case "mysql":
                     var appendTimeout = !appConfig.ConnectionString.Contains("default command timeout",
                         StringComparison.InvariantCultureIgnoreCase);
-                    var connectionString =
-                        appConfig.ConnectionString + (appendTimeout ? ";default command timeout=0" : "");
                     services.AddSingleton(sp => (DbContextOptions) new DbContextOptionsBuilder<MySqlDatabaseContext>()
-                        .UseMySql(connectionString, ServerVersion.AutoDetect(connectionString),
+                        .UseMySql(appConfig.ConnectionString + (appendTimeout ? ";default command timeout=0" : ""),
                             mysqlOptions => mysqlOptions.EnableRetryOnFailure())
                         .UseLoggerFactory(sp.GetRequiredService<ILoggerFactory>()).Options);
                     return services;
@@ -94,7 +92,7 @@ namespace IW4MAdmin.Application.Extensions
                                 postgresqlOptions =>
                                 {
                                     postgresqlOptions.EnableRetryOnFailure();
-                                    postgresqlOptions.SetPostgresVersion(new Version("12.9"));
+                                    postgresqlOptions.SetPostgresVersion(new Version("9.4"));
                                 })
                             .UseLoggerFactory(sp.GetRequiredService<ILoggerFactory>()).Options);
                     return services;
@@ -103,4 +101,4 @@ namespace IW4MAdmin.Application.Extensions
             }
         }
     }
-}
+}

Application/Factories/ConfigurationHandlerFactory.cs

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

Application/IW4MServer.cs

@@ -12,7 +12,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
-using System.Net.Sockets;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -24,7 +23,6 @@ using Serilog.Context;
 using static SharedLibraryCore.Database.Models.EFClient;
 using Data.Models;
 using Data.Models.Server;
-using IW4MAdmin.Application.Commands;
 using Microsoft.EntityFrameworkCore;
 using static Data.Models.Client.EFClient;
 
@@ -53,13 +51,11 @@ namespace IW4MAdmin
             IServiceProvider serviceProvider,
             IClientNoticeMessageFormatter messageFormatter,
             ILookupCache<EFServer> serverCache) : base(serviceProvider.GetRequiredService<ILogger<Server>>(), 
-#pragma warning disable CS0612
             serviceProvider.GetRequiredService<SharedLibraryCore.Interfaces.ILogger>(), 
-#pragma warning restore CS0612
             serverConfiguration,
             serviceProvider.GetRequiredService<IManager>(), 
             serviceProvider.GetRequiredService<IRConConnectionFactory>(),
-            serviceProvider.GetRequiredService<IGameLogReaderFactory>(), serviceProvider)
+            serviceProvider.GetRequiredService<IGameLogReaderFactory>())
         {
             _translationLookup = lookup;
             _metaService = metaService;
@@ -246,11 +242,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"].FormatExt(plugin.Name, ex.GetType().Name));
+                Console.WriteLine(loc["SERVER_PLUGIN_ERROR"]);
                 ServerLogger.LogError(ex, "Could not execute {methodName} for plugin {plugin}", 
                     nameof(plugin.OnEventAsync), plugin.Name);
             }
@@ -355,7 +351,7 @@ namespace IW4MAdmin
                         try
                         {
                             var factory = _serviceProvider.GetRequiredService<IDatabaseContextFactory>();
-                            await using var context = factory.CreateContext(enableTracking: false);
+                            await using var context = factory.CreateContext();
 
                             var messageCount = await context.InboxMessages
                                 .CountAsync(msg => msg.DestinationClientId == E.Origin.ClientId && !msg.IsDelivered);
@@ -437,7 +433,7 @@ namespace IW4MAdmin
 
                         if (E.Origin.Level > Permission.Moderator)
                         {
-                            E.Origin.Tell(loc["SERVER_REPORT_COUNT_V2"].FormatExt(E.Owner.Reports.Count));
+                            E.Origin.Tell(string.Format(loc["SERVER_REPORT_COUNT"], E.Owner.Reports.Count));
                         }
                     }
 
@@ -1076,26 +1072,19 @@ namespace IW4MAdmin
         {
             try
             {
-                ResolvedIpEndPoint =
-                    new IPEndPoint(
-                        (await Dns.GetHostAddressesAsync(IP)).First(address =>
-                            address.AddressFamily == AddressFamily.InterNetwork), Port);
+                ResolvedIpEndPoint = new IPEndPoint((await Dns.GetHostAddressesAsync(IP)).First(), 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 ||
-                    parser.Name == ServerConfig.RConParserVersion);
+                .FirstOrDefault(_parser => _parser.Version == ServerConfig.RConParserVersion);
 
             EventParser = Manager.AdditionalEventParsers
-                .FirstOrDefault(parser =>
-                    parser.Version == ServerConfig.EventParserVersion ||
-                    parser.Name == ServerConfig.RConParserVersion);
+                .FirstOrDefault(_parser => _parser.Version == ServerConfig.EventParserVersion);
 
             RconParser ??= Manager.AdditionalRConParsers[0];
             EventParser ??= Manager.AdditionalEventParsers[0];
@@ -1112,7 +1101,7 @@ namespace IW4MAdmin
                 GameName = RconParser.GameName;
             }
 
-            if (version.Value?.Length != 0)
+            if (version?.Value?.Length != 0)
             {
                 var matchedRconParser = Manager.AdditionalRConParsers.FirstOrDefault(_parser => _parser.Version == version.Value);
                 RconParser.Configuration = matchedRconParser != null ? matchedRconParser.Configuration : RconParser.Configuration;
@@ -1355,7 +1344,7 @@ namespace IW4MAdmin
                     return;
                 }
 
-                var message = loc["COMMANDS_WARNING_FORMAT_V2"]
+                var message = loc["COMMANDS_WARNING_FORMAT"]
                     .FormatExt(activeClient.Warnings, activeClient.Name, reason);
                 activeClient.CurrentServer.Broadcast(message);
             }
@@ -1483,7 +1472,7 @@ namespace IW4MAdmin
             Manager.GetMessageTokens().Add(new MessageToken("TOTALPLAYERS", (Server s) => Task.Run(async () => (await Manager.GetClientService().GetTotalClientsAsync()).ToString())));
             Manager.GetMessageTokens().Add(new MessageToken("VERSION", (Server s) => Task.FromResult(Application.Program.Version.ToString())));
             Manager.GetMessageTokens().Add(new MessageToken("NEXTMAP", (Server s) => SharedLibraryCore.Commands.NextMapCommand.GetNextMap(s, _translationLookup)));
-            Manager.GetMessageTokens().Add(new MessageToken("ADMINS", (Server s) => Task.FromResult(ListAdminsCommand.OnlineAdmins(s, _translationLookup))));
+            Manager.GetMessageTokens().Add(new MessageToken("ADMINS", (Server s) => Task.FromResult(SharedLibraryCore.Commands.ListAdminsCommand.OnlineAdmins(s, _translationLookup))));
         }
     }
 }

Application/Main.cs

@@ -34,17 +34,16 @@ using IW4MAdmin.Plugins.Stats.Client.Abstractions;
 using IW4MAdmin.Plugins.Stats.Client;
 using Stats.Client.Abstractions;
 using Stats.Client;
-using Stats.Config;
 using Stats.Helpers;
 
 namespace IW4MAdmin.Application
 {
     public class Program
     {
-        public static BuildNumber Version { get; } = BuildNumber.Parse(Utilities.GetVersionAsString());
-        private static ApplicationManager _serverManager;
-        private static Task _applicationTask;
-        private static ServiceProvider _serviceProvider;
+        public static BuildNumber Version { get; private set; } = BuildNumber.Parse(Utilities.GetVersionAsString());
+        public static ApplicationManager ServerManager;
+        private static Task ApplicationTask;
+        private static ServiceProvider serviceProvider;
 
         /// <summary>
         /// entrypoint of the application
@@ -57,7 +56,7 @@ namespace IW4MAdmin.Application
             Console.OutputEncoding = Encoding.UTF8;
             Console.ForegroundColor = ConsoleColor.Gray;
 
-            Console.CancelKeyPress += OnCancelKey;
+            Console.CancelKeyPress += new ConsoleCancelEventHandler(OnCancelKey);
 
             Console.WriteLine("=====================================================");
             Console.WriteLine(" IW4MAdmin");
@@ -76,10 +75,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;
             }
         }
 
@@ -93,8 +92,9 @@ namespace IW4MAdmin.Application
             ITranslationLookup translationLookup = null;
             var logger = BuildDefaultLogger<Program>(new ApplicationConfiguration());
             Utilities.DefaultLogger = logger;
-            logger.LogInformation("Begin IW4MAdmin startup. Version is {Version} {@Args}", Version, args);
-            
+            IServiceCollection services = null;
+            logger.LogInformation("Begin IW4MAdmin startup. Version is {version} {@args}", Version, args);
+
             try
             {
                 // do any needed housekeeping file/folder migrations
@@ -102,29 +102,22 @@ namespace IW4MAdmin.Application
                 ConfigurationMigration.CheckDirectories();
                 ConfigurationMigration.RemoveObsoletePlugins20210322();
                 logger.LogDebug("Configuring services...");
-                var services = await ConfigureServices(args);
-                _serviceProvider = services.BuildServiceProvider();
-                var versionChecker = _serviceProvider.GetRequiredService<IMasterCommunication>();
-                _serverManager = (ApplicationManager) _serviceProvider.GetRequiredService<IManager>();
-                translationLookup = _serviceProvider.GetRequiredService<ITranslationLookup>();
+                services = ConfigureServices(args);
+                serviceProvider = services.BuildServiceProvider();
+                var versionChecker = serviceProvider.GetRequiredService<IMasterCommunication>();
+                ServerManager = (ApplicationManager) serviceProvider.GetRequiredService<IManager>();
+                translationLookup = serviceProvider.GetRequiredService<ITranslationLookup>();
 
-                _applicationTask = RunApplicationTasksAsync(logger, services);
-                var tasks = new[]
-                {
-                    versionChecker.CheckVersion(),
-                    _serverManager.Init(),
-                    _applicationTask
-                };
-
-                await Task.WhenAll(tasks);
+                await versionChecker.CheckVersion();
+                await ServerManager.Init();
             }
 
             catch (Exception e)
             {
-                var failMessage = translationLookup == null
+                string failMessage = translationLookup == null
                     ? "Failed to initialize IW4MAdmin"
                     : translationLookup["MANAGER_INIT_FAIL"];
-                var exitMessage = translationLookup == null
+                string exitMessage = translationLookup == null
                     ? "Press enter to exit..."
                     : translationLookup["MANAGER_EXIT"];
 
@@ -144,7 +137,7 @@ namespace IW4MAdmin.Application
                             .FormatExt(configException.ConfigurationFileName));
                     }
 
-                    foreach (var error in configException.Errors)
+                    foreach (string error in configException.Errors)
                     {
                         Console.WriteLine(error);
                     }
@@ -160,12 +153,27 @@ namespace IW4MAdmin.Application
                 return;
             }
 
-            if (_serverManager.IsRestartRequested)
+            try
+            {
+                ApplicationTask = RunApplicationTasksAsync(logger, services);
+                await ApplicationTask;
+            }
+
+            catch (Exception e)
+            {
+                logger.LogCritical(e, "Failed to launch IW4MAdmin");
+                string failMessage = translationLookup == null
+                    ? "Failed to launch IW4MAdmin"
+                    : translationLookup["MANAGER_INIT_FAIL"];
+                Console.WriteLine($"{failMessage}: {e.GetExceptionInfo()}");
+            }
+
+            if (ServerManager.IsRestartRequested)
             {
                 goto restart;
             }
 
-            await _serviceProvider.DisposeAsync();
+            serviceProvider.Dispose();
         }
 
         /// <summary>
@@ -174,26 +182,24 @@ 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>();
+            var collectionService = serviceProvider.GetRequiredService<IServerDataCollector>();
 
             // we want to run this one on a manual thread instead of letting the thread pool handle it,
             // because we can't exit early from waiting on console input, and it prevents us from restarting
-            async void ReadInput() => await ReadConsoleInput(logger);
-
-            var inputThread = new Thread(ReadInput);
+            var inputThread = new Thread(async () => await ReadConsoleInput(logger));
             inputThread.Start();
 
             var tasks = new[]
             {
+                ServerManager.Start(),
                 webfrontTask,
-                _serverManager.Start(),
-                _serviceProvider.GetRequiredService<IMasterCommunication>()
-                    .RunUploadStatus(_serverManager.CancellationToken),
-                collectionService.BeginCollectionAsync(cancellationToken: _serverManager.CancellationToken)
+                serviceProvider.GetRequiredService<IMasterCommunication>()
+                    .RunUploadStatus(ServerManager.CancellationToken),
+                collectionService.BeginCollectionAsync(cancellationToken: ServerManager.CancellationToken)
             };
 
             logger.LogDebug("Starting webfront and input tasks");
@@ -202,7 +208,8 @@ namespace IW4MAdmin.Application
             logger.LogInformation("Shutdown completed successfully");
             Console.WriteLine(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_SHUTDOWN_SUCCESS"]);
         }
-        
+
+
         /// <summary>
         /// reads input from the console and executes entered commands on the default server
         /// </summary>
@@ -215,41 +222,32 @@ namespace IW4MAdmin.Application
                 return;
             }
 
-            EFClient origin = null;
+            string lastCommand;
+            var Origin = Utilities.IW4MAdminClient(ServerManager.Servers[0]);
 
             try
             {
-                while (!_serverManager.CancellationToken.IsCancellationRequested)
+                while (!ServerManager.CancellationToken.IsCancellationRequested)
                 {
-                    if (!_serverManager.IsInitialized)
+                    lastCommand = await Console.In.ReadLineAsync();
+
+                    if (lastCommand?.Length > 0)
                     {
-                        await Task.Delay(1000);
-                        continue;
+                        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('>');
+                        }
                     }
-                    
-                    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)
@@ -278,9 +276,9 @@ namespace IW4MAdmin.Application
             // register the native commands
             foreach (var commandType in typeof(SharedLibraryCore.Commands.QuitCommand).Assembly.GetTypes()
                 .Concat(typeof(Program).Assembly.GetTypes().Where(type => type.Namespace == "IW4MAdmin.Application.Commands"))
-                .Where(command => command.BaseType == typeof(Command)))
+                .Where(_command => _command.BaseType == typeof(Command)))
             {
-                defaultLogger.LogDebug("Registered native command type {Name}", commandType.Name);
+                defaultLogger.LogDebug("Registered native command type {name}", commandType.Name);
                 serviceCollection.AddSingleton(typeof(IManagerCommand), commandType);
             }
 
@@ -288,23 +286,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, configInstance.Name());
+                var handlerInstance = Activator.CreateInstance(handlerType, new[] {configInstance.Name()});
                 var genericInterfaceType = typeof(IConfigurationHandler<>).MakeGenericType(configurationType);
                 
                 serviceCollection.AddSingleton(genericInterfaceType, handlerInstance);
@@ -318,10 +316,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);
@@ -334,21 +332,12 @@ namespace IW4MAdmin.Application
         /// <summary>
         /// Configures the dependency injection services
         /// </summary>
-        private static async Task<IServiceCollection> ConfigureServices(string[] args)
+        private static IServiceCollection ConfigureServices(string[] args)
         {
-            // todo: this is a quick fix
-            AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
-
             // setup the static resources (config/master api/translations)
             var serviceCollection = new ServiceCollection();
             var appConfigHandler = new BaseConfigurationHandler<ApplicationConfiguration>("IW4MAdminSettings");
-            await appConfigHandler.BuildAsync();
             var defaultConfigHandler = new BaseConfigurationHandler<DefaultSettings>("DefaultSettings");
-            await defaultConfigHandler.BuildAsync();
-            var commandConfigHandler = new BaseConfigurationHandler<CommandConfiguration>("CommandConfiguration");
-            await commandConfigHandler.BuildAsync();
-            var statsCommandHandler = new BaseConfigurationHandler<StatsConfiguration>();
-            await statsCommandHandler.BuildAsync();
             var defaultConfig = defaultConfigHandler.Configuration();
             var appConfig = appConfigHandler.Configuration();
             var masterUri = Utilities.IsDevelopment
@@ -366,7 +355,7 @@ namespace IW4MAdmin.Application
             {
                 appConfig = (ApplicationConfiguration) new ApplicationConfiguration().Generate();
                 appConfigHandler.Set(appConfig);
-                await appConfigHandler.Save();
+                appConfigHandler.Save();
             }
 
             // register override level names
@@ -384,14 +373,15 @@ namespace IW4MAdmin.Application
             serviceCollection
                 .AddBaseLogger(appConfig)
                 .AddSingleton(defaultConfig)
-                .AddSingleton<IServiceCollection>(serviceCollection)
+                .AddSingleton<IServiceCollection>(_serviceProvider => serviceCollection)
                 .AddSingleton<IConfigurationHandler<DefaultSettings>, BaseConfigurationHandler<DefaultSettings>>()
                 .AddSingleton((IConfigurationHandler<ApplicationConfiguration>) appConfigHandler)
-                .AddSingleton<IConfigurationHandler<CommandConfiguration>>(commandConfigHandler)
+                .AddSingleton(
+                    new BaseConfigurationHandler<CommandConfiguration>("CommandConfiguration") as
+                        IConfigurationHandler<CommandConfiguration>)
                 .AddSingleton(appConfig)
-                .AddSingleton(statsCommandHandler.Configuration() ?? new StatsConfiguration())
-                .AddSingleton(serviceProvider =>
-                    serviceProvider.GetRequiredService<IConfigurationHandler<CommandConfiguration>>()
+                .AddSingleton(_serviceProvider =>
+                    _serviceProvider.GetRequiredService<IConfigurationHandler<CommandConfiguration>>()
                         .Configuration() ?? new CommandConfiguration())
                 .AddSingleton<IPluginImporter, PluginImporter>()
                 .AddSingleton<IMiddlewareActionHandler, MiddlewareActionHandler>()
@@ -422,9 +412,7 @@ namespace IW4MAdmin.Application
                 .AddSingleton<IRemoteAssemblyHandler, RemoteAssemblyHandler>()
                 .AddSingleton<IMasterCommunication, MasterCommunication>()
                 .AddSingleton<IManager, ApplicationManager>()
-#pragma warning disable CS0612
                 .AddSingleton<SharedLibraryCore.Interfaces.ILogger, Logger>()
-#pragma warning restore CS0612
                 .AddSingleton<IClientNoticeMessageFormatter, ClientNoticeMessageFormatter>()
                 .AddSingleton<IClientStatisticCalculator, HitCalculator>()
                 .AddSingleton<IServerDistributionCalculator, ServerDistributionCalculator>()
@@ -461,4 +449,4 @@ namespace IW4MAdmin.Application
             return collection.GetRequiredService<ILogger<T>>();
         }
     }
-}
+}

Application/Misc/BaseConfigurationHandler.cs

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

Application/Misc/MasterCommunication.cs

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

Application/Misc/MetaService.cs

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

Application/Misc/PluginImporter.cs

@@ -83,47 +83,19 @@ namespace IW4MAdmin.Application.Misc
                         .GroupBy(_assembly => _assembly.FullName).Select(_assembly => _assembly.OrderByDescending(_assembly => _assembly.GetName().Version).First());
 
                     pluginTypes = assemblies
-                        .SelectMany(_asm =>
-                        {
-                            try
-                            {
-                                return _asm.GetTypes();
-                            }
-                            catch
-                            {
-                                return Enumerable.Empty<Type>();
-                            }
-                        })
+                        .SelectMany(_asm => _asm.GetTypes())
                         .Where(_assemblyType => _assemblyType.GetInterface(nameof(IPlugin), false) != null);
 
                     _logger.LogDebug("Discovered {count} plugin implementations", pluginTypes.Count());
 
                     commandTypes = assemblies
-                        .SelectMany(_asm =>{
-                            try
-                            {
-                                return _asm.GetTypes();
-                            }
-                            catch
-                            {
-                                return Enumerable.Empty<Type>();
-                            }
-                        })
+                        .SelectMany(_asm => _asm.GetTypes())
                         .Where(_assemblyType => _assemblyType.IsClass && _assemblyType.BaseType == typeof(Command));
 
                     _logger.LogDebug("Discovered {count} plugin commands", commandTypes.Count());
 
                     configurationTypes = assemblies
-                        .SelectMany(asm => {
-                            try
-                            {
-                                return asm.GetTypes();
-                            }
-                            catch
-                            {
-                                return Enumerable.Empty<Type>();
-                            }
-                        })
+                        .SelectMany(asm => asm.GetTypes())
                         .Where(asmType =>
                             asmType.IsClass && asmType.GetInterface(nameof(IBaseConfiguration), false) != null);
 

Application/Misc/ScriptPlugin.cs

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

Application/Misc/ScriptPluginConfigurationWrapper.cs

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

Application/Misc/ServerDataViewer.cs

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

Application/Misc/TokenAuthentication.cs

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

Application/RConParsers/DynamicRConParserConfiguration.cs

@@ -3,7 +3,6 @@ using SharedLibraryCore.Interfaces;
 using SharedLibraryCore.RCon;
 using System.Collections.Generic;
 using System.Globalization;
-using SharedLibraryCore.Formatting;
 
 namespace IW4MAdmin.Application.RConParsers
 {
@@ -29,24 +28,6 @@ namespace IW4MAdmin.Application.RConParsers
         public int NoticeMaximumLines { get; set; } = 8;
         public int NoticeMaxCharactersPerLine { get; set; } = 50;
         public string NoticeLineSeparator { get; set; } = Environment.NewLine;
-        public int? DefaultRConPort { get; set; }
-        public string DefaultInstallationDirectoryHint { get; set; }
-
-        public 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)
         {
@@ -59,4 +40,4 @@ namespace IW4MAdmin.Application.RConParsers
             MaxPlayersStatus = parserRegexFactory.CreateParserRegex();
         }
     }
-}
+}

Data/Abstractions/IDataValueCache.cs

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

@@ -118,7 +118,7 @@ namespace Data.Context
                 ent.HasIndex(a => a.Name);
                 ent.Property(_alias => _alias.SearchableName).HasMaxLength(24);
                 ent.HasIndex(_alias => _alias.SearchableName);
-                ent.HasIndex(_alias => new {_alias.Name, _alias.IPAddress});
+                ent.HasIndex(_alias => new {_alias.Name, _alias.IPAddress}).IsUnique();
             });
 
             modelBuilder.Entity<EFMeta>(ent =>
@@ -145,4 +145,4 @@ namespace Data.Context
             base.OnModelCreating(modelBuilder);
         }
     }
-}
+}

Data/Data.csproj

@@ -1,27 +1,30 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Configurations>Debug;Release;Prerelease</Configurations>
     <Platforms>AnyCPU</Platforms>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageId>RaidMax.IW4MAdmin.Data</PackageId>
     <Title>RaidMax.IW4MAdmin.Data</Title>
     <Authors />
-    <PackageVersion>1.2.0</PackageVersion>
+    <PackageVersion>1.0.7</PackageVersion>
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.1">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.10">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles</IncludeAssets>
     </PackageReference>
-    <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" />
+    <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" />
   </ItemGroup>
   
 </Project>

Data/Helpers/DataValueCache.cs

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

Data/Helpers/LookupCache.cs

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

Data/MigrationContext/MySqlDatabaseContext.cs

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

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

Data/Migrations/MySql/20220102221729_RemoveUniqueAliasIndexConstraint.cs

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

Data/Migrations/MySql/MySqlDatabaseContextModelSnapshot.cs

@@ -816,7 +816,8 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("SearchableName");
 
-                    b.HasIndex("Name", "IPAddress");
+                    b.HasIndex("Name", "IPAddress")
+                        .IsUnique();
 
                     b.ToTable("EFAlias");
                 });

Data/Migrations/Postgresql/20220102221801_RemoveUniqueAliasIndexConstraint.cs

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

Data/Migrations/Postgresql/PostgresqlDatabaseContextModelSnapshot.cs

@@ -836,7 +836,8 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("SearchableName");
 
-                    b.HasIndex("Name", "IPAddress");
+                    b.HasIndex("Name", "IPAddress")
+                        .IsUnique();
 
                     b.ToTable("EFAlias");
                 });

Data/Migrations/Sqlite/20220102214442_RemoveUniqueAliasIndexConstraint.cs

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

Data/Migrations/Sqlite/SqliteDatabaseContextModelSnapshot.cs

@@ -815,7 +815,8 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("SearchableName");
 
-                    b.HasIndex("Name", "IPAddress");
+                    b.HasIndex("Name", "IPAddress")
+                        .IsUnique();
 
                     b.ToTable("EFAlias");
                 });

Data/Models/Client/Stats/EFClientStatistics.cs

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

Data/Models/Vector3.cs

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

DeploymentFiles/UpdateIW4MAdmin.ps1

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

DeploymentFiles/UpdateIW4MAdmin.sh

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

DeploymentFiles/deployment-pipeline.yml

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

GameFiles/IW4x/userraw/scripts/_customcallbacks.gsc

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

IW4MAdmin.sln

@@ -12,8 +12,6 @@ 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}"
@@ -51,7 +49,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ScriptPlugins", "ScriptPlug
 		Plugins\ScriptPlugins\ParserS1x.js = Plugins\ScriptPlugins\ParserS1x.js
 		Plugins\ScriptPlugins\ParserCSGO.js = Plugins\ScriptPlugins\ParserCSGO.js
 		Plugins\ScriptPlugins\ParserCSGOSM.js = Plugins\ScriptPlugins\ParserCSGOSM.js
-		Plugins\ScriptPlugins\ParserPlutoniumT4COZM.js = Plugins\ScriptPlugins\ParserPlutoniumT4COZM.js
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomessageFeed", "Plugins\AutomessageFeed\AutomessageFeed.csproj", "{F5815359-CFC7-44B4-9A3B-C04BACAD5836}"
@@ -60,6 +57,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LiveRadar", "Plugins\LiveRa
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{3065279E-17F0-4CE0-AF5B-014E04263D77}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationTests", "Tests\ApplicationTests\ApplicationTests.csproj", "{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data", "Data\Data.csproj", "{81689023-E55E-48ED-B7A8-53F4E21BBF2D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Integrations", "Integrations", "{A2AE33B4-0830-426A-9E11-951DAB12BE5B}"
@@ -324,6 +323,29 @@ Global
 		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Release|x64.Build.0 = Release|Any CPU
 		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Release|x86.ActiveCfg = Release|Any CPU
 		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Release|x86.Build.0 = Release|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Debug|x64.Build.0 = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Debug|x86.Build.0 = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Prerelease|Any CPU.ActiveCfg = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Prerelease|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Prerelease|Mixed Platforms.Build.0 = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Prerelease|x64.ActiveCfg = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Prerelease|x64.Build.0 = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Prerelease|x86.ActiveCfg = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Prerelease|x86.Build.0 = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Release|x64.ActiveCfg = Release|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Release|x64.Build.0 = Release|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Release|x86.ActiveCfg = Release|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Release|x86.Build.0 = Release|Any CPU
 		{81689023-E55E-48ED-B7A8-53F4E21BBF2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{81689023-E55E-48ED-B7A8-53F4E21BBF2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{81689023-E55E-48ED-B7A8-53F4E21BBF2D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -409,6 +431,7 @@ Global
 		{3F9ACC27-26DB-49FA-BCD2-50C54A49C9FA} = {26E8B310-269E-46D4-A612-24601F16065F}
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836} = {26E8B310-269E-46D4-A612-24601F16065F}
 		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD} = {26E8B310-269E-46D4-A612-24601F16065F}
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B} = {3065279E-17F0-4CE0-AF5B-014E04263D77}
 		{A9348433-58C1-4B9C-8BB7-088B02529D9D} = {A2AE33B4-0830-426A-9E11-951DAB12BE5B}
 		{9512295B-3045-40E0-9B7E-2409F2173E9D} = {A2AE33B4-0830-426A-9E11-951DAB12BE5B}
 	EndGlobalSection

Integrations/Cod/Integrations.Cod.csproj

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

Integrations/Source/Integrations.Source.csproj

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

Integrations/Source/SourceRConConnection.cs

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

Plugins/AutomessageFeed/AutomessageFeed.csproj

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

Plugins/AutomessageFeed/Plugin.cs

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

Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj

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

Plugins/LiveRadar/Controllers/RadarController.cs

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

Plugins/LiveRadar/LiveRadar.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <RazorCompileOnBuild Condition="'$(CONFIG)'!='Debug'">true</RazorCompileOnBuild>
     <RazorCompiledOnPublish Condition="'$(CONFIG)'!='Debug'">true</RazorCompiledOnPublish>
     <PreserveCompilationContext Condition="'$(CONFIG)'!='Debug'">false</PreserveCompilationContext>
@@ -9,7 +9,7 @@
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <Version>0.1.0.0</Version>
     <Configurations>Debug;Release;Prerelease</Configurations>
-    <LangVersion>Latest</LangVersion>
+    <LangVersion>7.1</LangVersion>
     <ApplicationIcon />
     <OutputType>Library</OutputType>
     <StartupObject />
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.28.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2021.8.31.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/LiveRadar/Plugin.cs

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

Plugins/LiveRadar/RadarEvent.cs

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

Plugins/LiveRadar/Views/Radar/Index.cshtml

@@ -17,7 +17,7 @@
             @foreach (SharedLibraryCore.Dtos.ServerInfo server in ViewBag.Servers)
             {
                 <li class="nav-item">
-                    <a asp-controller="Radar" asp-action="Index" asp-route-serverId="@server.ID" class="nav-link @(server.ID == ViewBag.ActiveServerId ? "active": "")" aria-selected="@(server.ID == ViewBag.ActiveServerId ? "true": "false")"><color-code value="@server.Name"></color-code></a>
+                    <a asp-controller="Radar" asp-action="Index" asp-route-serverId="@server.ID" class="nav-link @(server.ID == ViewBag.ActiveServerId ? "active": "")" aria-selected="@(server.ID == ViewBag.ActiveServerId ? "true": "false")"><color-code value="@server.Name" allow="@ViewBag.EnableColorCodes"></color-code></a>
                 </li>
             }
         </ul>
@@ -467,4 +467,4 @@
         })
 
     </script>
-}
+}

Plugins/Login/Login.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
@@ -11,7 +11,7 @@
     <Company>Forever None</Company>
     <Product>Login Plugin for IW4MAdmin</Product>
     <Configurations>Debug;Release;Prerelease</Configurations>
-    <LangVersion>Latest</LangVersion>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.28.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2021.8.31.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/Login/Plugin.cs

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

Plugins/ProfanityDeterment/Plugin.cs

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

Plugins/ProfanityDeterment/ProfanityDeterment.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
     <PackageId>RaidMax.IW4MAdmin.Plugins.ProfanityDeterment</PackageId>
@@ -12,11 +12,11 @@
     <Description>Warns and kicks players for using profanity</Description>
     <Copyright>2018</Copyright>
     <Configurations>Debug;Release;Prerelease</Configurations>
-    <LangVersion>Latest</LangVersion>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.28.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2021.8.31.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/ScriptPlugins/ParserCSGO.js

@@ -3,7 +3,7 @@ let eventParser;
 
 const plugin = {
     author: 'RaidMax',
-    version: 0.4,
+    version: 0.3,
     name: 'CS:GO Parser',
     engine: 'Source',
     isParser: true,
@@ -57,27 +57,7 @@ const plugin = {
         rconParser.Configuration.OverrideDvarNameMapping.Add('fs_game', 'game_mode');
         rconParser.Configuration.OverrideDvarNameMapping.Add('g_password', 'sv_password');
 
-        rconParser.Configuration.ColorCodeMapping.Clear();
-        rconParser.Configuration.ColorCodeMapping.Add('White', '\x01');
-        rconParser.Configuration.ColorCodeMapping.Add('Red', '\x07');
-        rconParser.Configuration.ColorCodeMapping.Add('LightRed', '\x0F');
-        rconParser.Configuration.ColorCodeMapping.Add('DarkRed', '\x02');
-        rconParser.Configuration.ColorCodeMapping.Add('Blue', '\x0B');
-        rconParser.Configuration.ColorCodeMapping.Add('DarkBlue', '\x0C');
-        rconParser.Configuration.ColorCodeMapping.Add('Purple', '\x03');
-        rconParser.Configuration.ColorCodeMapping.Add('Orchid', '\x0E');
-        rconParser.Configuration.ColorCodeMapping.Add('Yellow', '\x09');
-        rconParser.Configuration.ColorCodeMapping.Add('Gold', '\x10');
-        rconParser.Configuration.ColorCodeMapping.Add('LightGreen', '\x05');
-        rconParser.Configuration.ColorCodeMapping.Add('Green', '\x04');
-        rconParser.Configuration.ColorCodeMapping.Add('Lime', '\x06');
-        rconParser.Configuration.ColorCodeMapping.Add('Grey', '\x08');
-        rconParser.Configuration.ColorCodeMapping.Add('Grey2', '\x0D');
-        // only adding there here for the default accent color
-        rconParser.Configuration.ColorCodeMapping.Add('Cyan', '\x0B');
-
         rconParser.Configuration.NoticeLineSeparator = '. ';
-        rconParser.Configuration.DefaultRConPort = 27015;
         rconParser.CanGenerateLogPath = false;
 
         rconParser.Configuration.CommandPrefixes.RConGetInfo    = undefined;

Plugins/ScriptPlugins/ParserCSGOSM.js

@@ -3,7 +3,7 @@ let eventParser;
 
 const plugin = {
     author: 'RaidMax',
-    version: 0.5,
+    version: 0.3,
     name: 'CS:GO (SourceMod) Parser',
     engine: 'Source',
     isParser: true,
@@ -41,7 +41,7 @@ const plugin = {
         rconParser.Configuration.Status.AddMapping(104, 3);
         rconParser.Configuration.Status.AddMapping(105, 10);
         rconParser.Configuration.Status.AddMapping(200, 1);
-        
+
         rconParser.Configuration.DefaultDvarValues.Add('sv_running', '1');
         rconParser.Configuration.DefaultDvarValues.Add('version', this.engine);
         rconParser.Configuration.DefaultDvarValues.Add('fs_basepath', '');
@@ -57,27 +57,7 @@ const plugin = {
         rconParser.Configuration.OverrideDvarNameMapping.Add('fs_game', 'game_mode');
         rconParser.Configuration.OverrideDvarNameMapping.Add('g_password', 'sv_password');
 
-        rconParser.Configuration.ColorCodeMapping.Clear();
-        rconParser.Configuration.ColorCodeMapping.Add('White', '\x01');
-        rconParser.Configuration.ColorCodeMapping.Add('Red', '\x07');
-        rconParser.Configuration.ColorCodeMapping.Add('LightRed', '\x0F');
-        rconParser.Configuration.ColorCodeMapping.Add('DarkRed', '\x02');
-        rconParser.Configuration.ColorCodeMapping.Add('Blue', '\x0B');
-        rconParser.Configuration.ColorCodeMapping.Add('DarkBlue', '\x0C');
-        rconParser.Configuration.ColorCodeMapping.Add('Purple', '\x03');
-        rconParser.Configuration.ColorCodeMapping.Add('Orchid', '\x0E');
-        rconParser.Configuration.ColorCodeMapping.Add('Yellow', '\x09');
-        rconParser.Configuration.ColorCodeMapping.Add('Gold', '\x10');
-        rconParser.Configuration.ColorCodeMapping.Add('LightGreen', '\x05');
-        rconParser.Configuration.ColorCodeMapping.Add('Green', '\x04');
-        rconParser.Configuration.ColorCodeMapping.Add('Lime', '\x06');
-        rconParser.Configuration.ColorCodeMapping.Add('Grey', '\x08');
-        rconParser.Configuration.ColorCodeMapping.Add('Grey2', '\x0D');
-        // only adding there here for the default accent color
-        rconParser.Configuration.ColorCodeMapping.Add('Cyan', '\x0B');
-
         rconParser.Configuration.NoticeLineSeparator    = '. ';
-        rconParser.Configuration.DefaultRConPort = 27015;
         rconParser.CanGenerateLogPath                   = false;
 
         rconParser.Configuration.CommandPrefixes.RConGetInfo    = undefined;

Plugins/ScriptPlugins/ParserCoD4x.js

@@ -3,7 +3,7 @@ var eventParser;
 
 var plugin = {
     author: 'FrenchFry, RaidMax',
-    version: 0.8,
+    version: 0.7,
     name: 'CoD4x Parser',
     isParser: true,
 
@@ -25,7 +25,6 @@ var plugin = {
         rconParser.Configuration.Dvar.AddMapping(110, 4); // dvar info
         rconParser.Configuration.GuidNumberStyle = 7; // Integer
         rconParser.Configuration.NoticeLineSeparator = '. '; // CoD4x does not support \n in the client notice
-        rconParser.Configuration.DefaultRConPort = 28960;
         rconParser.Version = 'CoD4 X - win_mingw-x86 build 1056 Dec 12 2020';
         rconParser.GameName = 1; // IW3
 

Plugins/ScriptPlugins/ParserIW4x.js

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

Plugins/ScriptPlugins/ParserIW6x.js

@@ -3,7 +3,7 @@ var eventParser;
 
 var plugin = {
     author: 'Xerxes, RaidMax, st0rm',
-    version: 0.4,
+    version: 0.3,
     name: 'IW6x Parser',
     isParser: true,
 
@@ -24,7 +24,6 @@ var plugin = {
         rconParser.Configuration.Status.Pattern = '^ *([0-9]+) +-?([0-9]+) +(Yes|No) +((?:[A-Z]+|[0-9]+)) +((?:[a-z]|[0-9]){8,32}|(?:[a-z]|[0-9]){8,32}|bot[0-9]+|(?:[0-9]+)) *(.{0,32}) +(\\d+\\.\\d+\\.\\d+.\\d+\\:-*\\d{1,5}|0+.0+:-*\\d{1,5}|loopback|unknown|bot) +(-*[0-9]+) *$';
         rconParser.Configuration.StatusHeader.Pattern = 'num +score +bot +ping +guid +name +address +qport *';
         rconParser.Configuration.WaitForResponse = false;
-        rconParser.Configuration.DefaultRConPort = 28960;
         rconParser.Configuration.Status.AddMapping(102, 4);
         rconParser.Configuration.Status.AddMapping(103, 5);
         rconParser.Configuration.Status.AddMapping(104, 6);

Plugins/ScriptPlugins/ParserPIW5.js

@@ -3,7 +3,7 @@ var eventParser;
 
 var plugin = {
     author: 'RaidMax',
-    version: 1.0,
+    version: 0.9,
     name: 'Plutonium IW5 Parser',
     isParser: true,
 
@@ -28,9 +28,6 @@ var plugin = {
         rconParser.Configuration.WaitForResponse = true;
         rconParser.Configuration.CanGenerateLogPath = true;
         rconParser.Configuration.NoticeLineSeparator = '. ';
-        rconParser.Configuration.DefaultRConPort = 27016;
-
-        rconParser.Configuration.DefaultInstallationDirectoryHint = '{LocalAppData}/Plutonium/storage/iw5';
                                                         
         rconParser.Configuration.StatusHeader.Pattern = 'num +score +bot +ping +guid +name +address +qport *';
         rconParser.Configuration.Status.Pattern = '^ *([0-9]+) +-?([0-9]+) +(0|1) +((?:[A-Z]+|[0-9]+)) +((?:[a-z]|[0-9]){8,32}|(?:[a-z]|[0-9]){8,32}|bot[0-9]+|(?:[0-9]+)) *(.{0,32}) +(\\d+\\.\\d+\\.\\d+.\\d+\\:-*\\d{1,5}|0+.0+:-*\\d{1,5}|loopback|unknown|bot) +(-*[0-9]+) *$';

Plugins/ScriptPlugins/ParserPT6.js

@@ -3,7 +3,7 @@ var eventParser;
 
 var plugin = {
     author: 'RaidMax, Xerxes',
-    version: 1.2,
+    version: 1.0,
     name: 'Plutonium T6 Parser',
     isParser: true,
 
@@ -27,8 +27,6 @@ var plugin = {
         rconParser.Configuration.Dvar.AddMapping(107, 2);
         rconParser.Configuration.WaitForResponse = false;
         rconParser.Configuration.NoticeLineSeparator = '. ';
-        rconParser.Configuration.DefaultRConPort = 4976;
-        rconParser.Configuration.DefaultInstallationDirectoryHint = '{LocalAppData}/Plutonium/storage/t6';
 
         rconParser.Configuration.StatusHeader.Pattern = 'num +score +bot +ping +guid +name +lastmsg +address +qport +rate *';
         rconParser.Configuration.Status.Pattern = '^ *([0-9]+) +([0-9]+) +(?:[0-1]{1}) +([0-9]+) +([A-F0-9]+|0) +(.+?) +(?:[0-9]+) +(\\d+\\.\\d+\\.\\d+\\.\\d+\\:-?\\d{1,5}|0+\\.0+:-?\\d{1,5}|loopback) +(?:-?[0-9]+) +(?:[0-9]+) *$';
@@ -38,21 +36,6 @@ var plugin = {
         rconParser.Configuration.Status.AddMapping(103, 4);
         rconParser.Configuration.Status.AddMapping(104, 5);
         rconParser.Configuration.Status.AddMapping(105, 6);
-
-        // this is mostly default but just an example on how to map
-        rconParser.Configuration.ColorCodeMapping.Clear();
-        rconParser.Configuration.ColorCodeMapping.Add('Black', '^0');
-        rconParser.Configuration.ColorCodeMapping.Add('Red', '^1');
-        rconParser.Configuration.ColorCodeMapping.Add('Green', '^2');
-        rconParser.Configuration.ColorCodeMapping.Add('Yellow', '^3');
-        rconParser.Configuration.ColorCodeMapping.Add('Blue', '^4');
-        rconParser.Configuration.ColorCodeMapping.Add('Cyan', '^5');
-        rconParser.Configuration.ColorCodeMapping.Add('Pink', '^6');
-        rconParser.Configuration.ColorCodeMapping.Add('White', '^7');
-        rconParser.Configuration.ColorCodeMapping.Add('Map', '^8');
-        rconParser.Configuration.ColorCodeMapping.Add('Grey', '^9');
-        rconParser.Configuration.ColorCodeMapping.Add('LightBlue', '^;');
-        rconParser.Configuration.ColorCodeMapping.Add('LightYellow', '^:');
         
         eventParser.Configuration.GameDirectory = '';
         eventParser.Configuration.GuidNumberStyle = 7; // Integer

Plugins/ScriptPlugins/ParserPlutoniumT4.js

@@ -3,8 +3,8 @@ var eventParser;
 
 var plugin = {
     author: 'RaidMax, Chase',
-    version: 0.4,
-    name: 'Plutonium T4 MP Parser',
+    version: 0.2,
+    name: 'Plutonium T4 Parser',
     isParser: true,
 
     onEventAsync: function (gameEvent, server) {
@@ -19,17 +19,13 @@ var plugin = {
         rconParser.Configuration.CommandPrefixes.TempBan      = 'clientkick {0}';
         rconParser.Configuration.CommandPrefixes.RConResponse = '\xff\xff\xff\xffprint\n';
         rconParser.Configuration.GuidNumberStyle              = 7; // Integer
-        rconParser.Configuration.DefaultRConPort              = 28960;
-        rconParser.Configuration.OverrideDvarNameMapping.Add('fs_homepath', 'fs_localAppData');
-
-        rconParser.Configuration.DefaultInstallationDirectoryHint = '{LocalAppData}/Plutonium/storage/t4';
         
         rconParser.Version  = 'Plutonium T4';
         rconParser.GameName = 5; // T4
 
         eventParser.Configuration.GuidNumberStyle = 7; // Integer
-        eventParser.Configuration.GameDirectory   = 'main';
-
+        eventParser.Configuration.GameDirectory   = 'raw';
+ 
         eventParser.Version  = 'Plutonium T4';
     },
 

Plugins/ScriptPlugins/ParserPlutoniumT4COZM.js

@@ -1,43 +0,0 @@
-var rconParser;
-var eventParser;
-
-var plugin = {
-    author: 'RaidMax',
-    version: 0.1,
-    name: 'Plutonium T4 CO-OP/Zombies Parser',
-    isParser: true,
-
-    onEventAsync: function (gameEvent, server) {
-    },
-
-    onLoadAsync: function (manager) {
-        rconParser = manager.GenerateDynamicRConParser(this.name);
-        eventParser = manager.GenerateDynamicEventParser(this.name);
-
-        rconParser.Configuration.CommandPrefixes.Kick         = 'clientkick {0}';
-        rconParser.Configuration.CommandPrefixes.Ban          = 'clientkick {0}';
-        rconParser.Configuration.CommandPrefixes.TempBan      = 'clientkick {0}';
-        rconParser.Configuration.CommandPrefixes.RConResponse = '\xff\xff\xff\xffprint\n';
-        rconParser.Configuration.GuidNumberStyle              = 7; // Integer
-        rconParser.Configuration.DefaultRConPort              = 28960;
-        rconParser.Configuration.CommandPrefixes.RConGetInfo  = undefined;
-
-
-        rconParser.Configuration.DefaultInstallationDirectoryHint = '{LocalAppData}/Plutonium/storage/t4';
-        rconParser.Configuration.OverrideDvarNameMapping.Add('fs_homepath', 'fs_localAppData');
-
-        rconParser.Version  = 'Plutonium T4 Singleplayer';
-        rconParser.GameName = 5; // T4
-
-        eventParser.Configuration.GuidNumberStyle = 7; // Integer
-        eventParser.Configuration.GameDirectory   = 'main';
-
-        eventParser.Version  = 'Plutonium T4 Singleplayer';
-    },
-
-    onUnloadAsync: function () {
-    },
-
-    onTickAsync: function (server) {
-    }
-};

Plugins/ScriptPlugins/ParserRektT5M.js

@@ -3,7 +3,7 @@ var eventParser;
 
 var plugin = {
     author: 'RaidMax',
-    version: 0.4,
+    version: 0.3,
     name: 'RektT5m Parser',
     isParser: true,
 
@@ -19,7 +19,6 @@ var plugin = {
         rconParser.Configuration.CommandPrefixes.RConResponse = '\xff\xff\xff\xff\x01print\n';
         rconParser.Configuration.CommandPrefixes.Tell = 'tell {0} {1}';
         rconParser.Configuration.CommandPrefixes.RConGetInfo = undefined;
-        rconParser.Configuration.DefaultRConPort = 28960;
 
         rconParser.Version = 'Call of Duty Multiplayer - Ship COD_T5_S MP build 7.0.189 CL(1022875) CODPCAB-V64 CEG Wed Nov 02 18:02:23 2011 win-x86';
         rconParser.GameName = 6; //  T5

Plugins/ScriptPlugins/ParserS1x.js

@@ -3,7 +3,7 @@ var eventParser;
 
 var plugin = {
     author: 'Diavolo, RaidMax',
-    version: 0.2,
+    version: 0.1,
     name: 'S1x Parser',
     isParser: true,
 
@@ -24,7 +24,6 @@ var plugin = {
         rconParser.Configuration.Status.AddMapping(103, 5);
         rconParser.Configuration.Status.AddMapping(104, 6);
         rconParser.Configuration.WaitForResponse = false;
-        rconParser.Configuration.DefaultRConPort = 27016;
 
         eventParser.Configuration.GameDirectory = '';
 

Plugins/ScriptPlugins/ParserT4.js

@@ -3,7 +3,7 @@ var eventParser;
 
 var plugin = {
     author: 'RaidMax',
-    version: 0.2,
+    version: 0.1,
     name: 'Call of Duty 5: World at War Parser',
     isParser: true,
 
@@ -15,7 +15,6 @@ var plugin = {
         eventParser = manager.GenerateDynamicEventParser(this.name);
         rconParser.Configuration.CommandPrefixes.RConResponse = '\xff\xff\xff\xffprint\n';
         rconParser.Configuration.GuidNumberStyle = 7; // Integer
-        rconParser.Configuration.DefaultRConPort = 28960;
         rconParser.Version = 'Call of Duty Multiplayer COD_WaW MP build 1.7.1263 CL(350073) JADAMS2 Thu Oct 29 15:43:55 2009 win-x86';
         
         eventParser.Configuration.GuidNumberStyle = 7; // Integer

Plugins/ScriptPlugins/ParserT7.js

@@ -3,7 +3,7 @@ var eventParser;
 
 var plugin = {
     author: 'RaidMax',
-    version: 0.4,
+    version: 0.3,
     name: 'Black Ops 3 Parser',
     isParser: true,
 
@@ -27,7 +27,6 @@ var plugin = {
         rconParser.Configuration.MapStatus.Pattern              = 'Map: (.+)';
         rconParser.Configuration.CommandPrefixes.RConGetInfo    = undefined; // disables this, because it's useless on T7
         rconParser.Configuration.ServerNotRunningResponse       = 'this is here to prevent a hibernating server from being detected as not running';
-        rconParser.Configuration.DefaultRConPort = 27016;
 
         rconParser.Configuration.OverrideDvarNameMapping.Add('sv_hostname', 'live_steam_server_name');
         rconParser.Configuration.DefaultDvarValues.Add('sv_running', '1');

Plugins/ScriptPlugins/ParserTeknoMW3.js

@@ -3,7 +3,7 @@ var eventParser;
 
 var plugin = {
     author: 'RaidMax',
-    version: 0.9,
+    version: 0.8,
     name: 'Tekno MW3 Parser',
     isParser: true,
 
@@ -28,7 +28,6 @@ var plugin = {
         rconParser.Configuration.Dvar.AddMapping(107, 1); // RCon DvarValue
         rconParser.Configuration.Dvar.Pattern = '^(.*)$';
         rconParser.Configuration.NoticeLineSeparator = '. ';
-        rconParser.Configuration.DefaultRConPort = 8766;
 
         rconParser.Configuration.DefaultDvarValues.Add('sv_running', '1');
         rconParser.Configuration.OverrideDvarNameMapping.Add('_website', 'sv_clanWebsite');

Plugins/Stats/Client/HitCalculator.cs

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

Plugins/Stats/Client/ServerDistributionCalculator.cs

@@ -11,7 +11,6 @@ using Microsoft.EntityFrameworkCore;
 using SharedLibraryCore;
 using SharedLibraryCore.Interfaces;
 using Stats.Client.Abstractions;
-using Stats.Config;
 using Stats.Helpers;
 
 namespace Stats.Client
@@ -22,7 +21,7 @@ namespace Stats.Client
 
         private readonly IDataValueCache<EFClientStatistics, Dictionary<long, Extensions.LogParams>>
             _distributionCache;
-
+        
         private readonly IDataValueCache<EFClientStatistics, double>
             _maxZScoreCache;
 
@@ -48,13 +47,12 @@ namespace Stats.Client
             await LoadServers();
             _distributionCache.SetCacheItem((async (set, token) =>
             {
-                await _configurationHandler.BuildAsync();
                 var validPlayTime = _configurationHandler.Configuration()?.TopPlayersMinPlayTime ?? 3600 * 3;
 
                 var distributions = new Dictionary<long, Extensions.LogParams>();
-
+                
                 await LoadServers();
-
+                
                 foreach (var serverId in _serverIds)
                 {
                     var performance = await set
@@ -64,33 +62,29 @@ namespace Stats.Client
                         .Where(s => s.Client.Level != EFClient.Permission.Banned)
                         .Where(s => s.TimePlayed >= validPlayTime)
                         .Where(s => s.UpdatedAt >= Extensions.FifteenDaysAgo())
-                        .Select(s => s.EloRating * 1 / 3.0 + s.Skill * 2 / 3.0).ToListAsync();
+                        .Select(s => s.EloRating * 1/3.0 + s.Skill * 2/3.0).ToListAsync();
                     var distributionParams = performance.GenerateDistributionParameters();
                     distributions.Add(serverId, distributionParams);
                 }
 
                 return distributions;
             }), DistributionCacheKey, Utilities.IsDevelopment ? TimeSpan.FromMinutes(5) : TimeSpan.FromHours(1));
-
+            
             _maxZScoreCache.SetCacheItem(async (set, token) =>
             {
-                await _configurationHandler.BuildAsync();
                 var validPlayTime = _configurationHandler.Configuration()?.TopPlayersMinPlayTime ?? 3600 * 3;
 
                 var zScore = await set
                     .Where(AdvancedClientStatsResourceQueryHelper.GetRankingFunc(validPlayTime))
                     .Where(s => s.Skill > 0)
                     .Where(s => s.EloRating > 0)
-                    .GroupBy(stat => stat.ClientId)
-                    .Select(group =>
-                        group.Sum(stat => stat.ZScore * stat.TimePlayed) / group.Sum(stat => stat.TimePlayed))
-                    .MaxAsync(avgZScore => (double?) avgZScore, token);
+                    .MaxAsync(s => (double?)s.ZScore, token);
                 return zScore ?? 0;
             }, MaxZScoreCacheKey, Utilities.IsDevelopment ? TimeSpan.FromMinutes(5) : TimeSpan.FromMinutes(30));
 
             await _distributionCache.GetCacheItem(DistributionCacheKey);
-            await _maxZScoreCache.GetCacheItem(MaxZScoreCacheKey);
-
+            await _maxZScoreCache.GetCacheItem(MaxZScoreCacheKey); 
+            
             /*foreach (var serverId in _serverIds)
             {
                 await using var ctx = _contextFactory.CreateContext(enableTracking: true);
@@ -143,7 +137,6 @@ namespace Stats.Client
             {
                 return 0.0;
             }
-
             var zScore = (Math.Log(value) - sdParams.Mean) / sdParams.Sigma;
             return zScore;
         }
@@ -151,7 +144,7 @@ namespace Stats.Client
         public async Task<double?> GetRatingForZScore(double? value)
         {
             var maxZScore = await _maxZScoreCache.GetCacheItem(MaxZScoreCacheKey);
-            return maxZScore == 0 ? null : value.GetRatingForZScore(maxZScore);
+            return maxZScore == 0 ? 0 : value.GetRatingForZScore(maxZScore);
         }
     }
-}
+}

Plugins/Stats/Client/WeaponNameParser.cs

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

Plugins/Stats/Commands/MostKillsCommand.cs

@@ -9,14 +9,15 @@ using Data.Models.Client.Stats;
 using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Interfaces;
+using IW4MAdmin.Plugins.Stats.Config;
 using IW4MAdmin.Plugins.Stats.Helpers;
-using Stats.Config;
 
 namespace IW4MAdmin.Plugins.Stats.Commands
 {
     class MostKillsCommand : Command
     {
         private readonly IDatabaseContextFactory _contextFactory;
+        private readonly CommandConfiguration _config;
 
         public MostKillsCommand(CommandConfiguration config, ITranslationLookup translationLookup,
             IDatabaseContextFactory contextFactory) : base(config, translationLookup)
@@ -27,6 +28,7 @@ namespace IW4MAdmin.Plugins.Stats.Commands
             Permission = EFClient.Permission.User;
 
             _contextFactory = contextFactory;
+            _config = config;
         }
 
         public override async Task ExecuteAsync(GameEvent E)
@@ -74,9 +76,9 @@ namespace IW4MAdmin.Plugins.Stats.Commands
 
             var iqList = await iqStats.ToListAsync();
 
-            return iqList.Select((stats, index) => translationLookup["PLUGINS_STATS_COMMANDS_MOSTKILLS_FORMAT_V2"]
+            return iqList.Select((stats, index) => translationLookup["PLUGINS_STATS_COMMANDS_MOSTKILLS_FORMAT"]
                     .FormatExt(index + 1, stats.Name, stats.Kills))
                 .Prepend(Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_STATS_COMMANDS_MOSTKILLS_HEADER"]);
         }
     }
-}
+}

Plugins/Stats/Commands/MostPlayedCommand.cs

@@ -20,9 +20,9 @@ namespace IW4MAdmin.Plugins.Stats.Commands
         {
             var serverId = StatManager.GetIdForServer(s);
 
-            var mostPlayed = new List<string>
+            var mostPlayed = new List<string>()
             {
-                $"(Color::Accent)--{translationLookup["PLUGINS_STATS_COMMANDS_MOSTPLAYED_TEXT"]}--"
+                $"^5--{translationLookup["PLUGINS_STATS_COMMANDS_MOSTPLAYED_TEXT"]}--"
             };
 
             await using var context = contextFactory.CreateContext(false);
@@ -48,7 +48,7 @@ namespace IW4MAdmin.Plugins.Stats.Commands
             var iqList = await iqStats.ToListAsync();
 
             mostPlayed.AddRange(iqList.Select((stats, index) =>
-                $"#{index + 1} " + translationLookup["COMMANDS_MOST_PLAYED_FORMAT_V2"].FormatExt(stats.Name, stats.Kills,
+                $"#{index + 1} " + translationLookup["COMMANDS_MOST_PLAYED_FORMAT"].FormatExt(stats.Name, stats.Kills,
                     (DateTime.UtcNow - DateTime.UtcNow.AddSeconds(-stats.TimePlayed))
                     .HumanizeForCurrentCulture())));
 
@@ -56,6 +56,7 @@ namespace IW4MAdmin.Plugins.Stats.Commands
             return mostPlayed;
         }
 
+        private readonly CommandConfiguration _config;
         private readonly IDatabaseContextFactory _contextFactory;
 
         public MostPlayedCommand(CommandConfiguration config, ITranslationLookup translationLookup,
@@ -67,6 +68,7 @@ namespace IW4MAdmin.Plugins.Stats.Commands
             Permission = EFClient.Permission.User;
             RequiresTarget = false;
 
+            _config = config;
             _contextFactory = contextFactory;
         }
 
@@ -89,4 +91,4 @@ namespace IW4MAdmin.Plugins.Stats.Commands
             }
         }
     }
-}
+}

Plugins/Stats/Commands/TopStats.cs

@@ -1,32 +1,35 @@
-using System.Linq;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Linq;
 using System.Threading.Tasks;
+
 using SharedLibraryCore;
 using System.Collections.Generic;
+using Data.Abstractions;
+using Data.Models.Client.Stats;
+using SharedLibraryCore.Database.Models;
 using IW4MAdmin.Plugins.Stats.Helpers;
 using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Interfaces;
-using EFClient = Data.Models.Client.EFClient;
 
 namespace IW4MAdmin.Plugins.Stats.Commands
 {
-    public class TopStats : Command
+    class TopStats : Command
     {
         public static async Task<List<string>> GetTopStats(Server s, ITranslationLookup translationLookup)
         {
-            var serverId = StatManager.GetIdForServer(s);
+            long serverId = StatManager.GetIdForServer(s); 
             var topStatsText = new List<string>()
             {
-                $"(Color::Accent)--{translationLookup["PLUGINS_STATS_COMMANDS_TOP_TEXT"]}--"
+                $"^5--{translationLookup["PLUGINS_STATS_COMMANDS_TOP_TEXT"]}--"
             };
 
             var stats = await Plugin.Manager.GetTopStats(0, 5, serverId);
-            var statsList = stats.Select((stats, index) =>
-                translationLookup["COMMANDS_TOPSTATS_RESULT"]
-                    .FormatExt(index + 1, stats.Name, stats.KDR, stats.Performance));
+            var statsList = stats.Select((stats, index) => $"#{index + 1} ^3{stats.Name}^7 - ^5{stats.KDR} ^7{translationLookup["PLUGINS_STATS_TEXT_KDR"]} | ^5{stats.Performance} ^7{translationLookup["PLUGINS_STATS_COMMANDS_PERFORMANCE"]}");
 
             topStatsText.AddRange(statsList);
 
-            // no one qualified
+                // no one qualified
             if (topStatsText.Count == 1)
             {
                 topStatsText = new List<string>()
@@ -38,10 +41,11 @@ namespace IW4MAdmin.Plugins.Stats.Commands
             return topStatsText;
         }
 
-        private new readonly CommandConfiguration _config;
+        private readonly CommandConfiguration _config;
+        private readonly IDatabaseContextFactory _contextFactory;
 
-        public TopStats(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
-            translationLookup)
+        public TopStats(CommandConfiguration config, ITranslationLookup translationLookup, 
+            IDatabaseContextFactory contextFactory) : base(config, translationLookup) 
         {
             Name = "topstats";
             Description = translationLookup["PLUGINS_STATS_COMMANDS_TOP_DESC"];
@@ -50,6 +54,7 @@ namespace IW4MAdmin.Plugins.Stats.Commands
             RequiresTarget = false;
 
             _config = config;
+            _contextFactory = contextFactory;
         }
 
         public override async Task ExecuteAsync(GameEvent E)
@@ -71,4 +76,4 @@ namespace IW4MAdmin.Plugins.Stats.Commands
             }
         }
     }
-}
+}

Plugins/Stats/Commands/ViewStats.cs

@@ -24,9 +24,9 @@ namespace IW4MAdmin.Plugins.Stats.Commands
             Alias = "xlrstats";
             Permission = EFClient.Permission.User;
             RequiresTarget = false;
-            Arguments = new []
+            Arguments = new CommandArgument[]
             {
-                new CommandArgument
+                new CommandArgument()
                 {
                     Name = "player",
                     Required = false
@@ -61,7 +61,7 @@ namespace IW4MAdmin.Plugins.Stats.Commands
                 var performanceRanking = await Plugin.Manager.GetClientOverallRanking(E.Target.ClientId, serverId);
                 var performanceRankingString = performanceRanking == 0
                     ? _translationLookup["WEBFRONT_STATS_INDEX_UNRANKED"]
-                    : $"{_translationLookup["WEBFRONT_STATS_INDEX_RANKED"]} (Color::Accent)#{performanceRanking}/{totalRankedPlayers}";
+                    : $"{_translationLookup["WEBFRONT_STATS_INDEX_RANKED"]} #{performanceRanking}/{totalRankedPlayers}";
 
                 // target is currently connected so we want their cached stats if they exist
                 if (E.Owner.GetClientsAsList().Any(client => client.Equals(E.Target)))
@@ -73,15 +73,14 @@ namespace IW4MAdmin.Plugins.Stats.Commands
                 if (pStats == null)
                 {
                     await using var context = _contextFactory.CreateContext(false);
-                    pStats = await context.Set<EFClientStatistics>()
-                        .FirstOrDefaultAsync(c => c.ServerId == serverId && c.ClientId == E.Target.ClientId);
+                    pStats = (await context.Set<EFClientStatistics>()
+                        .FirstOrDefaultAsync(c => c.ServerId == serverId && c.ClientId == E.Target.ClientId));
                 }
 
                 // if it's still null then they've not gotten a kill or death yet
                 statLine = pStats == null
                     ? _translationLookup["PLUGINS_STATS_COMMANDS_NOTAVAILABLE"]
-                    : _translationLookup["COMMANDS_VIEW_STATS_RESULT"].FormatExt(pStats.Kills, pStats.Deaths,
-                        pStats.KDR, pStats.Performance, performanceRankingString);
+                    : $"^5{pStats.Kills} ^7{_translationLookup["PLUGINS_STATS_TEXT_KILLS"]} | ^5{pStats.Deaths} ^7{_translationLookup["PLUGINS_STATS_TEXT_DEATHS"]} | ^5{pStats.KDR} ^7KDR | ^5{pStats.Performance} ^7{_translationLookup["PLUGINS_STATS_COMMANDS_PERFORMANCE"].ToUpper()} | {performanceRankingString}";
             }
 
             // getting self stats
@@ -90,7 +89,7 @@ namespace IW4MAdmin.Plugins.Stats.Commands
                 var performanceRanking = await Plugin.Manager.GetClientOverallRanking(E.Origin.ClientId, serverId);
                 var performanceRankingString = performanceRanking == 0
                     ? _translationLookup["WEBFRONT_STATS_INDEX_UNRANKED"]
-                    : $"{_translationLookup["WEBFRONT_STATS_INDEX_RANKED"]} (Color::Accent)#{performanceRanking}/{totalRankedPlayers}";
+                    : $"{_translationLookup["WEBFRONT_STATS_INDEX_RANKED"]} #{performanceRanking}/{totalRankedPlayers}";
 
                 // check if current client is connected to the server
                 if (E.Owner.GetClientsAsList().Any(client => client.Equals(E.Origin)))
@@ -109,8 +108,7 @@ namespace IW4MAdmin.Plugins.Stats.Commands
                 // if it's still null then they've not gotten a kill or death yet
                 statLine = pStats == null
                     ? _translationLookup["PLUGINS_STATS_COMMANDS_NOTAVAILABLE"]
-                    : _translationLookup["COMMANDS_VIEW_STATS_RESULT"].FormatExt(pStats.Kills, pStats.Deaths,
-                        pStats.KDR, pStats.Performance, performanceRankingString);
+                    : $"^5{pStats.Kills} ^7{_translationLookup["PLUGINS_STATS_TEXT_KILLS"]} | ^5{pStats.Deaths} ^7{_translationLookup["PLUGINS_STATS_TEXT_DEATHS"]} | ^5{pStats.KDR} ^7KDR | ^5{pStats.Performance} ^7{_translationLookup["PLUGINS_STATS_COMMANDS_PERFORMANCE"].ToUpper()} | {performanceRankingString}";
             }
 
             if (E.Message.IsBroadcastCommand(_config.BroadcastCommandPrefix))

Plugins/Stats/Config/StatsConfiguration.cs

@@ -1,11 +1,11 @@
-using System;
-using System.Collections.Generic;
-using IW4MAdmin.Plugins.Stats.Config;
-using SharedLibraryCore;
+using SharedLibraryCore;
 using SharedLibraryCore.Interfaces;
+using Stats.Config;
+using System;
+using System.Collections.Generic;
 using static IW4MAdmin.Plugins.Stats.Cheat.Detection;
 
-namespace Stats.Config
+namespace IW4MAdmin.Plugins.Stats.Config
 {
     public class StatsConfiguration : IBaseConfiguration
     {
@@ -74,28 +74,28 @@ namespace Stats.Config
         public IBaseConfiguration Generate()
         {
             AnticheatConfiguration.Enable =
-                Utilities.CurrentLocalization.LocalizationIndex["PLUGIN_STATS_SETUP_ENABLEAC"].PromptBool();
-            KillstreakMessages = new List<StreakMessageConfiguration>
+                Utilities.PromptBool(Utilities.CurrentLocalization.LocalizationIndex["PLUGIN_STATS_SETUP_ENABLEAC"]);
+            KillstreakMessages = new List<StreakMessageConfiguration>()
             {
-                new StreakMessageConfiguration
+                new StreakMessageConfiguration()
                 {
                     Count = -1,
-                    Message = Utilities.CurrentLocalization.LocalizationIndex["STATS_STREAK_MESSAGE_SUICIDE"]
+                    Message = "Try not to kill yourself anymore"
                 },
-                new StreakMessageConfiguration
+                new StreakMessageConfiguration()
                 {
                     Count = 5,
-                    Message = Utilities.CurrentLocalization.LocalizationIndex["STATS_STREAK_MESSAGE_5"]
+                    Message = "Great job! You're on a ^55 killstreak!"
                 },
-                new StreakMessageConfiguration
+                new StreakMessageConfiguration()
                 {
                     Count = 10,
-                    Message = Utilities.CurrentLocalization.LocalizationIndex["STATS_STREAK_MESSAGE_10"]
+                    Message = "Amazing! ^510 kills ^7without dying!"
                 },
-                new StreakMessageConfiguration
+                new StreakMessageConfiguration()
                 {
                     Count = 25,
-                    Message = Utilities.CurrentLocalization.LocalizationIndex["STATS_STREAK_MESSAGE_25"]
+                    Message = "You better call in that nuke, ^525 killstreak^7!"
                 }
             };
 
@@ -104,12 +104,12 @@ namespace Stats.Config
                 new StreakMessageConfiguration()
                 {
                     Count = 5,
-                    Message = Utilities.CurrentLocalization.LocalizationIndex["STATS_DEATH_STREAK_MESSAGE_5"]
+                    Message = "Pick it up soldier, you've died ^55 times ^7in a row..."
                 },
                 new StreakMessageConfiguration()
                 {
                     Count = 10,
-                    Message = Utilities.CurrentLocalization.LocalizationIndex["STATS_DEATH_STREAK_MESSAGE_10"]
+                    Message = "Seriously? ^510 deaths ^7without getting a kill?"
                 },
             };
 

Plugins/Stats/Helpers/StatManager.cs

@@ -19,12 +19,8 @@ using Data.Models.Client;
 using Data.Models.Client.Stats;
 using Data.Models.Server;
 using Humanizer.Localisation;
-using Microsoft.Data.Sqlite;
 using Microsoft.Extensions.Logging;
-using MySqlConnector;
-using Npgsql;
 using Stats.Client.Abstractions;
-using Stats.Config;
 using Stats.Helpers;
 using static IW4MAdmin.Plugins.Stats.Cheat.Detection;
 using EFClient = SharedLibraryCore.Database.Models.EFClient;
@@ -38,7 +34,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
         private readonly ConcurrentDictionary<long, ServerStats> _servers;
         private readonly ILogger _log;
         private readonly IDatabaseContextFactory _contextFactory;
-        private readonly StatsConfiguration _config;
+        private readonly IConfigurationHandler<StatsConfiguration> _configHandler;
         private static List<EFServer> serverModels;
         public static string CLIENT_STATS_KEY = "ClientStats";
         public static string CLIENT_DETECTIONS_KEY = "ClientDetections";
@@ -47,13 +43,13 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
         private readonly IServerDistributionCalculator _serverDistributionCalculator;
 
         public StatManager(ILogger<StatManager> logger, IManager mgr, IDatabaseContextFactory contextFactory,
-            StatsConfiguration statsConfig,
+            IConfigurationHandler<StatsConfiguration> configHandler,
             IServerDistributionCalculator serverDistributionCalculator)
         {
             _servers = new ConcurrentDictionary<long, ServerStats>();
             _log = logger;
             _contextFactory = contextFactory;
-            _config = statsConfig;
+            _configHandler = configHandler;
             _serverDistributionCalculator = serverDistributionCalculator;
         }
 
@@ -75,7 +71,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
                           r.When > fifteenDaysAgo &&
                           r.RatingHistory.Client.Level != EFClient.Permission.Banned &&
                           r.Newest &&
-                          r.ActivityAmount >= _config.TopPlayersMinPlayTime;
+                          r.ActivityAmount >= _configHandler.Configuration().TopPlayersMinPlayTime;
         }
 
         /// <summary>
@@ -87,7 +83,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
         {
             await using var context = _contextFactory.CreateContext(enableTracking: false);
             
-            if (_config.EnableAdvancedMetrics)
+            if (_configHandler.Configuration().EnableAdvancedMetrics)
             {
                 var clientRanking = await context.Set<EFClientRankingHistory>()
                     .Where(r => r.ClientId == clientId)
@@ -121,12 +117,12 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
         {
             return (ranking) => ranking.ServerId == serverId
                                 && ranking.Client.Level != Data.Models.Client.EFClient.Permission.Banned
-                                && ranking.CreatedDateTime >= Extensions.FifteenDaysAgo()
+                                && ranking.Client.LastConnection >= Extensions.FifteenDaysAgo()
                                 && ranking.ZScore != null
                                 && ranking.PerformanceMetric != null
                                 && ranking.Newest
                                 && ranking.Client.TotalConnectionTime >=
-                                _config.TopPlayersMinPlayTime;
+                                _configHandler.Configuration().TopPlayersMinPlayTime;
         }
 
         public async Task<int> GetTotalRankedPlayers(long serverId)
@@ -217,7 +213,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
 
         public async Task<List<TopStatsInfo>> GetTopStats(int start, int count, long? serverId = null)
         {
-            if (_config.EnableAdvancedMetrics)
+            if (_configHandler.Configuration().EnableAdvancedMetrics)
             {
                 return await GetNewTopStats(start, count, serverId);
             }
@@ -435,12 +431,6 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
                     return null;
                 }
 
-                if (pl.ClientId <= 0)
-                {
-                    _log.LogWarning("Stats for {Client} are not yet initialized", pl.ToString());
-                    return null;
-                }
-
                 // get the client's stats from the database if it exists, otherwise create and attach a new one
                 // if this fails we want to throw an exception
 
@@ -520,15 +510,6 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
                 return clientStats;
             }
 
-            catch (DbUpdateException updateException) when (
-                updateException.InnerException is PostgresException {SqlState: "23503"}
-                || updateException.InnerException is SqliteException {SqliteErrorCode: 787}
-                || updateException.InnerException is MySqlException {SqlState: "23503"})
-            {
-                _log.LogWarning("Trying to add {Client} to stats before they have been added to the database",
-                    pl.ToString());
-            }
-
             catch (Exception ex)
             {
                 _log.LogError(ex, "Could not add client to stats {@client}", pl.ToString());
@@ -570,7 +551,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
             {
                 clientStats = UpdateStats(clientStats, pl);
                 await SaveClientStats(clientStats);
-                if (_config.EnableAdvancedMetrics)
+                if (_configHandler.Configuration().EnableAdvancedMetrics)
                 {
                     await UpdateHistoricalRanking(pl.ClientId, clientStats, serverId);
                 }
@@ -671,12 +652,6 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
                 var clientDetection = attacker.GetAdditionalProperty<Detection>(CLIENT_DETECTIONS_KEY);
                 var clientStats = attacker.GetAdditionalProperty<EFClientStatistics>(CLIENT_STATS_KEY);
 
-                if (clientDetection == null || clientStats?.ClientId == null)
-                {
-                    _log.LogWarning("Client stats state for {Client} is not yet initialized", attacker.ToString());
-                    return;
-                }
-
                 waiter = clientStats.ProcessingHit;
                 await waiter.WaitAsync(Utilities.DefaultCommandTimeout, Plugin.ServerManager.CancellationToken);
 
@@ -895,7 +870,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
 
         public async Task AddStandardKill(EFClient attacker, EFClient victim)
         {
-            var serverId = GetIdForServer(attacker.CurrentServer);
+            long serverId = GetIdForServer(attacker.CurrentServer);
 
             var attackerStats = attacker.GetAdditionalProperty<EFClientStatistics>(CLIENT_STATS_KEY);
             var victimStats = victim.GetAdditionalProperty<EFClientStatistics>(CLIENT_STATS_KEY);
@@ -903,18 +878,6 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
             // update the total stats
             _servers[serverId].ServerStatistics.TotalKills += 1;
             
-            if (attackerStats == null)
-            {
-                _log.LogWarning("Stats for {Client} are not yet initialized", attacker.ToString());
-                return;
-            }
-            
-            if (victimStats == null)
-            {
-                _log.LogWarning("Stats for {Client} are not yet initialized", victim.ToString());
-                return;
-            }
-            
             // this happens when the round has changed
             if (attackerStats.SessionScore == 0)
             {
@@ -973,7 +936,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
 
             // update their performance 
             if ((DateTime.UtcNow - attackerStats.LastStatHistoryUpdate).TotalMinutes >=
-                (Utilities.IsDevelopment ? 0.5 : _config.EnableAdvancedMetrics ? 5.0 : 2.5))
+                (Utilities.IsDevelopment ? 0.5 : _configHandler.Configuration().EnableAdvancedMetrics ? 10.0 : 2.5))
             {
                 try
                 {
@@ -982,7 +945,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
                     // for stat history update, but one is already processing that invalidates the original
                     await attackerStats.ProcessingHit.WaitAsync(Utilities.DefaultCommandTimeout,
                         Plugin.ServerManager.CancellationToken);
-                    if (_config.EnableAdvancedMetrics)
+                    if (_configHandler.Configuration().EnableAdvancedMetrics)
                     {
                         await UpdateHistoricalRanking(attacker.ClientId, attackerStats, serverId);
                     }
@@ -1190,17 +1153,16 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
         public async Task UpdateHistoricalRanking(int clientId, EFClientStatistics clientStats, long serverId)
         {
             await using var context = _contextFactory.CreateContext();
-            var minPlayTime = _config.TopPlayersMinPlayTime;
             
             var performances = await context.Set<EFClientStatistics>()
                 .AsNoTracking()
                 .Where(stat => stat.ClientId == clientId)
                 .Where(stat => stat.ServerId != serverId) // ignore the one we're currently tracking
                 .Where(stats => stats.UpdatedAt >= Extensions.FifteenDaysAgo())
-                .Where(stats => stats.TimePlayed >= minPlayTime)
+                .Where(stats => stats.TimePlayed >= _configHandler.Configuration().TopPlayersMinPlayTime)
                 .ToListAsync();
             
-            if (clientStats.TimePlayed >= minPlayTime)
+            if (clientStats.TimePlayed >= _configHandler.Configuration().TopPlayersMinPlayTime)
             {
                 clientStats.ZScore = await _serverDistributionCalculator.GetZScoreForServer(serverId,
                     clientStats.Performance);
@@ -1208,10 +1170,10 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
                 var serverRanking = await context.Set<EFClientStatistics>()
                     .Where(stats => stats.ClientId != clientStats.ClientId)
                     .Where(AdvancedClientStatsResourceQueryHelper.GetRankingFunc(
-                        _config.TopPlayersMinPlayTime, clientStats.ZScore, serverId))
+                        _configHandler.Configuration().TopPlayersMinPlayTime, clientStats.ZScore, serverId))
                     .CountAsync();
 
-                var serverRankingSnapshot = new EFClientRankingHistory
+                var serverRankingSnapshot = new EFClientRankingHistory()
                 {
                     ClientId = clientId,
                     ServerId = serverId,
@@ -1228,35 +1190,27 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
                 performances.Add(clientStats);
             }
 
-            if (performances.Any(performance => performance.TimePlayed >= minPlayTime))
+            if (performances.Any(performance => performance.TimePlayed >= _configHandler.Configuration().TopPlayersMinPlayTime))
             {
-                var aggregateZScore = performances.WeightValueByPlaytime(nameof(EFClientStatistics.ZScore), minPlayTime);
+                var aggregateZScore = performances.WeightValueByPlaytime(nameof(EFClientStatistics.ZScore), _configHandler.Configuration().TopPlayersMinPlayTime);
                 
                 int? aggregateRanking = await context.Set<EFClientStatistics>()
                     .Where(stat => stat.ClientId != clientId)
-                    .Where(AdvancedClientStatsResourceQueryHelper.GetRankingFunc(minPlayTime))
+                    .Where(AdvancedClientStatsResourceQueryHelper.GetRankingFunc(_configHandler.Configuration()
+                        .TopPlayersMinPlayTime))
                     .GroupBy(stat => stat.ClientId)
                     .Where(group =>
                         group.Sum(stat => stat.ZScore * stat.TimePlayed) / group.Sum(stat => stat.TimePlayed) >
                         aggregateZScore)
                     .Select(c => c.Key)
                     .CountAsync();
-
-                var newPerformanceMetric = await _serverDistributionCalculator.GetRatingForZScore(aggregateZScore);
-
-                if (newPerformanceMetric == null)
-                {
-                    _log.LogWarning("Could not determine performance metric for {Client} {AggregateZScore}",
-                        clientStats.Client?.ToString(), aggregateZScore);
-                    return;
-                }
                 
-                var aggregateRankingSnapshot = new EFClientRankingHistory
+                var aggregateRankingSnapshot = new EFClientRankingHistory()
                 {
                     ClientId = clientId,
                     ZScore = aggregateZScore,
                     Ranking = aggregateRanking,
-                    PerformanceMetric = newPerformanceMetric,
+                    PerformanceMetric = await _serverDistributionCalculator.GetRatingForZScore(aggregateZScore),
                     Newest = true,
                 };
 
@@ -1310,14 +1264,12 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
             if (!suicide)
             {
                 attackerStats.Kills += 1;
-                attackerStats.MatchData.Kills += 1;
                 attackerStats.SessionKills += 1;
                 attackerStats.KillStreak += 1;
                 attackerStats.DeathStreak = 0;
             }
 
             victimStats.Deaths += 1;
-            victimStats.MatchData.Deaths += 1;
             victimStats.SessionDeaths += 1;
             victimStats.DeathStreak += 1;
             victimStats.KillStreak = 0;
@@ -1467,7 +1419,6 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
             {
                 session.stat?.StartNewSession();
                 session.detection?.OnMapChange();
-                session.stat?.MatchData?.StartNewMatch();
             }
         }
 
@@ -1577,4 +1528,4 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
             return serverId.Value;
         }
     }
-}
+}

Plugins/Stats/Plugin.cs

@@ -1,4 +1,5 @@
-using IW4MAdmin.Plugins.Stats.Helpers;
+using IW4MAdmin.Plugins.Stats.Config;
+using IW4MAdmin.Plugins.Stats.Helpers;
 using Microsoft.EntityFrameworkCore;
 using SharedLibraryCore;
 using SharedLibraryCore.Dtos.Meta.Responses;
@@ -11,12 +12,14 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Data.Abstractions;
+using Data.Models.Client;
 using Data.Models.Client.Stats;
 using Data.Models.Server;
+using Humanizer;
 using Microsoft.Extensions.Logging;
+using SharedLibraryCore.Commands;
 using IW4MAdmin.Plugins.Stats.Client.Abstractions;
 using Stats.Client.Abstractions;
-using Stats.Config;
 using EFClient = SharedLibraryCore.Database.Models.EFClient;
 
 namespace IW4MAdmin.Plugins.Stats
@@ -85,7 +88,7 @@ namespace IW4MAdmin.Plugins.Stats
                     break;
                 case GameEvent.EventType.Command:
                     var shouldPersist = !string.IsNullOrEmpty(E.Data) &&
-                                        E.Extra?.GetType().Name == "SayCommand";
+                                        E.Extra is SayCommand;
                     if (shouldPersist)
                     {
                         await Manager.AddMessageAsync(E.Origin.ClientId, StatManager.GetIdForServer(S), false, E.Data);
@@ -171,7 +174,6 @@ namespace IW4MAdmin.Plugins.Stats
 
         public async Task OnLoadAsync(IManager manager)
         {
-            await Config.BuildAsync();
             // load custom configuration
             if (Config.Configuration() == null)
             {
@@ -191,8 +193,10 @@ namespace IW4MAdmin.Plugins.Stats
             async Task<IEnumerable<InformationResponse>> getStats(ClientPaginationRequest request)
             {
                 IList<EFClientStatistics> clientStats;
+                int messageCount = 0;
                 await using var ctx = _databaseContextFactory.CreateContext(enableTracking: false);
                 clientStats = await ctx.Set<EFClientStatistics>().Where(c => c.ClientId == request.ClientId).ToListAsync();
+                messageCount = await ctx.Set<EFClientMessage>().CountAsync(_message => _message.ClientId == request.ClientId);
 
                 int kills = clientStats.Sum(c => c.Kills);
                 int deaths = clientStats.Sum(c => c.Deaths);
@@ -251,6 +255,14 @@ namespace IW4MAdmin.Plugins.Stats
                         Column = 0,
                         Order = 5,
                         Type = MetaType.Information
+                    },
+                    new InformationResponse()
+                    {
+                        Key = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_PROFILE_MESSAGES"],
+                        Value = messageCount.ToString("#,##0", new System.Globalization.CultureInfo(Utilities.CurrentLocalization.LocalizationName)),
+                        Column = 1,
+                        Order = 4,
+                        Type = MetaType.Information
                     }
                 };
             }
@@ -441,7 +453,7 @@ namespace IW4MAdmin.Plugins.Stats
             }
 
             ServerManager = manager;
-            Manager = new StatManager(_managerLogger, manager, _databaseContextFactory, Config.Configuration(), _serverDistributionCalculator);
+            Manager = new StatManager(_managerLogger, manager, _databaseContextFactory, Config, _serverDistributionCalculator);
             await _serverDistributionCalculator.Initialize();
         }
 

Plugins/Stats/Stats.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
     <PackageId>RaidMax.IW4MAdmin.Plugins.Stats</PackageId>
@@ -12,12 +12,12 @@
     <Description>Client Statistics Plugin for IW4MAdmin</Description>
     <Copyright>2018</Copyright>
     <Configurations>Debug;Release;Prerelease</Configurations>
-    <LangVersion>Latest</LangVersion>
+    <LangVersion>8.0</LangVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.28.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2021.8.31.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/Welcome/Plugin.cs

@@ -6,7 +6,6 @@ using SharedLibraryCore.Database.Models;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using System.Net;
-using System.Net.Http;
 using Newtonsoft.Json.Linq;
 using Humanizer;
 using Data.Abstractions;
@@ -35,7 +34,6 @@ namespace IW4MAdmin.Plugins.Welcome
 
         public async Task OnLoadAsync(IManager manager)
         {
-            await _configHandler.BuildAsync();
             if (_configHandler.Configuration() == null)
             {
                 _configHandler.Set((WelcomeConfiguration) new WelcomeConfiguration().Generate());
@@ -47,16 +45,16 @@ namespace IW4MAdmin.Plugins.Welcome
 
         public Task OnTickAsync(Server S) => Task.CompletedTask;
 
-        public async Task OnEventAsync(GameEvent gameEvent, Server server)
+        public async Task OnEventAsync(GameEvent E, Server S)
         {
-            if (gameEvent.Type == GameEvent.EventType.Join)
+            if (E.Type == GameEvent.EventType.Join)
             {
-                var newPlayer = gameEvent.Origin;
-                if (newPlayer.Level >= Permission.Trusted && !gameEvent.Origin.Masked||
-                    !string.IsNullOrEmpty(newPlayer.GetAdditionalProperty<string>("ClientTag")) &&
+                var newPlayer = E.Origin;
+                if ((newPlayer.Level >= Permission.Trusted && !E.Origin.Masked) ||
+                    (!string.IsNullOrEmpty(newPlayer.GetAdditionalProperty<string>("ClientTag")) &&
                      newPlayer.Level != Permission.Flagged && newPlayer.Level != Permission.Banned &&
-                     !newPlayer.Masked)
-                    gameEvent.Owner.Broadcast(
+                     !newPlayer.Masked))
+                    E.Owner.Broadcast(
                         await ProcessAnnouncement(_configHandler.Configuration().PrivilegedAnnouncementMessage,
                             newPlayer));
 
@@ -75,11 +73,10 @@ namespace IW4MAdmin.Plugins.Welcome
                             .FirstOrDefaultAsync();
                     }
 
-                    gameEvent.Owner.ToAdmins(Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_WELCOME_FLAG_MESSAGE"]
-                        .FormatExt(newPlayer.Name, penaltyReason));
+                    E.Owner.ToAdmins($"^1NOTICE: ^7Flagged player ^5{newPlayer.Name} ^7({penaltyReason}) has joined!");
                 }
                 else
-                    gameEvent.Owner.Broadcast(await ProcessAnnouncement(_configHandler.Configuration().UserAnnouncementMessage,
+                    E.Owner.Broadcast(await ProcessAnnouncement(_configHandler.Configuration().UserAnnouncementMessage,
                         newPlayer));
             }
         }
@@ -88,14 +85,14 @@ namespace IW4MAdmin.Plugins.Welcome
         {
             msg = msg.Replace("{{ClientName}}", joining.Name);
             msg = msg.Replace("{{ClientLevel}}",
-                $"{Utilities.ConvertLevelToColor(joining.Level, joining.ClientPermission.Name)}{(string.IsNullOrEmpty(joining.GetAdditionalProperty<string>("ClientTag")) ? "" : $" (Color::White)({joining.GetAdditionalProperty<string>("ClientTag")}(Color::White))")}");
+                $"{Utilities.ConvertLevelToColor(joining.Level, joining.ClientPermission.Name)}{(string.IsNullOrEmpty(joining.GetAdditionalProperty<string>("ClientTag")) ? "" : $" ^7({joining.GetAdditionalProperty<string>("ClientTag")}^7)")}");
             // this prevents it from trying to evaluate it every message
             if (msg.Contains("{{ClientLocation}}"))
             {
                 msg = msg.Replace("{{ClientLocation}}", await GetCountryName(joining.IPAddressString));
             }
 
-            msg = msg.Replace("{{TimesConnected}}", joining.Connections.Ordinalize(Utilities.CurrentLocalization.Culture));
+            msg = msg.Replace("{{TimesConnected}}", joining.Connections.Ordinalize());
 
             return msg;
         }
@@ -107,11 +104,11 @@ namespace IW4MAdmin.Plugins.Welcome
         /// <returns></returns>
         private async Task<string> GetCountryName(string ip)
         {
-            using var wc = new HttpClient();
+            using var wc = new WebClient();
             try
             {
                 var response =
-                    await wc.GetStringAsync(new Uri($"http://ip-api.com/json/{ip}"));
+                    await wc.DownloadStringTaskAsync(new Uri($"http://extreme-ip-lookup.com/json/{ip}?key=demo"));
                 var responseObj = JObject.Parse(response);
                 response = responseObj["country"]?.ToString();
 
@@ -126,4 +123,4 @@ namespace IW4MAdmin.Plugins.Welcome
             }
         }
     }
-}
+}

Plugins/Welcome/Welcome.csproj

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