fix concurrency issue with accent color setup

see pt6 parser and configs for example usages

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

Application/ApplicationManager.cs

@@ -355,10 +355,10 @@ namespace IW4MAdmin.Application
             // copy over default config if it doesn't exist
             if (!_appConfig.Servers?.Any() ?? true)
             {
-                var defaultHandler = new BaseConfigurationHandler<DefaultSettings>("DefaultSettings");
+                var defaultConfig = new BaseConfigurationHandler<DefaultSettings>("DefaultSettings").Configuration();
-                await defaultHandler.BuildAsync();
+                //ConfigHandler.Set((ApplicationConfiguration)new ApplicationConfiguration().Generate());
-                var defaultConfig = defaultHandler.Configuration();
+                //var newConfig = ConfigHandler.Configuration();
-        
+
                 _appConfig.AutoMessages = defaultConfig.AutoMessages;
                 _appConfig.GlobalRules = defaultConfig.GlobalRules;
                 _appConfig.DisallowedClientNames = defaultConfig.DisallowedClientNames;
@@ -492,17 +492,13 @@ namespace IW4MAdmin.Application
 
             // this is because I want to store the command prefix in IW4MAdminSettings, but can't easily
             // inject it to all the places that need it
-            cmdConfig.CommandPrefix = _appConfig?.CommandPrefix ?? "!";
+            cmdConfig.CommandPrefix = _appConfig.CommandPrefix;
-            cmdConfig.BroadcastCommandPrefix = _appConfig?.BroadcastCommandPrefix ?? "@";
+            cmdConfig.BroadcastCommandPrefix = _appConfig.BroadcastCommandPrefix;
 
             foreach (var cmd in commandsToAddToConfig)
             {
-                if (cmdConfig.Commands.ContainsKey(cmd.CommandConfigNameForType()))
-                {
-                    continue;
-                }
                 cmdConfig.Commands.Add(cmd.CommandConfigNameForType(),
-                new CommandProperties
+                new CommandProperties()
                 {
                     Name = cmd.Name,
                     Alias = cmd.Alias,
@@ -551,7 +547,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\"
+xcopy /y "%SolutionDir%Build\Plugins" "%TargetDir%Plugins\"
-del "%TargetDir%Plugins\SQLite*"

Application/BuildScripts/PostPublish.bat

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

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

@@ -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",
@@ -2027,62 +1529,62 @@
       "winchester1200": "W1200",
       "concussion": "Stun",
       "melee": "Knife",
-      "Frag": "Grenade",
+      "Frag" : "Grenade",
       "airstrike": "Airstrike",
       "helicopter": "Attack Helicopter",
       "player": "",
       "attach": ""
     },
-    "T4": {
+    "T4": {	
-      "torso_upper": "Upper Torso",
+	  "torso_upper": "Upper Torso",
-      "torso_lower": "Lower Torso",
+	  "torso_lower": "Lower Torso",
-      "right_leg_upper": "Upper Right Leg",
+	  "right_leg_upper": "Upper Right Leg",
-      "right_leg_lower": "Lower Right Leg",
+	  "right_leg_lower": "Lower Right Leg",
-      "right_hand": "Right Hand",
+	  "right_hand": "Right Hand",
-      "right_foot": "Right Foot",
+	  "right_foot": "Right Foot",
-      "right_arm_upper": "Upper Right Arm",
+	  "right_arm_upper": "Upper Right Arm",
-      "right_arm_lower": "Lower Right Arm",
+	  "right_arm_lower": "Lower Right Arm",
-      "left_leg_upper": "Upper Left Leg",
+	  "left_leg_upper": "Upper Left Leg",
-      "left_leg_lower": "Lower Left Leg",
+	  "left_leg_lower": "Lower Left Leg",
-      "left_hand": "Left Hand",
+	  "left_hand": "Left Hand",
-      "left_foot": "Left Foot",
+	  "left_foot": "Left Foot",
-      "left_arm_upper": "Upper Left Arm",
+	  "left_arm_upper": "Upper Left Arm",
-      "left_arm_lower": "Lower Left Arm",
+	  "left_arm_lower": "Lower Left Arm",
-      "gl": "Rifle Grenade",
+	  "gl": "Rifle Grenade",
-      "bigammo": "Round Drum",
+	  "bigammo": "Round Drum",
-      "scoped": "Sniper Scope",
+	  "scoped": "Sniper Scope",
-      "telescopic": "Telescopic Sight",
+	  "telescopic": "Telescopic Sight",
-      "aperture": "Aperture Sight",
+	  "aperture": "Aperture Sight",
-      "flash": "Flash Hider",
+	  "flash": "Flash Hider",
-      "silenced": "Silencer",
+	  "silenced": "Silencer",
-      "molotov": "Molotov Cocktail",
+	  "molotov": "Molotov Cocktail",
-      "sticky": "N° 74 ST",
+	  "sticky": "N° 74 ST",
-      "m2": "M2 Flamethrower",
+	  "m2": "M2 Flamethrower",
-      "artillery": "Artillery Strike",
+	  "artillery": "Artillery Strike",
-      "dog": "Attack Dogs",
+	  "dog": "Attack Dogs",
-      "colt": "Colt M1911",
+	  "colt":	"Colt M1911",
-      "357magnum": ".357 Magnum",
+	  "357magnum": ".357 Magnum",
-      "walther": "Walther P38",
+	  "walther": "Walther P38",
-      "tokarev": "Tokarev TT-33",
+	  "tokarev": "Tokarev TT-33",
-      "shotgun": "M1897 Trench Gun",
+	  "shotgun": "M1897 Trench Gun",
-      "doublebarreledshotgun": "Double-Barreled Shotgun",
+	  "doublebarreledshotgun": "Double-Barreled Shotgun",
-      "mp40": "MP40",
+	  "mp40": "MP40",
-      "type100smg": "Type 100",
+	  "type100smg": "Type 100",
-      "ppsh": "PPSh-41",
+	  "ppsh": "PPSh-41",
-      "svt40": "SVT-40",
+	  "svt40": "SVT-40",
-      "gewehr43": "Gewehr 43",
+	  "gewehr43": "Gewehr 43",
-      "m1garand": "M1 Garand",
+	  "m1garand": "M1 Garand",
-      "stg44": "STG-44",
+	  "stg44": "STG-44",
-      "m1carbine": "M1A1 Carbine",
+	  "m1carbine": "M1A1 Carbine",
-      "type99lmg": "Type 99",
+	  "type99lmg": "Type 99",
-      "bar": "BAR",
+	  "bar": "BAR",
-      "dp28": "DP-28",
+	  "dp28": "DP-28",
-      "mg42": "MG42",
+	  "mg42": "MG42",
-      "fg42": "FG42",
+	  "fg42": "FG42",
-      "30cal": "Browning M1919",
+	  "30cal": "Browning M1919",
-      "type99rifle": "Arisaka",
+	  "type99rifle": "Arisaka",
-      "mosinrifle": "Mosin-Nagant",
+	  "mosinrifle": "Mosin-Nagant",
-      "ptrs41": "PTRS-41"
+	  "ptrs41":"PTRS-41"
-    }
+	}
   }
 }

Application/EventParsers/BaseEventParser.cs

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

Application/Extensions/CommandExtensions.cs

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

Application/Extensions/StartupExtensions.cs

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

Application/Factories/ConfigurationHandlerFactory.cs

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

Application/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;
@@ -26,6 +25,7 @@ using Data.Models;
 using Data.Models.Server;
 using IW4MAdmin.Application.Commands;
 using Microsoft.EntityFrameworkCore;
+using SharedLibraryCore.Formatting;
 using static Data.Models.Client.EFClient;
 
 namespace IW4MAdmin
@@ -53,13 +53,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;
@@ -355,7 +353,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);
@@ -1076,26 +1074,19 @@ namespace IW4MAdmin
         {
             try
             {
-                ResolvedIpEndPoint =
+                ResolvedIpEndPoint = new IPEndPoint((await Dns.GetHostAddressesAsync(IP)).First(), Port);
-                    new IPEndPoint(
-                        (await Dns.GetHostAddressesAsync(IP)).First(address =>
-                            address.AddressFamily == AddressFamily.InterNetwork), Port);
             }
             catch (Exception ex)
             {
                 ServerLogger.LogWarning(ex, "Could not resolve hostname or IP for RCon connection {IP}:{Port}", IP, Port);
                 ResolvedIpEndPoint = new IPEndPoint(IPAddress.Parse(IP), Port);
             }
-
+            
             RconParser = Manager.AdditionalRConParsers
-                .FirstOrDefault(parser =>
+                .FirstOrDefault(_parser => _parser.Version == ServerConfig.RConParserVersion);
-                    parser.Version == ServerConfig.RConParserVersion ||
-                    parser.Name == ServerConfig.RConParserVersion);
 
             EventParser = Manager.AdditionalEventParsers
-                .FirstOrDefault(parser =>
+                .FirstOrDefault(_parser => _parser.Version == ServerConfig.EventParserVersion);
-                    parser.Version == ServerConfig.EventParserVersion ||
-                    parser.Name == ServerConfig.RConParserVersion);
 
             RconParser ??= Manager.AdditionalRConParsers[0];
             EventParser ??= Manager.AdditionalEventParsers[0];
@@ -1112,7 +1103,7 @@ namespace IW4MAdmin
                 GameName = RconParser.GameName;
             }
 
-            if (version.Value?.Length != 0)
+            if (version?.Value?.Length != 0)
             {
                 var matchedRconParser = Manager.AdditionalRConParsers.FirstOrDefault(_parser => _parser.Version == version.Value);
                 RconParser.Configuration = matchedRconParser != null ? matchedRconParser.Configuration : RconParser.Configuration;

Application/Main.cs

@@ -34,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());
+        public static BuildNumber Version { get; private set; } = BuildNumber.Parse(Utilities.GetVersionAsString());
-        private static ApplicationManager _serverManager;
+        public static ApplicationManager ServerManager;
-        private static Task _applicationTask;
+        private static Task ApplicationTask;
-        private static ServiceProvider _serviceProvider;
+        private static ServiceProvider serviceProvider;
 
         /// <summary>
         /// entrypoint of the application
@@ -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();
+            ServerManager?.Stop();
-            if (_applicationTask != null)
+            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);
+                services = ConfigureServices(args);
-                _serviceProvider = services.BuildServiceProvider();
+                serviceProvider = services.BuildServiceProvider();
-                var versionChecker = _serviceProvider.GetRequiredService<IMasterCommunication>();
+                var versionChecker = serviceProvider.GetRequiredService<IMasterCommunication>();
-                _serverManager = (ApplicationManager) _serviceProvider.GetRequiredService<IManager>();
+                ServerManager = (ApplicationManager) serviceProvider.GetRequiredService<IManager>();
-                translationLookup = _serviceProvider.GetRequiredService<ITranslationLookup>();
+                translationLookup = serviceProvider.GetRequiredService<ITranslationLookup>();
 
-                _applicationTask = RunApplicationTasksAsync(logger, services);
+                await versionChecker.CheckVersion();
-                var tasks = new[]
+                await ServerManager.Init();
-                {
-                    versionChecker.CheckVersion(),
-                    _serverManager.Init(),
-                    _applicationTask
-                };
-
-                await Task.WhenAll(tasks);
             }
 
             catch (Exception e)
             {
-                var failMessage = translationLookup == null
+                string failMessage = translationLookup == null
                     ? "Failed to initialize IW4MAdmin"
                     : translationLookup["MANAGER_INIT_FAIL"];
-                var exitMessage = translationLookup == null
+                string exitMessage = translationLookup == null
                     ? "Press enter to exit..."
                     : translationLookup["MANAGER_EXIT"];
 
@@ -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
+            var webfrontTask = ServerManager.GetApplicationSettings().Configuration().EnableWebFront
-                ? WebfrontCore.Program.Init(_serverManager, _serviceProvider, services, _serverManager.CancellationToken)
+                ? WebfrontCore.Program.Init(ServerManager, serviceProvider, services, ServerManager.CancellationToken)
                 : Task.CompletedTask;
 
-            var collectionService = _serviceProvider.GetRequiredService<IServerDataCollector>();
+            var collectionService = serviceProvider.GetRequiredService<IServerDataCollector>();
 
             // we want to run this one on a manual thread instead of letting the thread pool handle it,
             // because we can't exit early from waiting on console input, and it prevents us from restarting
-            async void ReadInput() => await ReadConsoleInput(logger);
+            var inputThread = new Thread(async () => await ReadConsoleInput(logger));
-
-            var inputThread = new Thread(ReadInput);
             inputThread.Start();
 
             var tasks = new[]
             {
+                ServerManager.Start(),
                 webfrontTask,
-                _serverManager.Start(),
+                serviceProvider.GetRequiredService<IMasterCommunication>()
-                _serviceProvider.GetRequiredService<IMasterCommunication>()
+                    .RunUploadStatus(ServerManager.CancellationToken),
-                    .RunUploadStatus(_serverManager.CancellationToken),
+                collectionService.BeginCollectionAsync(cancellationToken: ServerManager.CancellationToken)
-                collectionService.BeginCollectionAsync(cancellationToken: _serverManager.CancellationToken)
             };
 
             logger.LogDebug("Starting webfront and input tasks");
@@ -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);
+                        if (lastCommand?.Length > 0)
-                        continue;
+                        {
+                            GameEvent E = new GameEvent()
+                            {
+                                Type = GameEvent.EventType.Command,
+                                Data = lastCommand,
+                                Origin = Origin,
+                                Owner = ServerManager.Servers[0]
+                            };
+
+                            ServerManager.AddEvent(E);
+                            await E.WaitAsync(Utilities.DefaultCommandTimeout, ServerManager.CancellationToken);
+                            Console.Write('>');
+                        }
                     }
-                    
-                    var lastCommand = await Console.In.ReadLineAsync();
-
-                    if (lastCommand == null)
-                    {
-                        continue;
-                    }
-
-                    if (!lastCommand.Any())
-                    {
-                        continue;
-                    }
-
-                    var gameEvent = new GameEvent
-                    {
-                        Type = GameEvent.EventType.Command,
-                        Data = lastCommand,
-                        Origin = origin ??= Utilities.IW4MAdminClient(_serverManager.Servers.FirstOrDefault()),
-                        Owner = _serverManager.Servers[0]
-                    };
-
-                    _serverManager.AddEvent(gameEvent);
-                    await gameEvent.WaitAsync(Utilities.DefaultCommandTimeout, _serverManager.CancellationToken);
-                    Console.Write('>');
                 }
             }
             catch (OperationCanceledException)
@@ -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))
+                .Where(_asmType => typeof(IRegisterEvent).IsAssignableFrom(_asmType))
-                .Union(plugins.SelectMany(asm => asm.Assembly.GetTypes())
+                .Union(plugins.SelectMany(_asm => _asm.Assembly.GetTypes())
                     .Distinct()
-                    .Where(asmType => typeof(IRegisterEvent).IsAssignableFrom(asmType))))
+                    .Where(_asmType => typeof(IRegisterEvent).IsAssignableFrom(_asmType))))
             {
                 var instance = Activator.CreateInstance(assemblyType) as IRegisterEvent;
                 serviceCollection.AddSingleton(instance);
@@ -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 =>
-                .AddSingleton(serviceProvider =>
+                    _serviceProvider.GetRequiredService<IConfigurationHandler<CommandConfiguration>>()
-                    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;
+        T _configuration;
-        private readonly SemaphoreSlim _onSaving;
-        private readonly JsonSerializerOptions _serializerOptions;
 
-
+        public BaseConfigurationHandler(string fn)
-        public BaseConfigurationHandler(string fileName)
         {
-            _serializerOptions = new JsonSerializerOptions
+            FileName = Path.Join(Utilities.OperatingDirectory, "Configuration", $"{fn}.json");
-            {
+            Build();
-                WriteIndented = true,
-            };
-            _serializerOptions.Converters.Add(new JsonStringEnumConverter());
-            _onSaving = new SemaphoreSlim(1, 1);
-            FileName = Path.Join(Utilities.OperatingDirectory, "Configuration", $"{fileName}.json");
         }
 
         public BaseConfigurationHandler() : this(typeof(T).Name)
         {
-        }
+            
-
-        ~BaseConfigurationHandler()
-        {
-            _onSaving.Dispose();
         }
 
         public string FileName { get; }
 
-        public async Task BuildAsync()
+        public void Build()
         {
             try
             {
-                await using var fileStream = File.OpenRead(FileName);
+                var configContent = File.ReadAllText(FileName);
-                _configuration = await JsonSerializer.DeserializeAsync<T>(fileStream, _serializerOptions);
+                _configuration = JsonConvert.DeserializeObject<T>(configContent);
             }
 
             catch (FileNotFoundException)
@@ -67,23 +52,16 @@ namespace IW4MAdmin.Application.Misc
             }
         }
 
-        public async Task Save()
+        public Task Save()
         {
-            try
+            var settings = new JsonSerializerSettings()
             {
-                await _onSaving.WaitAsync();
+                Formatting = Formatting.Indented
+            };
+            settings.Converters.Add(new Newtonsoft.Json.Converters.StringEnumConverter());
 
-                await using var fileStream = File.Create(FileName);
+            var appConfigJSON = JsonConvert.SerializeObject(_configuration, settings);
-                await JsonSerializer.SerializeAsync(fileStream, _configuration, _serializerOptions);
+            return File.WriteAllTextAsync(FileName, appConfigJSON);
-            }
-
-            finally
-            {
-                if (_onSaving.CurrentCount == 0)
-                {
-                    _onSaving.Release(1);
-                }
-            }
         }
 
         public T Configuration()

Application/Misc/MasterCommunication.cs

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

Application/Misc/MetaService.cs

@@ -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)
+            var meta = new List<IClientMeta>();
-                .Select(async kvp => await kvp.Value[0](request)));
 
-            return metas.SelectMany(m => (IEnumerable<IClientMeta>)m)
+            foreach (var (type, actions) in _metaActions)
-                .OrderByDescending(m => m.When)
+            {
+                // information is not listed chronologically
+                if (type != MetaType.Information)
+                {
+                    var metaItems = await actions[0](request);
+                    meta.AddRange(metaItems);
+                }
+            }
+
+            return meta.OrderByDescending(_meta => _meta.When)
                 .Take(request.Count)
                 .ToList();
         }
 
         public async Task<IEnumerable<T>> GetRuntimeMeta<T>(ClientPaginationRequest request, MetaType metaType) where T : IClientMeta
         {
+            IEnumerable<T> meta;
             if (metaType == MetaType.Information)
             {
                 var allMeta = new List<T>();
 
-                var completedMeta = await Task.WhenAll(_metaActions[metaType].Select(async individualMetaRegistration =>
+                foreach (var individualMetaRegistration in _metaActions[metaType])
-                    (IEnumerable<T>)await individualMetaRegistration(request)));
+                {
-                
+                    allMeta.AddRange(await individualMetaRegistration(request));
-                allMeta.AddRange(completedMeta.SelectMany(meta => meta));
+                }
-                
+
                 return ProcessInformationMeta(allMeta);
             }
 
-            var meta = await _metaActions[metaType][0](request) as IEnumerable<T>;
+            else
+            {
+                meta = await _metaActions[metaType][0](request) as IEnumerable<T>;
+            }
 
             return meta;
         }

Application/Misc/PluginImporter.cs

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

Application/Misc/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();
+                        IEventParser eventParser = (IEventParser)_scriptEngine.GetValue("eventParser").ToObject();
-                        var rconParser = (IRConParser)_scriptEngine.GetValue("rconParser").ToObject();
+                        IRConParser rconParser = (IRConParser)_scriptEngine.GetValue("rconParser").ToObject();
                         manager.AdditionalEventParsers.Add(eventParser);
                         manager.AdditionalRConParsers.Add(rconParser);
                     }
                 }
 
-                catch (RuntimeBinderException)
+                catch (RuntimeBinderException) { }
-                {
-                    var configWrapper = new ScriptPluginConfigurationWrapper(Name, _scriptEngine);
-                    await configWrapper.InitializeAsync();
-                    _scriptEngine.SetValue("_configHandler", configWrapper);
-                    await OnLoadAsync(manager);
-                }
 
                 if (!firstRun)
                 {
@@ -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/TokenAuthentication.cs

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

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.9</PackageVersion>
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.10">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Npgsql" Version="6.0.2" />
+    <PackageReference Include="Npgsql" Version="4.1.7" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.2" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.4" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.1" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.2.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.10" />
+  </ItemGroup>
+  
+  <ItemGroup Condition="'$(Configuration)'=='Debug'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.10" />
   </ItemGroup>
   
 </Project>

Data/Helpers/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;"))
+                optionsBuilder.UseMySql("Server=127.0.0.1;Database=IW4MAdmin_Migration;Uid=root;Pwd=password;")
-                    .EnableDetailedErrors()
+                    .EnableDetailedErrors(true)
-                    .EnableSensitiveDataLogging();
+                    .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 =>
+        public float AverageHitOffset
-            (float) Math.Round(
+        {
-                HitLocations.Sum(c => c.HitOffsetAverage) /
+            get => (float)Math.Round(HitLocations.Sum(c => c.HitOffsetAverage) / Math.Max(1, HitLocations.Where(c => c.HitOffsetAverage > 0).Count()), 4);
-                Math.Max(1, HitLocations.Count(c => c.HitOffsetAverage > 0)), 4);
+        }
-
         [NotMapped]
         public int SessionKills { get; set; }
         [NotMapped]
@@ -83,26 +82,26 @@ namespace Data.Models.Client.Stats
             KillStreak = 0;
             DeathStreak = 0;
             LastScore = 0;
-            _sessionScores.Add(0);
+            SessionScores.Add(0);
             Team = 0;
         }
         [NotMapped]
         public int SessionScore
         {
-            set => _sessionScores[^1] = value;
+            set => SessionScores[SessionScores.Count - 1] = value;
 
             get
             {
-                lock (_sessionScores)
+                lock (SessionScores)
                 {
-                    return new List<int>(_sessionScores).Sum();
+                    return new List<int>(SessionScores).Sum();
                 }
             }
         }
         [NotMapped]
-        public int RoundScore => _sessionScores[^1];
+        public int RoundScore => SessionScores[SessionScores.Count - 1];
         [NotMapped]
-        private readonly List<int> _sessionScores = new List<int> { 0 };
+        private readonly List<int> SessionScores = new List<int>() { 0 };
         [NotMapped]
         public int Team { get; set; }
         [NotMapped]
@@ -110,21 +109,6 @@ namespace Data.Models.Client.Stats
         [NotMapped]
         public double SessionSPM { get; set; }
         [NotMapped]
-        public SemaphoreSlim ProcessingHit { get; }
+        public SemaphoreSlim ProcessingHit { get; private set; }
-
-        [NotMapped] public MatchData MatchData { get; } = new MatchData();
-    }
-
-    public class MatchData
-    {
-        public int Kills { get; set; }
-        public int Deaths { get; set; }
-        public double Kdr => Deaths == 0 ? Kills : Math.Round(Kills / (double) Deaths, 2);
-
-        public void StartNewMatch()
-        {
-            Kills = 0;
-            Deaths = 0;
-        }
     }
 }

Data/Models/Vector3.cs

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

DeploymentFiles/UpdateIW4MAdmin.ps1

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

DeploymentFiles/UpdateIW4MAdmin.sh

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

DeploymentFiles/deployment-pipeline.yml

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

GameFiles/IW4x/userraw/scripts/_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.11.21.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.11.21.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 LiveRadarConfiguration _config;
-        private readonly IConfigurationHandler<LiveRadarConfiguration> _configurationHandler;
 
         public RadarController(IManager manager, IConfigurationHandlerFactory configurationHandlerFactory) : base(manager)
         {
             _manager = manager;
-            _configurationHandler =
+            _config = configurationHandlerFactory.GetConfigurationHandler<LiveRadarConfiguration>("LiveRadarConfiguration").Configuration() ?? new LiveRadarConfiguration();
-                configurationHandlerFactory.GetConfigurationHandler<LiveRadarConfiguration>("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.11.21.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.11.21.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.11.21.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/ScriptPlugins/ParserCSGO.js

@@ -57,25 +57,6 @@ 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;

Plugins/ScriptPlugins/ParserCSGOSM.js

@@ -3,7 +3,7 @@ let eventParser;
 
 const plugin = {
     author: 'RaidMax',
-    version: 0.5,
+    version: 0.4,
     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,25 +57,6 @@ 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;

Plugins/ScriptPlugins/ParserPlutoniumT4.js

@@ -3,8 +3,8 @@ var eventParser;
 
 var plugin = {
     author: 'RaidMax, Chase',
-    version: 0.4,
+    version: 0.3,
-    name: 'Plutonium T4 MP Parser',
+    name: 'Plutonium T4 Parser',
     isParser: true,
 
     onEventAsync: function (gameEvent, server) {
@@ -20,16 +20,15 @@ var plugin = {
         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/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

@@ -22,7 +22,7 @@ namespace Stats.Client
 
         private readonly IDataValueCache<EFClientStatistics, Dictionary<long, Extensions.LogParams>>
             _distributionCache;
-
+        
         private readonly IDataValueCache<EFClientStatistics, double>
             _maxZScoreCache;
 
@@ -48,13 +48,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 +63,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)
+                    .MaxAsync(s => (double?)s.ZScore, token);
-                    .Select(group =>
-                        group.Sum(stat => stat.ZScore * stat.TimePlayed) / group.Sum(stat => stat.TimePlayed))
-                    .MaxAsync(avgZScore => (double?) avgZScore, 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 +138,6 @@ namespace Stats.Client
             {
                 return 0.0;
             }
-
             var zScore = (Math.Log(value) - sdParams.Mean) / sdParams.Sigma;
             return zScore;
         }
@@ -151,7 +145,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

@@ -17,6 +17,7 @@ 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)
@@ -79,4 +81,4 @@ namespace IW4MAdmin.Plugins.Stats.Commands
                 .Prepend(Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_STATS_COMMANDS_MOSTKILLS_HEADER"]);
         }
     }
-}
+}

Plugins/Stats/Commands/MostPlayedCommand.cs

@@ -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/ViewStats.cs

@@ -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)))
@@ -90,7 +90,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)))

Plugins/Stats/Helpers/StatManager.cs

@@ -19,10 +19,7 @@ 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;
@@ -38,7 +35,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 +44,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 +72,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 +84,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 +118,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 +214,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 +432,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 +511,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 +552,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 +653,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 +871,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 +879,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 +937,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 +946,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 +1154,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 +1171,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 +1191,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 +1265,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 +1420,6 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
             {
                 session.stat?.StartNewSession();
                 session.detection?.OnMapChange();
-                session.stat?.MatchData?.StartNewMatch();
             }
         }
 
@@ -1577,4 +1529,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,9 +12,12 @@ 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;
@@ -171,7 +175,6 @@ namespace IW4MAdmin.Plugins.Stats
 
         public async Task OnLoadAsync(IManager manager)
         {
-            await Config.BuildAsync();
             // load custom configuration
             if (Config.Configuration() == null)
             {
@@ -191,8 +194,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 +256,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 +454,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.11.21.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());
@@ -95,7 +93,7 @@ namespace IW4MAdmin.Plugins.Welcome
                 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 +105,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 +124,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.11.21.1" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>

README.md

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

SharedLibraryCore/BaseController.cs

@@ -1,35 +1,38 @@
-using System;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.Cookies;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Dtos;
+using SharedLibraryCore.Interfaces;
+using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Data.Context;
 using Data.Models;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
 using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Dtos;
-using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.Localization;
 
 namespace SharedLibraryCore
 {
     public class BaseController : Controller
     {
         /// <summary>
-        ///     life span in months
+        /// life span in months
         /// </summary>
         private const int COOKIE_LIFESPAN = 3;
 
+        public IManager Manager { get; private set; }
+        protected readonly DatabaseContext Context;
+        protected bool Authorized { get; set; }
+        protected Localization.TranslationLookup Localization { get; private set; }
+        protected EFClient Client { get; private set; }
         private static readonly byte[] LocalHost = { 127, 0, 0, 1 };
         private static string SocialLink;
         private static string SocialTitle;
-        protected readonly DatabaseContext Context;
         protected List<Page> Pages;
+        protected ApplicationConfiguration AppConfig { get; }
 
         public BaseController(IManager manager)
         {
@@ -43,7 +46,7 @@ namespace SharedLibraryCore
                 SocialTitle = AppConfig.SocialLinkTitle;
             }
 
-
+            
             Pages = Manager.GetPageList().Pages
                 .Select(page => new Page
                 {
@@ -56,30 +59,23 @@ namespace SharedLibraryCore
             ViewBag.EnableColorCodes = AppConfig.EnableColorCodes;
             ViewBag.Language = Utilities.CurrentLocalization.Culture.TwoLetterISOLanguageName;
 
-            Client ??= new EFClient
+            Client ??= new EFClient()
             {
                 ClientId = -1,
-                Level = Data.Models.Client.EFClient.Permission.Banned,
+                Level = EFClient.Permission.Banned,
-                CurrentAlias = new EFAlias { Name = "Webfront Guest" }
+                CurrentAlias = new EFAlias() { Name = "Webfront Guest" }
             };
         }
 
-        public IManager Manager { get; }
-        protected bool Authorized { get; set; }
-        protected TranslationLookup Localization { get; }
-        protected EFClient Client { get; }
-        protected ApplicationConfiguration AppConfig { get; }
-
         protected async Task SignInAsync(ClaimsPrincipal claimsPrinciple)
         {
-            await HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, claimsPrinciple,
+            await HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, claimsPrinciple, new AuthenticationProperties()
-                new AuthenticationProperties
+            {
-                {
+                AllowRefresh = true,
-                    AllowRefresh = true,
+                ExpiresUtc = DateTime.UtcNow.AddMonths(COOKIE_LIFESPAN),
-                    ExpiresUtc = DateTime.UtcNow.AddMonths(COOKIE_LIFESPAN),
+                IsPersistent = true,
-                    IsPersistent = true,
+                IssuedUtc = DateTime.UtcNow
-                    IssuedUtc = DateTime.UtcNow
+            });
-                });
         }
 
         public override void OnActionExecuting(ActionExecutingContext context)
@@ -88,27 +84,21 @@ namespace SharedLibraryCore
             {
                 try
                 {
-                    var clientId =
+                    int clientId = Convert.ToInt32(User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid)?.Value ?? "-1");
-                        Convert.ToInt32(User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid)?.Value ?? "-1");
 
                     if (clientId > 0)
                     {
                         Client.ClientId = clientId;
-                        Client.NetworkId = clientId == 1
+                        Client.NetworkId = clientId == 1 ? 0 : User.Claims.First(_claim => _claim.Type == ClaimTypes.PrimarySid).Value.ConvertGuidToLong(System.Globalization.NumberStyles.HexNumber);
-                            ? 0
+                        Client.Level = (EFClient.Permission)Enum.Parse(typeof(EFClient.Permission), User.Claims.First(c => c.Type == ClaimTypes.Role).Value);
-                            : User.Claims.First(_claim => _claim.Type == ClaimTypes.PrimarySid).Value
+                        Client.CurrentAlias = new EFAlias() { Name = User.Claims.First(c => c.Type == ClaimTypes.NameIdentifier).Value };
-                                .ConvertGuidToLong(NumberStyles.HexNumber);
-                        Client.Level = (Data.Models.Client.EFClient.Permission)Enum.Parse(
-                            typeof(Data.Models.Client.EFClient.Permission),
-                            User.Claims.First(c => c.Type == ClaimTypes.Role).Value);
-                        Client.CurrentAlias = new EFAlias
-                            { Name = User.Claims.First(c => c.Type == ClaimTypes.NameIdentifier).Value };
                         Authorized = Client.ClientId >= 0;
                     }
                 }
 
                 catch (InvalidOperationException)
                 {
+
                 }
 
                 catch (KeyNotFoundException)
@@ -122,25 +112,25 @@ namespace SharedLibraryCore
             else if (!HttpContext.Request.Headers.ContainsKey("X-Forwarded-For"))
             {
                 Client.ClientId = 1;
-                Client.Level = Data.Models.Client.EFClient.Permission.Console;
+                Client.Level = EFClient.Permission.Console;
-                Client.CurrentAlias = new EFAlias { Name = "IW4MAdmin" };
+                Client.CurrentAlias = new EFAlias() { Name = "IW4MAdmin" };
                 Authorized = true;
                 var claims = new[]
                 {
                     new Claim(ClaimTypes.NameIdentifier, Client.CurrentAlias.Name),
-                    new Claim(ClaimTypes.Role, Client.Level.ToString()),
+                   new Claim(ClaimTypes.Role, Client.Level.ToString()),
-                    new Claim(ClaimTypes.Sid, Client.ClientId.ToString()),
+                   new Claim(ClaimTypes.Sid, Client.ClientId.ToString()),
-                    new Claim(ClaimTypes.PrimarySid, Client.NetworkId.ToString("X"))
+                   new Claim(ClaimTypes.PrimarySid, Client.NetworkId.ToString("X"))
                 };
                 var claimsIdentity = new ClaimsIdentity(claims, "login");
                 SignInAsync(new ClaimsPrincipal(claimsIdentity)).Wait();
             }
 
             var communityName = AppConfig.CommunityInformation?.Name;
-            var shouldUseCommunityName = !string.IsNullOrWhiteSpace(communityName)
+            var shouldUseCommunityName = !string.IsNullOrWhiteSpace(communityName) 
-                                         && !communityName.Contains("IW4MAdmin")
+                                         && !communityName.Contains("IW4MAdmin") 
                                          && AppConfig.CommunityInformation.IsEnabled;
-
+            
             ViewBag.Authorized = Authorized;
             ViewBag.Url = AppConfig.WebfrontUrl;
             ViewBag.User = Client;
@@ -160,4 +150,4 @@ namespace SharedLibraryCore
             base.OnActionExecuting(context);
         }
     }
-}
+}

SharedLibraryCore/Command.cs

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

SharedLibraryCore/Commands/AddClientTagCommand.cs

@@ -1,8 +1,8 @@
-using System.Threading.Tasks;
+using SharedLibraryCore.Configuration;
-using Data.Models;
+using SharedLibraryCore.Database.Models;
-using Data.Models.Client;
-using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Interfaces;
+using System.Threading.Tasks;
+using Data.Models;
 
 namespace SharedLibraryCore.Commands
 {
@@ -10,8 +10,7 @@ namespace SharedLibraryCore.Commands
     {
         private readonly IMetaService _metaService;
 
-        public AddClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) :
+        public AddClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(config, layout)
-            base(config, layout)
         {
             Name = "addclienttag";
             Description = layout["COMMANDS_ADD_CLIENT_TAG_DESC"];
@@ -20,7 +19,7 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = false;
             Arguments = new[]
             {
-                new CommandArgument
+                new CommandArgument()
                 {
                     Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
                     Required = true
@@ -32,8 +31,8 @@ namespace SharedLibraryCore.Commands
 
         public override async Task ExecuteAsync(GameEvent gameEvent)
         {
-            await _metaService.AddPersistentMeta(EFMeta.ClientTagName, gameEvent.Data);
+                await _metaService.AddPersistentMeta(EFMeta.ClientTagName, gameEvent.Data);
-            gameEvent.Origin.Tell(_translationLookup["COMMANDS_ADD_CLIENT_TAG_SUCCESS"].FormatExt(gameEvent.Data));
+                gameEvent.Origin.Tell(_translationLookup["COMMANDS_ADD_CLIENT_TAG_SUCCESS"].FormatExt(gameEvent.Data));
         }
     }
-}
+}

SharedLibraryCore/Commands/CommandArgument.cs

@@ -1,18 +1,18 @@
 namespace SharedLibraryCore.Commands
 {
     /// <summary>
-    ///     Holds information about command args
+    /// Holds information about command args
     /// </summary>
     public class CommandArgument
     {
         /// <summary>
-        ///     Name of the argument
+        /// Name of the argument
         /// </summary>
         public string Name { get; set; }
 
         /// <summary>
-        ///     Indicates if the argument is required
+        /// Indicates if the argument is required
         /// </summary>
         public bool Required { get; set; }
     }
-}
+}

SharedLibraryCore/Commands/CommandExtensions.cs

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

SharedLibraryCore/Commands/CommandProcessing.cs

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

SharedLibraryCore/Commands/ListClientTags.cs

@@ -1,25 +1,27 @@
-using System.Linq;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Data.Models;
-using Data.Models.Client;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
 
 namespace SharedLibraryCore.Commands
 {
+
     public class ListClientTags : Command
     {
         private readonly IMetaService _metaService;
 
-        public ListClientTags(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(
+        public ListClientTags(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(config, layout)
-            config, layout)
         {
             Name = "listclienttags";
             Description = layout["COMMANDS_LIST_CLIENT_TAGS_DESC"];
             Alias = "lct";
             Permission = EFClient.Permission.Owner;
             RequiresTarget = false;
-
+            
             _metaService = metaService;
         }
 
@@ -29,4 +31,4 @@ namespace SharedLibraryCore.Commands
             gameEvent.Origin.Tell(tags.Select(tag => tag.Value));
         }
     }
-}
+}

SharedLibraryCore/Commands/PrivateMessageAdminsCommand.cs

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

SharedLibraryCore/Commands/RemoveClientTagCommand.cs

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

SharedLibraryCore/Commands/RequestTokenCommand.cs

@@ -1,12 +1,12 @@
-using System.Threading.Tasks;
+using SharedLibraryCore.Configuration;
-using Data.Models.Client;
+using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Interfaces;
+using System.Threading.Tasks;
 
 namespace SharedLibraryCore.Commands
 {
     /// <summary>
-    ///     Generates a token for use in webfront login
+    /// Generates a token for use in webfront login
     /// </summary>
     public class RequestTokenCommand : Command
     {
@@ -22,10 +22,9 @@ namespace SharedLibraryCore.Commands
         public override Task ExecuteAsync(GameEvent E)
         {
             var state = E.Owner.Manager.TokenAuthenticator.GenerateNextToken(E.Origin.NetworkId);
-            E.Origin.Tell(string.Format(_translationLookup["COMMANDS_GENERATETOKEN_SUCCESS"], state.Token,
+            E.Origin.Tell(string.Format(_translationLookup["COMMANDS_GENERATETOKEN_SUCCESS"], state.Token, $"{state.RemainingTime} {_translationLookup["GLOBAL_MINUTES"]}", E.Origin.ClientId));
-                $"{state.RemainingTime} {_translationLookup["GLOBAL_MINUTES"]}", E.Origin.ClientId));
 
             return Task.CompletedTask;
         }
     }
-}
+}

SharedLibraryCore/Commands/RunAsCommand.cs

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

SharedLibraryCore/Commands/SetClientTagCommand.cs

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

SharedLibraryCore/Commands/UnlinkClientCommand.cs

@@ -1,16 +1,16 @@
-using System.Threading.Tasks;
+using SharedLibraryCore.Configuration;
-using Data.Models.Client;
+using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Interfaces;
+using System.Threading.Tasks;
 
 namespace SharedLibraryCore.Commands
 {
     /// <summary>
-    ///     Provides a way for administrators to "unlink" linked accounts
+    /// Provides a way for administrators to "unlink" linked accounts
-    ///     This problem is common in IW4x where the client identifier is a file
+    /// This problem is common in IW4x where the client identifier is a file
-    ///     that is commonly transmitted when uploading and sharing the game files
+    /// that is commonly transmitted when uploading and sharing the game files
-    ///     This command creates a new link and assigns the guid, and all aliases with the current IP
+    /// This command creates a new link and assigns the guid, and all aliases with the current IP
-    ///     associated to the provided client ID to the new link
+    /// associated to the provided client ID to the new link
     /// </summary>
     public class UnlinkClientCommand : Command
     {
@@ -29,4 +29,4 @@ namespace SharedLibraryCore.Commands
             E.Origin.Tell(_translationLookup["COMMANDS_UNLINK_CLIENT_SUCCESS"].FormatExt(E.Target));
         }
     }
-}
+}

SharedLibraryCore/Commands/UnsetClientTagCommand.cs

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

SharedLibraryCore/Configuration/ApplicationConfiguration.cs

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

SharedLibraryCore/Configuration/Attributes/ConfigurationIgnore.cs

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

SharedLibraryCore/Configuration/Attributes/ConfigurationLinked.cs

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

SharedLibraryCore/Configuration/Attributes/ConfigurationOptional.cs

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

SharedLibraryCore/Configuration/Attributes/LocalizedDisplayName.cs

@@ -1,11 +1,13 @@
-using System.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
 
 namespace SharedLibraryCore.Configuration.Attributes
 {
-    internal class LocalizedDisplayName : DisplayNameAttribute
+    class LocalizedDisplayName : DisplayNameAttribute
     {
         private readonly string _localizationKey;
-
         public LocalizedDisplayName(string localizationKey)
         {
             _localizationKey = localizationKey;
@@ -13,4 +15,4 @@ namespace SharedLibraryCore.Configuration.Attributes
 
         public override string DisplayName => Utilities.CurrentLocalization.LocalizationIndex[_localizationKey];
     }
-}
+}

SharedLibraryCore/Configuration/CommandConfiguration.cs

@@ -1,29 +1,28 @@
-using System;
+using SharedLibraryCore.Interfaces;
+using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
-using SharedLibraryCore.Interfaces;
 
 namespace SharedLibraryCore.Configuration
 {
     /// <summary>
-    ///     Basic command configuration
+    /// Basic command configuration
     /// </summary>
     public class CommandConfiguration : IBaseConfiguration
     {
         /// <summary>
-        ///     Dict of command class names mapped to configurable properties
+        /// Dict of command class names mapped to configurable properties
         /// </summary>
-        public Dictionary<string, CommandProperties> Commands { get; set; } =
+        public Dictionary<string, CommandProperties> Commands { get; set; } = new Dictionary<string, CommandProperties>();
-            new Dictionary<string, CommandProperties>();
 
         /// <summary>
-        ///     prefix indicated the chat message is a command
+        /// prefix indicated the chat message is a command
         /// </summary>
         [JsonIgnore]
         public string CommandPrefix { get; set; }
 
         /// <summary>
-        ///     prefix indicating that the chat message is a broadcast command
+        /// prefix indicating that the chat message is a broadcast command
         /// </summary>
         [JsonIgnore]
         public string BroadcastCommandPrefix { get; set; }
@@ -33,9 +32,6 @@ namespace SharedLibraryCore.Configuration
             throw new NotImplementedException();
         }
 
-        public string Name()
+        public string Name() => nameof(CommandConfiguration);
-        {
-            return nameof(CommandConfiguration);
-        }
     }
-}
+}

SharedLibraryCore/Configuration/CommandProperties.cs

@@ -6,35 +6,35 @@ using static SharedLibraryCore.Server;
 namespace SharedLibraryCore.Configuration
 {
     /// <summary>
-    ///     Config driven command properties
+    /// Config driven command properties
     /// </summary>
     public class CommandProperties
     {
         /// <summary>
-        ///     Specifies the command name
+        /// Specifies the command name
         /// </summary>
         public string Name { get; set; }
 
         /// <summary>
-        ///     Alias of this command
+        /// Alias of this command
         /// </summary>
         public string Alias { get; set; }
 
         /// <summary>
-        ///     Specifies the minimum permission level needed to execute the
+        /// Specifies the minimum permission level needed to execute the 
         /// </summary>
         [JsonConverter(typeof(StringEnumConverter))]
         public Permission MinimumPermission { get; set; }
 
         /// <summary>
-        ///     Indicates if the command can be run by another user (impersonation)
+        /// Indicates if the command can be run by another user (impersonation)
         /// </summary>
         public bool AllowImpersonation { get; set; }
 
         /// <summary>
-        ///     Specifies the games supporting the functionality of the command
+        /// Specifies the games supporting the functionality of the command
         /// </summary>
         [JsonProperty(ItemConverterType = typeof(StringEnumConverter))]
         public Game[] SupportedGames { get; set; } = new Game[0];
     }
-}
+}

SharedLibraryCore/Configuration/CommunityInformationConfiguration.cs

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

SharedLibraryCore/Configuration/DefaultSettings.cs

@@ -7,19 +7,12 @@ namespace SharedLibraryCore.Configuration
         public string[] AutoMessages { get; set; }
         public string[] GlobalRules { get; set; }
         public MapConfiguration[] Maps { get; set; }
-        public GametypeConfiguration[] Gametypes { get; set; }
+        public QuickMessageConfiguration[] QuickMessages {get; set;}
-        public QuickMessageConfiguration[] QuickMessages { get; set; }
         public string[] DisallowedClientNames { get; set; }
         public GameStringConfiguration GameStrings { get; set; }
 
-        public IBaseConfiguration Generate()
+        public IBaseConfiguration Generate() => this;
-        {
-            return this;
-        }
 
-        public string Name()
+        public string Name() => "DefaultConfiguration";
-        {
-            return "DefaultConfiguration";
-        }
     }
-}
+}

SharedLibraryCore/Configuration/Extensions/ConfigurationExtensions.cs

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

SharedLibraryCore/Configuration/GametypeConfiguration.cs

@@ -1,8 +0,0 @@
-namespace SharedLibraryCore.Configuration
-{
-    public class GametypeConfiguration
-    {
-        public Server.Game Game { get; set; }
-        public Gametype[] Gametypes { get; set; }
-    }
-}

SharedLibraryCore/Configuration/MapConfiguration.cs

@@ -1,8 +1,16 @@
-namespace SharedLibraryCore.Configuration
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using static SharedLibraryCore.Server;
+
+namespace SharedLibraryCore.Configuration
 {
     public class MapConfiguration
     {
-        public Server.Game Game { get; set; }
+        public Game Game { get; set; }
-        public Map[] Maps { get; set; }
+        public List<Map> Maps { get; set; }
     }
-}
+}

SharedLibraryCore/Configuration/QuickMessageConfiguration.cs

@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Text;
 using static SharedLibraryCore.Server;
 
 namespace SharedLibraryCore.Configuration
@@ -8,4 +10,4 @@ namespace SharedLibraryCore.Configuration
         public Game Game { get; set; }
         public Dictionary<string, string> Messages { get; set; }
     }
-}
+}