fix IW4x regression error with alternative encodings

add parser selection to server config setup

.gitignore

@@ -232,3 +232,4 @@ bootstrap-custom.min.css
 launchSettings.json
 /VpnDetectionPrivate.js
 /Plugins/ScriptPlugins/VpnDetectionPrivate.js
+**/Master/env_master

Application/API/Master/ApiServer.cs

@@ -13,6 +13,8 @@ namespace IW4MAdmin.Application.API.Master
         public string IPAddress { get; set; }
         [JsonProperty("port")]
         public short Port { get; set; }
+        [JsonProperty("version")]
+        public string Version { get; set; }
         [JsonProperty("gametype")]
         public string Gametype { get; set; }
         [JsonProperty("map")]

Application/API/Master/Heartbeat.cs

@@ -39,6 +39,7 @@ namespace IW4MAdmin.Application.API.Master
                             {
                                 ClientNum = s.ClientNum,
                                 Game = s.GameName.ToString(),
+                                Version = s.Version,
                                 Gametype = s.Gametype,
                                 Hostname = s.Hostname,
                                 Map = s.CurrentMap.Name,

Application/Application.csproj

@@ -6,12 +6,12 @@
     <RuntimeFrameworkVersion>2.1.5</RuntimeFrameworkVersion>
     <MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
     <PackageId>RaidMax.IW4MAdmin.Application</PackageId>
-    <Version>2.2.2.0</Version>
+    <Version>2.2.4.4</Version>
     <Authors>RaidMax</Authors>
     <Company>Forever None</Company>
     <Product>IW4MAdmin</Product>
     <Description>IW4MAdmin is a complete server administration tool for IW4x and most Call of Duty® dedicated server</Description>
-    <Copyright>2018</Copyright>
+    <Copyright>2019</Copyright>
     <PackageLicenseUrl>https://github.com/RaidMax/IW4M-Admin/blob/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://raidmax.org/IW4MAdmin</PackageProjectUrl>
     <RepositoryUrl>https://github.com/RaidMax/IW4M-Admin</RepositoryUrl>
@@ -31,8 +31,8 @@
   <PropertyGroup>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <TieredCompilation>true</TieredCompilation>
-    <AssemblyVersion>2.2.2.0</AssemblyVersion>
-    <FileVersion>2.2.2.0</FileVersion>
+    <AssemblyVersion>2.2.4.4</AssemblyVersion>
+    <FileVersion>2.2.4.4</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

Application/ApplicationManager.cs

@@ -1,4 +1,6 @@
 using IW4MAdmin.Application.API.Master;
+using IW4MAdmin.Application.EventParsers;
+using IW4MAdmin.Application.RconParsers;
 using SharedLibraryCore;
 using SharedLibraryCore.Commands;
 using SharedLibraryCore.Configuration;
@@ -34,6 +36,9 @@ namespace IW4MAdmin.Application
         public DateTime StartTime { get; private set; }
         public string Version => Assembly.GetEntryAssembly().GetName().Version.ToString();
 
+        public IList<IRConParser> AdditionalRConParsers { get; }
+        public IList<IEventParser> AdditionalEventParsers { get; }
+
         static ApplicationManager Instance;
         readonly List<AsyncStatus> TaskStatuses;
         List<Command> Commands;
@@ -61,6 +66,8 @@ namespace IW4MAdmin.Application
             StartTime = DateTime.UtcNow;
             OnQuit = new ManualResetEventSlim();
             PageList = new PageList();
+            AdditionalEventParsers = new List<IEventParser>();
+            AdditionalRConParsers = new List<IRConParser>();
             OnServerEvent += OnGameEvent;
             OnServerEvent += EventApi.OnGameEvent;
         }
@@ -203,13 +210,23 @@ namespace IW4MAdmin.Application
         {
             Running = true;
 
-            #region DATABASE
-            using (var db = new DatabaseContext(GetApplicationSettings().Configuration()?.ConnectionString, GetApplicationSettings().Configuration()?.DatabaseProvider))
-            {
-                await new ContextSeed(db).Seed();
-            }
 
-            PrivilegedClients = (await ClientSvc.GetPrivilegedClients()).ToDictionary(_client => _client.ClientId);
+            #region PLUGINS
+            SharedLibraryCore.Plugins.PluginImporter.Load(this);
+
+            foreach (var Plugin in SharedLibraryCore.Plugins.PluginImporter.ActivePlugins)
+            {
+                try
+                {
+                    await Plugin.OnLoadAsync(this);
+                }
+
+                catch (Exception ex)
+                {
+                    Logger.WriteError($"{Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_PLUGIN"]} {Plugin.Name}");
+                    Logger.WriteDebug(ex.GetExceptionInfo());
+                }
+            }
             #endregion
 
             #region CONFIG
@@ -234,7 +251,18 @@ namespace IW4MAdmin.Application
 
                     do
                     {
-                        newConfig.Servers.Add((ServerConfiguration)new ServerConfiguration().Generate());
+                        var serverConfig = new ServerConfiguration();
+                        foreach (var parser in AdditionalRConParsers)
+                        {
+                            serverConfig.AddRConParser(parser);
+                        }
+
+                        foreach (var parser in AdditionalEventParsers)
+                        {
+                            serverConfig.AddEventParser(parser);
+                        }
+
+                        newConfig.Servers.Add((ServerConfiguration)serverConfig.Generate());
                     } while (Utilities.PromptBool(Utilities.CurrentLocalization.LocalizationIndex["SETUP_SERVER_SAVE"]));
 
                     config = newConfig;
@@ -266,22 +294,15 @@ namespace IW4MAdmin.Application
             Utilities.EncodingType = Encoding.GetEncoding(!string.IsNullOrEmpty(config.CustomParserEncoding) ? config.CustomParserEncoding : "windows-1252");
 
             #endregion
-            #region PLUGINS
-            SharedLibraryCore.Plugins.PluginImporter.Load(this);
 
-            foreach (var Plugin in SharedLibraryCore.Plugins.PluginImporter.ActivePlugins)
+            #region DATABASE
+            using (var db = new DatabaseContext(GetApplicationSettings().Configuration()?.ConnectionString,
+                GetApplicationSettings().Configuration()?.DatabaseProvider))
             {
-                try
-                {
-                    await Plugin.OnLoadAsync(this);
-                }
-
-                catch (Exception ex)
-                {
-                    Logger.WriteError($"{Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_PLUGIN"]} {Plugin.Name}");
-                    Logger.WriteDebug(ex.GetExceptionInfo());
-                }
+                await new ContextSeed(db).Seed();
             }
+
+            PrivilegedClients = (await ClientSvc.GetPrivilegedClients()).ToDictionary(_client => _client.ClientId);
             #endregion
 
             #region COMMANDS
@@ -551,5 +572,15 @@ namespace IW4MAdmin.Application
         {
             return PageList;
         }
+
+        public IRConParser GenerateDynamicRConParser()
+        {
+            return new DynamicRConParser();
+        }
+
+        public IEventParser GenerateDynamicEventParser()
+        {
+            return new DynamicEventParser();
+        }
     }
 }

Application/EventParsers/BaseEventParser.cs

@@ -0,0 +1,300 @@
+using SharedLibraryCore;
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Interfaces;
+using System;
+using System.Linq;
+using System.Text.RegularExpressions;
+
+namespace IW4MAdmin.Application.EventParsers
+{
+    class BaseEventParser : IEventParser
+    {
+        public BaseEventParser()
+        {
+            Configuration = new DynamicEventParserConfiguration()
+            {
+                GameDirectory = "userraw",
+            };
+
+            Configuration.Say.Pattern = @"^(say|sayteam);(.{8,32});([0-9]+);(.+);(.*)$";
+            Configuration.Say.AddMapping(ParserRegex.GroupType.EventType, 1);
+            Configuration.Say.AddMapping(ParserRegex.GroupType.OriginNetworkId, 2);
+            Configuration.Say.AddMapping(ParserRegex.GroupType.OriginClientNumber, 3);
+            Configuration.Say.AddMapping(ParserRegex.GroupType.OriginName, 4);
+            Configuration.Say.AddMapping(ParserRegex.GroupType.Message, 5);
+
+            Configuration.Quit.Pattern = @"^(Q);(.{8,32}|bot[0-9]+);([0-9]+);(.*)$";
+            Configuration.Quit.AddMapping(ParserRegex.GroupType.EventType, 1);
+            Configuration.Quit.AddMapping(ParserRegex.GroupType.OriginNetworkId, 2);
+            Configuration.Quit.AddMapping(ParserRegex.GroupType.OriginClientNumber, 3);
+            Configuration.Quit.AddMapping(ParserRegex.GroupType.OriginName, 4);
+
+            Configuration.Join.Pattern = @"^(J);(.{8,32}|bot[0-9]+);([0-9]+);(.*)$";
+            Configuration.Join.AddMapping(ParserRegex.GroupType.EventType, 1);
+            Configuration.Join.AddMapping(ParserRegex.GroupType.OriginNetworkId, 2);
+            Configuration.Join.AddMapping(ParserRegex.GroupType.OriginClientNumber, 3);
+            Configuration.Join.AddMapping(ParserRegex.GroupType.OriginName, 4);
+
+            Configuration.Damage.Pattern = @"^(D);([A-Fa-f0-9_]{8,32}|bot[0-9]+);(-?[0-9]+);(axis|allies|world);(.{1,24});([A-Fa-f0-9_]{8,32}|bot[0-9]+)?;-?([0-9]+);(axis|allies|world);(.{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);
+            Configuration.Damage.AddMapping(ParserRegex.GroupType.TargetTeam, 4);
+            Configuration.Damage.AddMapping(ParserRegex.GroupType.TargetName, 5);
+            Configuration.Damage.AddMapping(ParserRegex.GroupType.OriginNetworkId, 6);
+            Configuration.Damage.AddMapping(ParserRegex.GroupType.OriginClientNumber, 7);
+            Configuration.Damage.AddMapping(ParserRegex.GroupType.OriginTeam, 8);
+            Configuration.Damage.AddMapping(ParserRegex.GroupType.OriginName, 9);
+            Configuration.Damage.AddMapping(ParserRegex.GroupType.Weapon, 10);
+            Configuration.Damage.AddMapping(ParserRegex.GroupType.Damage, 11);
+            Configuration.Damage.AddMapping(ParserRegex.GroupType.MeansOfDeath, 12);
+            Configuration.Damage.AddMapping(ParserRegex.GroupType.HitLocation, 13);
+
+            Configuration.Kill.Pattern = @"^(K);([A-Fa-f0-9_]{8,32}|bot[0-9]+);(-?[0-9]+);(axis|allies|world);(.{1,24});([A-Fa-f0-9_]{8,32}|bot[0-9]+)?;-?([0-9]+);(axis|allies|world);(.{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);
+            Configuration.Kill.AddMapping(ParserRegex.GroupType.TargetTeam, 4);
+            Configuration.Kill.AddMapping(ParserRegex.GroupType.TargetName, 5);
+            Configuration.Kill.AddMapping(ParserRegex.GroupType.OriginNetworkId, 6);
+            Configuration.Kill.AddMapping(ParserRegex.GroupType.OriginClientNumber, 7);
+            Configuration.Kill.AddMapping(ParserRegex.GroupType.OriginTeam, 8);
+            Configuration.Kill.AddMapping(ParserRegex.GroupType.OriginName, 9);
+            Configuration.Kill.AddMapping(ParserRegex.GroupType.Weapon, 10);
+            Configuration.Kill.AddMapping(ParserRegex.GroupType.Damage, 11);
+            Configuration.Kill.AddMapping(ParserRegex.GroupType.MeansOfDeath, 12);
+            Configuration.Kill.AddMapping(ParserRegex.GroupType.HitLocation, 13);
+        }
+
+        public IEventParserConfiguration Configuration { get; set; }
+
+        public string Version { get; set; } = "IW4x (v0.6.0)";
+
+        public virtual GameEvent GetEvent(Server server, string logLine)
+        {
+            logLine = Regex.Replace(logLine, @"([0-9]+:[0-9]+ |^[0-9]+ )", "").Trim();
+            string[] lineSplit = logLine.Split(';');
+            string eventType = lineSplit[0];
+
+            if (eventType == "JoinTeam")
+            {
+                var origin = server.GetClientsAsList()
+                    .FirstOrDefault(c => c.NetworkId == lineSplit[1].ConvertLong());
+
+                return new GameEvent()
+                {
+                    Type = GameEvent.EventType.JoinTeam,
+                    Data = eventType,
+                    Origin = origin,
+                    Owner = server
+                };
+            }
+
+            if (eventType == "say" || eventType == "sayteam")
+            {
+                var matchResult = Regex.Match(logLine, Configuration.Say.Pattern);
+
+                if (matchResult.Success)
+                {
+                    string message = matchResult
+                        .Groups[Configuration.Say.GroupMapping[ParserRegex.GroupType.Message]]
+                        .ToString()
+                        .Replace("\x15", "")
+                        .Trim();
+
+                    var origin = server.GetClientsAsList()
+                        .First(c => c.NetworkId == matchResult.Groups[Configuration.Say.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString().ConvertLong());
+
+                    if (message[0] == '!' || message[0] == '@')
+                    {
+                        return new GameEvent()
+                        {
+                            Type = GameEvent.EventType.Command,
+                            Data = message,
+                            Origin = origin,
+                            Owner = server,
+                            Message = message
+                        };
+                    }
+
+                    return new GameEvent()
+                    {
+                        Type = GameEvent.EventType.Say,
+                        Data = message,
+                        Origin = origin,
+                        Owner = server,
+                        Message = message
+                    };
+                }
+            }
+
+            if (eventType == "K")
+            {
+                if (!server.CustomCallback)
+                {
+                    var match = Regex.Match(logLine, Configuration.Kill.Pattern);
+
+                    if (match.Success)
+                    {
+                        var origin = server.GetClientsAsList()
+                                .First(c => c.NetworkId == match.Groups[Configuration.Kill.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString().ConvertLong());
+                        var target = server.GetClientsAsList()
+                            .First(c => c.NetworkId == match.Groups[Configuration.Kill.GroupMapping[ParserRegex.GroupType.TargetNetworkId]].ToString().ConvertLong());
+
+
+                        return new GameEvent()
+                        {
+                            Type = GameEvent.EventType.Kill,
+                            Data = logLine,
+                            Origin = origin,
+                            Target = target,
+                            Owner = server
+                        };
+                    }
+                }
+            }
+
+            if (eventType == "ScriptKill")
+            {
+                var origin = server.GetClientsAsList().First(c => c.NetworkId == lineSplit[1].ConvertLong());
+                var target = server.GetClientsAsList().First(c => c.NetworkId == lineSplit[2].ConvertLong());
+                return new GameEvent()
+                {
+                    Type = GameEvent.EventType.ScriptKill,
+                    Data = logLine,
+                    Origin = origin,
+                    Target = target,
+                    Owner = server
+                };
+            }
+
+            if (eventType == "ScriptDamage")
+            {
+                var origin = server.GetClientsAsList().First(c => c.NetworkId == lineSplit[1].ConvertLong());
+                var target = server.GetClientsAsList().First(c => c.NetworkId == lineSplit[2].ConvertLong());
+
+                return new GameEvent()
+                {
+                    Type = GameEvent.EventType.ScriptDamage,
+                    Data = logLine,
+                    Origin = origin,
+                    Target = target,
+                    Owner = server
+                };
+            }
+
+            // damage
+            if (eventType == "D")
+            {
+                if (!server.CustomCallback)
+                {
+                    var regexMatch = Regex.Match(logLine, Configuration.Damage.Pattern);
+
+                    if (regexMatch.Success)
+                    {
+                        var origin = server.GetClientsAsList()
+                            .First(c => c.NetworkId == regexMatch.Groups[Configuration.Damage.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString().ConvertLong());
+                        var target = server.GetClientsAsList()
+                            .First(c => c.NetworkId == regexMatch.Groups[Configuration.Damage.GroupMapping[ParserRegex.GroupType.TargetNetworkId]].ToString().ConvertLong());
+
+                        return new GameEvent()
+                        {
+                            Type = GameEvent.EventType.Damage,
+                            Data = eventType,
+                            Origin = origin,
+                            Target = target,
+                            Owner = server
+                        };
+                    }
+                }
+            }
+
+            // join
+            if (eventType == "J")
+            {
+                var regexMatch = Regex.Match(logLine, Configuration.Join.Pattern);
+                if (regexMatch.Success)
+                {
+                    return new GameEvent()
+                    {
+                        Type = GameEvent.EventType.PreConnect,
+                        Data = logLine,
+                        Owner = server,
+                        Origin = new EFClient()
+                        {
+                            CurrentAlias = new EFAlias()
+                            {
+                                Active = false,
+                                Name = regexMatch.Groups[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginName]].ToString().StripColors(),
+                            },
+                            NetworkId = regexMatch.Groups[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString().ConvertLong(),
+                            ClientNumber = Convert.ToInt32(regexMatch.Groups[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginClientNumber]].ToString()),
+                            State = EFClient.ClientState.Connecting,
+                            CurrentServer = server
+                        }
+                    };
+                }
+            }
+
+            if (eventType == "Q")
+            {
+                var regexMatch = Regex.Match(logLine, Configuration.Quit.Pattern);
+                if (regexMatch.Success)
+                {
+                    return new GameEvent()
+                    {
+                        Type = GameEvent.EventType.PreDisconnect,
+                        Data = logLine,
+                        Owner = server,
+                        Origin = new EFClient()
+                        {
+                            CurrentAlias = new EFAlias()
+                            {
+                                Active = false,
+                                Name = regexMatch.Groups[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginName]].ToString().StripColors()
+                            },
+                            NetworkId = regexMatch.Groups[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString().ConvertLong(),
+                            ClientNumber = Convert.ToInt32(regexMatch.Groups[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginClientNumber]].ToString()),
+                            State = EFClient.ClientState.Disconnecting
+                        }
+                    };
+                }
+            }
+
+            if (eventType.Contains("ExitLevel"))
+            {
+                return new GameEvent()
+                {
+                    Type = GameEvent.EventType.MapEnd,
+                    Data = lineSplit[0],
+                    Origin = Utilities.IW4MAdminClient(server),
+                    Target = Utilities.IW4MAdminClient(server),
+                    Owner = server
+                };
+            }
+
+            if (eventType.Contains("InitGame"))
+            {
+                string dump = eventType.Replace("InitGame: ", "");
+
+                return new GameEvent()
+                {
+                    Type = GameEvent.EventType.MapChange,
+                    Data = lineSplit[0],
+                    Origin = Utilities.IW4MAdminClient(server),
+                    Target = Utilities.IW4MAdminClient(server),
+                    Owner = server,
+                    Extra = dump.DictionaryFromKeyValue()
+                };
+            }
+
+            return new GameEvent()
+            {
+                Type = GameEvent.EventType.Unknown,
+                Origin = Utilities.IW4MAdminClient(server),
+                Target = Utilities.IW4MAdminClient(server),
+                Owner = server
+            };
+        }
+    }
+}

Application/EventParsers/DynamicEventParser.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using static SharedLibraryCore.Server;
+
+namespace IW4MAdmin.Application.EventParsers
+{
+    /// <summary>
+    /// empty generic implementation of the IEventParserConfiguration
+    /// allows script plugins to generate dynamic event parsers
+    /// </summary>
+    sealed internal class DynamicEventParser : BaseEventParser
+    {
+    }
+}

Application/EventParsers/DynamicEventParserConfiguration.cs

@@ -0,0 +1,19 @@
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.EventParsers
+{
+    /// <summary>
+    /// generic implementation of the IEventParserConfiguration
+    /// allows script plugins to generate dynamic configurations
+    /// </summary>
+    sealed internal class DynamicEventParserConfiguration : IEventParserConfiguration
+    {
+        public string GameDirectory { get; set; }
+        public ParserRegex Say { get; set; } = new ParserRegex();
+        public ParserRegex Join { get; set; } = new ParserRegex();
+        public ParserRegex Quit { get; set; } = new ParserRegex();
+        public ParserRegex Kill { get; set; } = new ParserRegex();
+        public ParserRegex Damage { get; set; } = new ParserRegex();
+        public ParserRegex Action { get; set; } = new ParserRegex();
+    }
+}

Application/EventParsers/IW3EventParser.cs

@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace IW4MAdmin.Application.EventParsers
-{
-    class IW3EventParser : IW4EventParser
-    {
-        public override string GetGameDir() => "main";
-    }
-}

Application/EventParsers/IW4EventParser.cs

@@ -1,231 +0,0 @@
-using SharedLibraryCore;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Interfaces;
-using System;
-using System.Linq;
-using System.Text.RegularExpressions;
-
-namespace IW4MAdmin.Application.EventParsers
-{
-    class IW4EventParser : IEventParser
-    {
-        private const string SayRegex = @"(say|sayteam);(.{1,32});([0-9]+)(.*);(.*)";
-
-        public virtual GameEvent GetEvent(Server server, string logLine)
-        {
-            logLine = Regex.Replace(logLine, @"([0-9]+:[0-9]+ |^[0-9]+ )", "").Trim();
-            string[] lineSplit = logLine.Split(';');
-            string eventType = lineSplit[0];
-
-            if (eventType == "JoinTeam")
-            {
-                var origin = server.GetClientsAsList().FirstOrDefault(c => c.NetworkId == lineSplit[1].ConvertLong());
-
-                return new GameEvent()
-                {
-                    Type = GameEvent.EventType.JoinTeam,
-                    Data = eventType,
-                    Origin = origin,
-                    Owner = server
-                };
-            }
-
-            if (eventType == "say" || eventType == "sayteam")
-            {
-                var matchResult = Regex.Match(logLine, SayRegex);
-
-                if (matchResult.Success)
-                {
-                    string message = matchResult.Groups[5].ToString()
-                        .Replace("\x15", "")
-                        .Trim();
-
-                    var origin = server.GetClientsAsList().First(c => c.ClientNumber == Utilities.ClientIdFromString(lineSplit, 2));
-
-                    if (message[0] == '!' || message[0] == '@')
-                    {
-                        return new GameEvent()
-                        {
-                            Type = GameEvent.EventType.Command,
-                            Data = message,
-                            Origin = origin,
-                            Owner = server,
-                            Message = message
-                        };
-                    }
-
-                    return new GameEvent()
-                    {
-                        Type = GameEvent.EventType.Say,
-                        Data = message,
-                        Origin = origin,
-                        Owner = server,
-                        Message = message
-                    };
-                }
-            }
-
-            if (eventType == "K")
-            {
-                if (!server.CustomCallback)
-                {
-                    var origin = server.GetClientsAsList().First(c => c.ClientNumber == Utilities.ClientIdFromString(lineSplit, 6));
-                    var target = server.GetClientsAsList().First(c => c.ClientNumber == Utilities.ClientIdFromString(lineSplit, 2));
-
-                    return new GameEvent()
-                    {
-                        Type = GameEvent.EventType.Kill,
-                        Data = logLine,
-                        Origin = origin,
-                        Target = target,
-                        Owner = server
-                    };
-                }
-            }
-
-            if (eventType == "ScriptKill")
-            {
-                var origin = server.GetClientsAsList().First(c => c.NetworkId == lineSplit[1].ConvertLong());
-                var target = server.GetClientsAsList().First(c => c.NetworkId == lineSplit[2].ConvertLong());
-                return new GameEvent()
-                {
-                    Type = GameEvent.EventType.ScriptKill,
-                    Data = logLine,
-                    Origin = origin,
-                    Target = target,
-                    Owner = server
-                };
-            }
-
-            if (eventType == "ScriptDamage")
-            {
-                var origin = server.GetClientsAsList().First(c => c.NetworkId == lineSplit[1].ConvertLong());
-                var target = server.GetClientsAsList().First(c => c.NetworkId == lineSplit[2].ConvertLong());
-
-                return new GameEvent()
-                {
-                    Type = GameEvent.EventType.ScriptDamage,
-                    Data = logLine,
-                    Origin = origin,
-                    Target = target,
-                    Owner = server
-                };
-            }
-
-            // damage
-            if (eventType == "D")
-            {
-                if (!server.CustomCallback)
-                {
-                    if (Regex.Match(eventType, @"^(D);((?:bot[0-9]+)|(?:[A-Z]|[0-9])+);([0-9]+);(axis|allies);(.+);((?:[A-Z]|[0-9])+);([0-9]+);(axis|allies);(.+);((?:[0-9]+|[a-z]+|_)+);([0-9]+);((?:[A-Z]|_)+);((?:[a-z]|_)+)$").Success)
-                    {
-                        var origin = server.GetClientsAsList().First(c => c.NetworkId == lineSplit[5].ConvertLong());
-                        var target = server.GetClientsAsList().First(c => c.NetworkId == lineSplit[1].ConvertLong());
-
-                        return new GameEvent()
-                        {
-                            Type = GameEvent.EventType.Damage,
-                            Data = eventType,
-                            Origin = origin,
-                            Target = target,
-                            Owner = server
-                        };
-                    }
-                }
-            }
-
-            // join
-            if (eventType == "J")
-            {
-                var regexMatch = Regex.Match(logLine, @"^(J;)(.{1,32});([0-9]+);(.*)$");
-                if (regexMatch.Success)
-                {
-                    return new GameEvent()
-                    {
-                        Type = GameEvent.EventType.PreConnect,
-                        Data = logLine,
-                        Owner = server,
-                        Origin = new EFClient()
-                        {
-                            CurrentAlias = new EFAlias()
-                            {
-                                Active = false,
-                                Name = regexMatch.Groups[4].ToString().StripColors(),
-                            },
-                            NetworkId = regexMatch.Groups[2].ToString().ConvertLong(),
-                            ClientNumber = Convert.ToInt32(regexMatch.Groups[3].ToString()),
-                            State = EFClient.ClientState.Connecting,
-                            CurrentServer = server
-                        }
-                    };
-                }
-            }
-
-            if (eventType == "Q")
-            {
-                var regexMatch = Regex.Match(logLine, @"^(Q;)(.{1,32});([0-9]+);(.*)$");
-                if (regexMatch.Success)
-                {
-                    return new GameEvent()
-                    {
-                        Type = GameEvent.EventType.PreDisconnect,
-                        Data = logLine,
-                        Owner = server,
-                        Origin = new EFClient()
-                        {
-                            CurrentAlias = new EFAlias()
-                            {
-                                Active = false,
-                                Name = regexMatch.Groups[4].ToString().StripColors()
-                            },
-                            NetworkId = regexMatch.Groups[2].ToString().ConvertLong(),
-                            ClientNumber = Convert.ToInt32(regexMatch.Groups[3].ToString()),
-                            State = EFClient.ClientState.Disconnecting
-                        }
-                    };
-                }
-            }
-
-            if (eventType.Contains("ExitLevel"))
-            {
-                return new GameEvent()
-                {
-                    Type = GameEvent.EventType.MapEnd,
-                    Data = lineSplit[0],
-                    Origin = Utilities.IW4MAdminClient(server),
-                    Target = Utilities.IW4MAdminClient(server),
-                    Owner = server
-                };
-            }
-
-            if (eventType.Contains("InitGame"))
-            {
-                string dump = eventType.Replace("InitGame: ", "");
-
-                return new GameEvent()
-                {
-                    Type = GameEvent.EventType.MapChange,
-                    Data = lineSplit[0],
-                    Origin = Utilities.IW4MAdminClient(server),
-                    Target = Utilities.IW4MAdminClient(server),
-                    Owner = server,
-                    Extra = dump.DictionaryFromKeyValue()
-                };
-            }
-
-            return new GameEvent()
-            {
-                Type = GameEvent.EventType.Unknown,
-                Origin = Utilities.IW4MAdminClient(server),
-                Target = Utilities.IW4MAdminClient(server),
-                Owner = server
-            };
-        }
-
-        // other parsers can derive from this parser so we make it virtual
-        public virtual string GetGameDir()
-        {
-            return "userraw";
-        }
-    }
-}

Application/EventParsers/IW5EventParser.cs

@@ -1,58 +0,0 @@
-using SharedLibraryCore;
-using SharedLibraryCore.Database.Models;
-using System;
-using System.Text.RegularExpressions;
-
-namespace IW4MAdmin.Application.EventParsers
-{
-    class IW5EventParser : IW4EventParser
-    {
-        public override string GetGameDir()
-        {
-            return "logs";
-        }
-
-        public override GameEvent GetEvent(Server server, string logLine)
-        {
-            string cleanedEventLine = Regex.Replace(logLine, @"[0-9]+:[0-9]+\ ", "").Trim();
-
-            if (cleanedEventLine.Contains("J;"))
-            {
-                string[] lineSplit = cleanedEventLine.Split(';');
-
-                int clientNum = Int32.Parse(lineSplit[2]);
-
-                var player = new EFClient()
-                {
-                    NetworkId = lineSplit[1].ConvertLong(),
-                    ClientNumber = clientNum,
-                    CurrentAlias = new EFAlias()
-                    {
-                        Active = false,
-                        Name = lineSplit[3]
-                    }
-                };
-
-                return new GameEvent()
-                {
-                    Type = GameEvent.EventType.PreConnect,
-                    Origin = new EFClient()
-                    {
-                        ClientId = 1
-                    },
-                    Target = new EFClient()
-                    {
-                        ClientId = 1
-                    },
-                    Owner = server,
-                    Extra = player
-                };
-            }
-
-            else
-            {
-                return base.GetEvent(server, logLine);
-            }
-        }
-    }
-}

Application/EventParsers/T5MEventParser.cs

@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace IW4MAdmin.Application.EventParsers
-{
-    class T5MEventParser : IW4EventParser
-    {
-        public override string GetGameDir() => "v2";
-    }
-}

Application/EventParsers/T6MEventParser.cs

@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using SharedLibraryCore;
-using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.Objects;
-
-namespace IW4MAdmin.Application.EventParsers
-{
-    class T6MEventParser : IW4EventParser
-    {
-        public override string GetGameDir() => $"t6r{Path.DirectorySeparatorChar}data";
-    }
-}

Application/IO/GameLogEventDetection.cs

@@ -1,8 +1,6 @@
 using SharedLibraryCore;
 using SharedLibraryCore.Interfaces;
 using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 

Application/IW4MServer.cs

@@ -34,6 +34,7 @@ namespace IW4MAdmin
         override public async Task OnClientConnected(EFClient clientFromLog)
         {
             Logger.WriteDebug($"Client slot #{clientFromLog.ClientNumber} now reserved");
+            Clients[clientFromLog.ClientNumber] = new EFClient();
 
             try
             {
@@ -50,8 +51,11 @@ namespace IW4MAdmin
                 else
                 {
                     // this is only a temporary version until the IPAddress is transmitted
-                    client.CurrentAlias.Active = false;
-                    client.CurrentAlias.Name = clientFromLog.Name;
+                    client.CurrentAlias = new EFAlias
+                    {
+                        Name = clientFromLog.Name,
+                        IPAddress = clientFromLog.IPAddress
+                    };
                 }
 
                 Logger.WriteInfo($"Client {client} connected...");
@@ -65,18 +69,10 @@ namespace IW4MAdmin
 
                 Clients[client.ClientNumber] = client;
 
-                // this only happens if the preconnect event occurred from RCon polling
-                if (clientFromLog.IPAddress.HasValue)
-                {
-                    await client.OnJoin(clientFromLog.IPAddress);
-                }
-
-                client.OnConnect();
-
                 client.State = EFClient.ClientState.Connected;
 #if DEBUG == true
                 Logger.WriteDebug($"End PreConnect for {client}");
-#endif   
+#endif
                 var e = new GameEvent()
                 {
                     Origin = client,
@@ -85,6 +81,11 @@ namespace IW4MAdmin
                 };
 
                 Manager.GetEventHandler().AddEvent(e);
+
+                if (client.IPAddress != null)
+                {
+                    await client.OnJoin(client.IPAddress);
+                }
             }
 
             catch (Exception ex)
@@ -219,6 +220,7 @@ namespace IW4MAdmin
 
             else if (E.Type == GameEvent.EventType.Flag)
             {
+                // todo: maybe move this to a seperate function
                 Penalty newPenalty = new Penalty()
                 {
                     Type = Penalty.PenaltyType.Flag,
@@ -226,14 +228,11 @@ namespace IW4MAdmin
                     Offender = E.Target,
                     Offense = E.Data,
                     Punisher = E.Origin,
-                    Active = true,
                     When = DateTime.UtcNow,
                     Link = E.Target.AliasLink
                 };
 
                 var addedPenalty = await Manager.GetPenaltyService().Create(newPenalty);
-                E.Target.ReceivedPenalties.Add(addedPenalty);
-
                 await Manager.GetClientService().Update(E.Target);
             }
 
@@ -259,7 +258,8 @@ namespace IW4MAdmin
 
             else if (E.Type == GameEvent.EventType.Ban)
             {
-                await Ban(E.Data, E.Target, E.Origin);
+                bool isEvade = E.Extra != null ? (bool)E.Extra : false;
+                await Ban(E.Data, E.Target, E.Origin, isEvade);
             }
 
             else if (E.Type == GameEvent.EventType.Unban)
@@ -301,7 +301,7 @@ namespace IW4MAdmin
 
             else if (E.Type == GameEvent.EventType.PreDisconnect)
             {
-                if ((DateTime.UtcNow - SessionStart).TotalSeconds < 5)
+                if ((DateTime.UtcNow - SessionStart).TotalSeconds < 30)
                 {
                     Logger.WriteInfo($"Cancelling pre disconnect for {E.Origin} as it occured too close to map end");
                     E.FailReason = GameEvent.EventFailReason.Invalid;
@@ -389,6 +389,7 @@ namespace IW4MAdmin
                     var dict = (Dictionary<string, string>)E.Extra;
                     Gametype = dict["g_gametype"].StripColors();
                     Hostname = dict["sv_hostname"].StripColors();
+                    MaxClients = Int32.Parse(dict["sv_maxclients"]);
 
                     string mapname = dict["mapname"].StripColors();
                     CurrentMap = Maps.Find(m => m.Name == mapname) ?? new Map()
@@ -449,7 +450,7 @@ namespace IW4MAdmin
                 client.Score = origin.Score;
 
                 // update their IP if it hasn't been set yet
-                if (!client.IPAddress.HasValue)
+                if (client.IPAddress == null && !client.IsBot)
                 {
                     return client.OnJoin(origin.IPAddress);
                 }
@@ -471,7 +472,7 @@ namespace IW4MAdmin
 #endif
             var currentClients = GetClientsAsList();
             var polledClients = (await this.GetStatusAsync()).AsEnumerable();
-            if (this.Manager.GetApplicationSettings().Configuration().IgnoreBots)
+            if (Manager.GetApplicationSettings().Configuration().IgnoreBots)
             {
                 polledClients = polledClients.Where(c => !c.IsBot);
             }
@@ -665,46 +666,28 @@ namespace IW4MAdmin
 
         public async Task Initialize()
         {
-            RconParser = ServerConfig.UseT6MParser ?
-                (IRConParser)new T6MRConParser() :
-                new IW3RConParser();
+            RconParser = Manager.AdditionalRConParsers
+                .FirstOrDefault(_parser => _parser.Version == ServerConfig.CustomParserVersion);
 
-            if (ServerConfig.UseIW5MParser)
-            {
-                RconParser = new IW5MRConParser();
-            }
+            EventParser = Manager.AdditionalEventParsers
+                .FirstOrDefault(_parser => _parser.Version == ServerConfig.CustomParserVersion);
+
+            RconParser = RconParser ?? new BaseRConParser();
+            EventParser = EventParser ?? new BaseEventParser();
+
+            RemoteConnection.SetConfiguration(RconParser.Configuration);
 
             var version = await this.GetDvarAsync<string>("version");
-            GameName = Utilities.GetGame(version.Value);
+            Version = version.Value;
+            GameName = Utilities.GetGame(version?.Value);
 
-            if (GameName == Game.IW4)
+            if (version?.Value?.Length != 0)
             {
-                EventParser = new IW4EventParser();
-                RconParser = new IW4RConParser();
-            }
-            else if (GameName == Game.IW5)
-            {
-                EventParser = new IW5EventParser();
-            }
-            else if (GameName == Game.T5M)
-            {
-                EventParser = new T5MEventParser();
-            }
-            else if (GameName == Game.T6M)
-            {
-                EventParser = new T6MEventParser();
-            }
-            else
-            {
-                EventParser = new IW3EventParser(); // this uses the 'main' folder for log paths
+                RconParser = Manager.AdditionalRConParsers.FirstOrDefault(_parser => _parser.Version == version.Value) ?? RconParser;
+                EventParser = Manager.AdditionalEventParsers.FirstOrDefault(_parser => _parser.Version == version.Value) ?? EventParser;
             }
 
-            if (GameName == Game.UKN)
-            {
-                Logger.WriteWarning($"Game name not recognized: {version}");
-            }
-
-            var infoResponse = await this.GetInfoAsync();
+            var infoResponse = RconParser.Configuration.CommandPrefixes.RConGetInfo != null ? await this.GetInfoAsync() : null;
             // this is normally slow, but I'm only doing it because different games have different prefixes
             var hostname = infoResponse == null ?
                 (await this.GetDvarAsync<string>("sv_hostname")).Value :
@@ -748,7 +731,7 @@ namespace IW4MAdmin
             this.MaxClients = maxplayers;
             this.FSGame = game;
             this.Gametype = gametype;
-            this.IP = ip.Value == "localhost" ? ServerConfig.IPAddress : ip.Value;
+            this.IP = ip.Value == "localhost" ? ServerConfig.IPAddress : ip.Value ?? ServerConfig.IPAddress;
 
             if (logsync.Value == 0 || logfile.Value == string.Empty)
             {
@@ -762,42 +745,43 @@ namespace IW4MAdmin
             }
 
             CustomCallback = await ScriptLoaded();
-            string mainPath = EventParser.GetGameDir();
-#if DEBUG
-            //       basepath.Value = @"D:\";
-#endif
+            string mainPath = EventParser.Configuration.GameDirectory;
             string logPath = string.Empty;
 
-            LogPath = game == string.Empty ?
-                   $"{basepath.Value.Replace('\\', Path.DirectorySeparatorChar)}{Path.DirectorySeparatorChar}{mainPath}{Path.DirectorySeparatorChar}{logfile.Value}" :
-                   $"{basepath.Value.Replace('\\', Path.DirectorySeparatorChar)}{Path.DirectorySeparatorChar}{game.Replace('/', Path.DirectorySeparatorChar)}{Path.DirectorySeparatorChar}{logfile.Value}";
+            LogPath = string.IsNullOrEmpty(game) ?
+                   $"{basepath?.Value?.Replace('\\', Path.DirectorySeparatorChar)}{Path.DirectorySeparatorChar}{mainPath}{Path.DirectorySeparatorChar}{logfile?.Value}" :
+                   $"{basepath?.Value?.Replace('\\', Path.DirectorySeparatorChar)}{Path.DirectorySeparatorChar}{game?.Replace('/', Path.DirectorySeparatorChar)}{Path.DirectorySeparatorChar}{logfile?.Value}";
 
+            bool remoteLog = false;
             if (GameName == Game.IW5 || ServerConfig.ManualLogPath?.Length > 0)
             {
                 logPath = ServerConfig.ManualLogPath;
+                remoteLog = logPath.StartsWith("http");
             }
             else
             {
                 logPath = LogPath;
             }
 
-            // hopefully fix wine drive name mangling
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            if (remoteLog)
             {
-                logPath = Regex.Replace($"{Path.DirectorySeparatorChar}{LogPath}", @"[A-Z]:/", "");
+                LogEvent = new GameLogEventDetection(this, logPath, logfile.Value);
             }
 
-            if (!File.Exists(logPath) && !logPath.StartsWith("http"))
-            {
-                Logger.WriteError($"{logPath} {loc["SERVER_ERROR_DNE"]}");
-#if !DEBUG
-                throw new ServerException($"{loc["SERVER_ERROR_LOG"]} {logPath}");
-#else
-                LogEvent = new GameLogEventDetection(this, logPath, logfile.Value);
-#endif
-            }
             else
             {
+                // fix wine drive name mangling
+                if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                {
+                    logPath = Regex.Replace($"{Path.DirectorySeparatorChar}{LogPath}", @"[A-Z]:/", "");
+                }
+
+                if (!File.Exists(logPath))
+                {
+                    Logger.WriteError($"{logPath} {loc["SERVER_ERROR_DNE"]}");
+                    throw new ServerException($"{loc["SERVER_ERROR_LOG"]} {logPath}");
+                }
+
                 LogEvent = new GameLogEventDetection(this, logPath, logfile.Value);
             }
 
@@ -832,7 +816,7 @@ namespace IW4MAdmin
                     return;
                 }
 
-                String message = $"^1{loc["SERVER_WARNING"]} ^7[^3{Target.Warnings}^7]: ^3{Target.Name}^7, {Reason}";
+                string message = $"^1{loc["SERVER_WARNING"]} ^7[^3{Target.Warnings}^7]: ^3{Target.Name}^7, {Reason}";
                 Target.CurrentServer.Broadcast(message);
             }
 
@@ -841,10 +825,8 @@ namespace IW4MAdmin
                 Type = Penalty.PenaltyType.Warning,
                 Expires = DateTime.UtcNow,
                 Offender = Target,
-                Offense = Reason,
                 Punisher = Origin,
-                Active = true,
-                When = DateTime.UtcNow,
+                Offense = Reason,
                 Link = Target.AliasLink
             };
 
@@ -868,7 +850,7 @@ namespace IW4MAdmin
 #if !DEBUG
             else
             {
-                string formattedKick = String.Format(RconParser.GetCommandPrefixes().Kick, Target.ClientNumber, $"{loc["SERVER_KICK_TEXT"]} - ^5{Reason}^7");
+                string formattedKick = String.Format(RconParser.Configuration.CommandPrefixes.Kick, Target.ClientNumber, $"{loc["SERVER_KICK_TEXT"]} - ^5{Reason}^7");
                 await Target.CurrentServer.ExecuteCommandAsync(formattedKick);
             }
 #endif
@@ -884,7 +866,6 @@ namespace IW4MAdmin
                 Offender = Target,
                 Offense = Reason,
                 Punisher = Origin,
-                When = DateTime.UtcNow,
                 Link = Target.AliasLink
             };
 
@@ -908,7 +889,7 @@ namespace IW4MAdmin
 #if !DEBUG
             else
             {
-                string formattedKick = String.Format(RconParser.GetCommandPrefixes().Kick, Target.ClientNumber, $"^7{loc["SERVER_TB_TEXT"]}- ^5{Reason}");
+                string formattedKick = String.Format(RconParser.Configuration.CommandPrefixes.Kick, Target.ClientNumber, $"^7{loc["SERVER_TB_TEXT"]}- ^5{Reason}");
                 await Target.CurrentServer.ExecuteCommandAsync(formattedKick);
             }
 #else
@@ -922,29 +903,27 @@ namespace IW4MAdmin
                 Offender = Target,
                 Offense = Reason,
                 Punisher = Origin,
-                Active = true,
-                When = DateTime.UtcNow,
                 Link = Target.AliasLink
             };
 
             await Manager.GetPenaltyService().Create(newPenalty);
         }
 
-        override protected async Task Ban(String Message, EFClient Target, EFClient Origin)
+        override protected async Task Ban(string reason, EFClient targetClient, EFClient originClient, bool isEvade = false)
         {
             // ensure player gets banned if command not performed on them in game
-            if (Target.ClientNumber < 0)
+            if (targetClient.ClientNumber < 0)
             {
                 EFClient ingameClient = null;
 
                 ingameClient = Manager.GetServers()
                     .Select(s => s.GetClientsAsList())
-                    .FirstOrDefault(l => l.FirstOrDefault(c => c.ClientId == Target?.ClientId) != null)
-                    ?.First(c => c.ClientId == Target.ClientId);
+                    .FirstOrDefault(l => l.FirstOrDefault(c => c.ClientId == targetClient?.ClientId) != null)
+                    ?.First(c => c.ClientId == targetClient.ClientId);
 
                 if (ingameClient != null)
                 {
-                    await Ban(Message, ingameClient, Origin);
+                    await Ban(reason, ingameClient, originClient, isEvade);
                     return;
                 }
             }
@@ -952,13 +931,13 @@ namespace IW4MAdmin
             else
             {
                 // this is set only because they're still in the server.
-                Target.Level = EFClient.Permission.Banned;
+                targetClient.Level = EFClient.Permission.Banned;
 
 #if !DEBUG
-                string formattedString = String.Format(RconParser.GetCommandPrefixes().Kick, Target.ClientNumber, $"{loc["SERVER_BAN_TEXT"]} - ^5{Message} ^7({loc["SERVER_BAN_APPEAL"]} {Website})^7");
-                await Target.CurrentServer.ExecuteCommandAsync(formattedString);
+                string formattedString = String.Format(RconParser.Configuration.CommandPrefixes.Kick, targetClient.ClientNumber, $"{loc["SERVER_BAN_TEXT"]} - ^5{reason} ^7({loc["SERVER_BAN_APPEAL"]} {Website})^7");
+                await targetClient.CurrentServer.ExecuteCommandAsync(formattedString);
 #else
-                await Target.CurrentServer.OnClientDisconnected(Target);
+                await targetClient.CurrentServer.OnClientDisconnected(targetClient);
 #endif
             }
 
@@ -966,13 +945,12 @@ namespace IW4MAdmin
             {
                 Type = Penalty.PenaltyType.Ban,
                 Expires = null,
-                Offender = Target,
-                Offense = Message,
-                Punisher = Origin,
-                Active = true,
-                When = DateTime.UtcNow,
-                Link = Target.AliasLink,
-                AutomatedOffense = Origin.AdministeredPenalties?.FirstOrDefault()?.AutomatedOffense
+                Offender = targetClient,
+                Offense = reason,
+                Punisher = originClient,
+                Link = targetClient.AliasLink,
+                AutomatedOffense = originClient.AdministeredPenalties?.FirstOrDefault()?.AutomatedOffense,
+                IsEvadedOffense = isEvade
             };
 
             await Manager.GetPenaltyService().Create(newPenalty);

Application/Localization/Configure.cs

@@ -12,7 +12,7 @@ namespace IW4MAdmin.Application.Localization
 {
     public class Configure
     {
-        public static void Initialize(string customLocale)
+        public static void Initialize(string customLocale = null)
         {
             string currentLocale = string.IsNullOrEmpty(customLocale) ? CultureInfo.CurrentCulture.Name : customLocale;
             string[] localizationFiles = Directory.GetFiles(Path.Join(Utilities.OperatingDirectory, "Localization"), $"*.{currentLocale}.json");

Application/Main.cs

@@ -1,16 +1,11 @@
-using System;
-using System.Threading.Tasks;
-using System.IO;
-using System.Reflection;
-
+using IW4MAdmin.Application.Migration;
 using SharedLibraryCore;
-using SharedLibraryCore.Objects;
-using SharedLibraryCore.Database;
+using SharedLibraryCore.Localization;
+using System;
+using System.IO;
 using System.Text;
 using System.Threading;
-using System.Collections.Generic;
-using SharedLibraryCore.Localization;
-using IW4MAdmin.Application.Migration;
+using System.Threading.Tasks;
 
 namespace IW4MAdmin.Application
 {
@@ -23,7 +18,6 @@ namespace IW4MAdmin.Application
         public static void Main(string[] args)
         {
             AppDomain.CurrentDomain.SetData("DataDirectory", Utilities.OperatingDirectory);
-
             Console.OutputEncoding = Encoding.UTF8;
             Console.ForegroundColor = ConsoleColor.Gray;
 
@@ -40,7 +34,17 @@ namespace IW4MAdmin.Application
             try
             {
                 ServerManager = ApplicationManager.GetInstance();
-                Localization.Configure.Initialize(ServerManager.GetApplicationSettings().Configuration()?.CustomLocale);
+
+                if (ServerManager.GetApplicationSettings().Configuration() != null)
+                {
+                    Localization.Configure.Initialize(ServerManager.GetApplicationSettings().Configuration().CustomLocale);
+                }
+
+                else
+                {
+                    Localization.Configure.Initialize();
+                }
+
                 loc = Utilities.CurrentLocalization.LocalizationIndex;
                 Console.CancelKeyPress += new ConsoleCancelEventHandler(OnCancelKey);
 
@@ -109,7 +113,7 @@ namespace IW4MAdmin.Application
 
                 var consoleTask = Task.Run(async () =>
                 {
-                    String userInput;
+                    string userInput;
                     var Origin = Utilities.IW4MAdminClient(ServerManager.Servers[0]);
 
                     do
@@ -117,7 +121,9 @@ namespace IW4MAdmin.Application
                         userInput = Console.ReadLine();
 
                         if (userInput?.ToLower() == "quit")
+                        {
                             ServerManager.Stop();
+                        }
 
                         if (ServerManager.Servers.Count == 0)
                         {
@@ -146,13 +152,16 @@ namespace IW4MAdmin.Application
 
             catch (Exception e)
             {
-                Console.WriteLine(loc["MANAGER_INIT_FAIL"]);
+                string failMessage = loc == null ? "Failed to initalize IW4MAdmin" : loc["MANAGER_INIT_FAIL"];
+                string exitMessage = loc == null ? "Press any key to exit..." : loc["MANAGER_EXIT"];
+
+                Console.WriteLine(failMessage);
                 while (e.InnerException != null)
                 {
                     e = e.InnerException;
                 }
                 Console.WriteLine(e.Message);
-                Console.WriteLine(loc["MANAGER_EXIT"]);
+                Console.WriteLine(exitMessage);
                 Console.ReadKey();
                 return;
             }

Application/RconParsers/BaseRConParser.cs

@@ -0,0 +1,178 @@
+using SharedLibraryCore;
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Exceptions;
+using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.RCon;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace IW4MAdmin.Application.RconParsers
+{
+    class BaseRConParser : IRConParser
+    {
+        public BaseRConParser()
+        {
+            Configuration = new DynamicRConParserConfiguration()
+            {
+                CommandPrefixes = new CommandPrefix()
+                {
+                    Tell = "tellraw {0} {1}",
+                    Say = "sayraw {0}",
+                    Kick = "clientkick {0} \"{1}\"",
+                    Ban = "clientkick {0} \"{1}\"",
+                    TempBan = "tempbanclient {0} \"{1}\"",
+                    RConCommand = "ÿÿÿÿrcon {0} {1}",
+                    RConGetDvar = "ÿÿÿÿrcon {0} {1}",
+                    RConSetDvar = "ÿÿÿÿrcon {0} set {1}",
+                    RConGetStatus = "ÿÿÿÿgetstatus",
+                    RConGetInfo = "ÿÿÿÿgetinfo",
+                    RConResponse = "ÿÿÿÿprint",
+                },
+                GameName = Server.Game.IW4
+            };
+
+            Configuration.Status.Pattern = @"^ *([0-9]+) +-?([0-9]+) +((?:[A-Z]+|[0-9]+)) +((?:[a-z]|[0-9]){16}|(?:[a-z]|[0-9]){32}|bot[0-9]+|(?:[0-9]+)) *(.{0,32}) +([0-9]+) +(\d+\.\d+\.\d+.\d+\:-*\d{1,5}|0+.0+:-*\d{1,5}|loopback) +(-*[0-9]+) +([0-9]+) *$";
+            Configuration.Status.AddMapping(ParserRegex.GroupType.RConClientNumber, 1);
+            Configuration.Status.AddMapping(ParserRegex.GroupType.RConScore, 2);
+            Configuration.Status.AddMapping(ParserRegex.GroupType.RConPing, 3);
+            Configuration.Status.AddMapping(ParserRegex.GroupType.RConNetworkId, 4);
+            Configuration.Status.AddMapping(ParserRegex.GroupType.RConName, 5);
+            Configuration.Status.AddMapping(ParserRegex.GroupType.RConIpAddress, 7);
+
+            Configuration.Dvar.Pattern = "^\"(.+)\" is: \"(.+)\" default: \"(.+)?\"\n(?:latched: \"(.+)?\"\n)? *(.+)$";
+            Configuration.Dvar.AddMapping(ParserRegex.GroupType.RConDvarName, 1);
+            Configuration.Dvar.AddMapping(ParserRegex.GroupType.RConDvarValue, 2);
+            Configuration.Dvar.AddMapping(ParserRegex.GroupType.RConDvarDefaultValue, 3);
+            Configuration.Dvar.AddMapping(ParserRegex.GroupType.RConDvarLatchedValue, 4);
+            Configuration.Dvar.AddMapping(ParserRegex.GroupType.RConDvarDomain, 5);
+        }
+
+        public IRConParserConfiguration Configuration { get; set; }
+
+        public string Version { get; set; } = "IW4x (v0.6.0)";
+
+        public async Task<string[]> ExecuteCommandAsync(Connection connection, string command)
+        {
+            var response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND, command);
+            return response.Skip(1).ToArray();
+        }
+
+        public async Task<Dvar<T>> GetDvarAsync<T>(Connection connection, string dvarName)
+        {
+            string[] lineSplit = await connection.SendQueryAsync(StaticHelpers.QueryType.GET_DVAR, dvarName);
+            string response = string.Join('\n', lineSplit.Skip(1));
+
+            if (!lineSplit[0].Contains(Configuration.CommandPrefixes.RConResponse))
+            {
+                throw new DvarException($"Could not retrieve DVAR \"{dvarName}\"");
+            }
+
+            if (response.Contains("Unknown command"))
+            {
+                throw new DvarException($"DVAR \"{dvarName}\" does not exist");
+            }
+
+            var match = Regex.Match(response, Configuration.Dvar.Pattern);
+
+            if (!match.Success)
+            {
+                throw new DvarException($"Could not retrieve DVAR \"{dvarName}\"");
+            }
+
+            string value = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarValue]].Value.StripColors();
+            string defaultValue = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarDefaultValue]].Value.StripColors();
+            string latchedValue = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarLatchedValue]].Value.StripColors();
+
+            return new Dvar<T>()
+            {
+                Name = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarName]].Value.StripColors(),
+                Value = string.IsNullOrEmpty(value) ? default(T) : (T)Convert.ChangeType(value, typeof(T)),
+                DefaultValue = string.IsNullOrEmpty(defaultValue) ? default(T) : (T)Convert.ChangeType(defaultValue, typeof(T)),
+                LatchedValue = string.IsNullOrEmpty(latchedValue) ? default(T) : (T)Convert.ChangeType(latchedValue, typeof(T)),
+                Domain = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarDomain]].Value.StripColors()
+            };
+        }
+
+        public async Task<List<EFClient>> GetStatusAsync(Connection connection)
+        {
+            string[] response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND, "status");
+            return ClientsFromStatus(response);
+        }
+
+        public async Task<bool> SetDvarAsync(Connection connection, string dvarName, object dvarValue)
+        {
+            return (await connection.SendQueryAsync(StaticHelpers.QueryType.SET_DVAR, $"{dvarName} {dvarValue}")).Length > 0;
+        }
+
+        private List<EFClient> ClientsFromStatus(string[] Status)
+        {
+            List<EFClient> StatusPlayers = new List<EFClient>();
+
+            if (Status.Length < 4)
+            {
+                throw new ServerException("Unexpected status response received");
+            }
+
+            int validMatches = 0;
+            foreach (string S in Status)
+            {
+                string responseLine = S.Trim();
+
+                var regex = Regex.Match(responseLine, Configuration.Status.Pattern, RegexOptions.IgnoreCase);
+
+                if (regex.Success)
+                {
+                    validMatches++;
+                    int clientNumber = int.Parse(regex.Groups[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConClientNumber]].Value);
+                    int score = int.Parse(regex.Groups[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConScore]].Value);
+
+                    int ping = 999;
+
+                    // their state can be CNCT, ZMBI etc
+                    if (regex.Groups[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConPing]].Value.Length <= 3)
+                    {
+                        ping = int.Parse(regex.Groups[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConPing]].Value);
+                    }
+
+                    long networkId = regex.Groups[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConNetworkId]].Value.ConvertLong();
+                    string name = regex.Groups[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConName]].Value.StripColors().Trim();
+                    int? ip = regex.Groups[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConIpAddress]].Value.Split(':')[0].ConvertToIP();
+
+                    var client = new EFClient()
+                    {
+                        CurrentAlias = new EFAlias()
+                        {
+                            Name = name
+                        },
+                        NetworkId = networkId,
+                        ClientNumber = clientNumber,
+                        IPAddress = ip,
+                        Ping = ping,
+                        Score = score,
+                        IsBot = ip == null,
+                        State = EFClient.ClientState.Connecting
+                    };
+
+                    // they've not fully connected yet
+                    if (!client.IsBot && ping == 999)
+                    {
+                        continue;
+                    }
+
+                    StatusPlayers.Add(client);
+                }
+            }
+
+            // this happens if status is requested while map is rotating
+            if (Status.Length > 5 && validMatches == 0)
+            {
+                throw new ServerException("Server is rotating map");
+            }
+
+            return StatusPlayers;
+        }
+    }
+}

Application/RconParsers/DynamicRConParser.cs

@@ -0,0 +1,10 @@
+namespace IW4MAdmin.Application.RconParsers
+{
+    /// <summary>
+    /// empty implementation of the IW4RConParser
+    /// allows script plugins to generate dynamic RCon parsers
+    /// </summary>
+    sealed internal class DynamicRConParser : BaseRConParser
+    {
+    }
+}

Application/RconParsers/DynamicRConParserConfiguration.cs

@@ -0,0 +1,19 @@
+using SharedLibraryCore;
+using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.RCon;
+
+namespace IW4MAdmin.Application.RconParsers
+{
+    /// <summary>
+    /// generic implementation of the IRConParserConfiguration
+    /// allows script plugins to generate dynamic RCon configurations
+    /// </summary>
+    sealed internal class DynamicRConParserConfiguration : IRConParserConfiguration
+    {
+        public CommandPrefix CommandPrefixes { get; set; }
+        public Server.Game GameName { get; set; }
+        public ParserRegex Status { get; set; } = new ParserRegex();
+        public ParserRegex Dvar { get; set; } = new ParserRegex();
+        public bool WaitForResponse { get; set; } = true;
+    }
+}

Application/RconParsers/IW3RConParser.cs

@@ -1,21 +0,0 @@
-using SharedLibraryCore.RCon;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace IW4MAdmin.Application.RconParsers
-{
-    class IW3RConParser : IW4RConParser
-    {
-        private static readonly CommandPrefix Prefixes = new CommandPrefix()
-        {
-            Tell = "tell {0} {1}",
-            Say = "say {0}",
-            Kick = "clientkick {0} \"{1}\"",
-            Ban = "clientkick {0} \"{1}\"",
-            TempBan = "tempbanclient {0} \"{1}\""
-        };
-
-        public override CommandPrefix GetCommandPrefixes() => Prefixes;
-    }
-}

Application/RconParsers/IW4RConParser.cs

@@ -1,145 +0,0 @@
-using SharedLibraryCore;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Exceptions;
-using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.RCon;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-
-namespace IW4MAdmin.Application.RconParsers
-{
-    class IW4RConParser : IRConParser
-    {
-        private static readonly CommandPrefix Prefixes = new CommandPrefix()
-        {
-            Tell = "tellraw {0} {1}",
-            Say = "sayraw {0}",
-            Kick = "clientkick {0} \"{1}\"",
-            Ban = "clientkick {0} \"{1}\"",
-            TempBan = "tempbanclient {0} \"{1}\""
-        };
-
-        private static readonly string StatusRegex = @"^( *[0-9]+) +-*([0-9]+) +((?:[A-Z]+|[0-9]+)) +((?:[a-z]|[0-9]){16}|(?:[a-z]|[0-9]){32}|bot[0-9]+|(?:[0-9]+)) *(.{0,32}) +([0-9]+) +(\d+\.\d+\.\d+.\d+\:-*\d{1,5}|0+.0+:-*\d{1,5}|loopback) +(-*[0-9]+) +([0-9]+) *$";
-
-        public async Task<string[]> ExecuteCommandAsync(Connection connection, string command)
-        {
-            var response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND, command);
-            return response.Skip(1).ToArray();
-        }
-
-        public async Task<Dvar<T>> GetDvarAsync<T>(Connection connection, string dvarName)
-        {
-            string[] LineSplit = await connection.SendQueryAsync(StaticHelpers.QueryType.DVAR, dvarName);
-
-            if (LineSplit.Length < 3)
-            {
-                var e = new DvarException($"DVAR \"{dvarName}\" does not exist");
-                e.Data["dvar_name"] = dvarName;
-                throw e;
-            }
-
-            string[] ValueSplit = LineSplit[1].Split(new char[] { '"' }, StringSplitOptions.RemoveEmptyEntries);
-
-            if (ValueSplit.Length < 5)
-            {
-                var e = new DvarException($"DVAR \"{dvarName}\" does not exist");
-                e.Data["dvar_name"] = dvarName;
-                throw e;
-            }
-
-            string DvarName = Regex.Replace(ValueSplit[0], @"\^[0-9]", "");
-            string DvarCurrentValue = Regex.Replace(ValueSplit[2], @"\^[0-9]", "");
-            string DvarDefaultValue = Regex.Replace(ValueSplit[4], @"\^[0-9]", "");
-
-            return new Dvar<T>(DvarName)
-            {
-                Value = (T)Convert.ChangeType(DvarCurrentValue, typeof(T))
-            };
-        }
-
-        public async Task<List<EFClient>> GetStatusAsync(Connection connection)
-        {
-            string[] response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND, "status");
-            return ClientsFromStatus(response);
-        }
-
-        public async Task<bool> SetDvarAsync(Connection connection, string dvarName, object dvarValue)
-        {
-            return (await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND, $"set {dvarName} {dvarValue}")).Length > 0;
-        }
-
-        public virtual CommandPrefix GetCommandPrefixes()
-        {
-            return Prefixes;
-        }
-
-        private List<EFClient> ClientsFromStatus(string[] Status)
-        {
-            List<EFClient> StatusPlayers = new List<EFClient>();
-
-            if (Status.Length < 4)
-            {
-                throw new ServerException("Unexpected status response received");
-            }
-
-            int validMatches = 0;
-            foreach (String S in Status)
-            {
-                String responseLine = S.Trim();
-
-                var regex = Regex.Match(responseLine, StatusRegex, RegexOptions.IgnoreCase);
-
-                if (regex.Success)
-                {
-                    validMatches++;
-                    int clientNumber = int.Parse(regex.Groups[1].Value);
-                    int score = int.Parse(regex.Groups[2].Value);
-
-                    int ping = 999;
-
-                    // their state can be CNCT, ZMBI etc
-                    if (regex.Groups[3].Value.Length <= 3)
-                    {
-                        ping = int.Parse(regex.Groups[3].Value);
-                    }
-
-                    else
-                    {
-                        continue;
-                    }
-
-                    long networkId = regex.Groups[4].Value.ConvertLong();
-                    string name = regex.Groups[5].Value.StripColors().Trim();
-                    int ip = regex.Groups[7].Value.Split(':')[0].ConvertToIP();
-
-                    var P = new EFClient()
-                    {
-                        CurrentAlias = new EFAlias()
-                        {
-                            Name = name
-                        },
-                        NetworkId = networkId,
-                        ClientNumber = clientNumber,
-                        IPAddress = ip == 0 ? int.MinValue : ip,
-                        Ping = ping,
-                        Score = score,
-                        IsBot = ip == 0,
-                        State = EFClient.ClientState.Connecting
-                    };
-                    StatusPlayers.Add(P);
-                }
-            }
-
-            // this happens if status is requested while map is rotating
-            if (Status.Length > 5 && validMatches == 0)
-            {
-                throw new ServerException("Server is rotating map");
-            }
-
-            return StatusPlayers;
-        }
-    }
-}

Application/RconParsers/IW5MRConParser.cs

@@ -1,171 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System.Text;
-
-using SharedLibraryCore;
-using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.Objects;
-using SharedLibraryCore.RCon;
-using SharedLibraryCore.Exceptions;
-using SharedLibraryCore.Database.Models;
-
-namespace IW4MAdmin.Application.RconParsers
-{
-    public class IW5MRConParser : IRConParser
-    {
-        private static readonly CommandPrefix Prefixes = new CommandPrefix()
-        {
-            Tell = "tell {0} {1}",
-            Say = "say {0}",
-            Kick = "dropClient {0} \"{1}\"",
-            Ban = "dropClient {0} \"{1}\"",
-            TempBan = "dropClient {0} \"{1}\""
-        };
-
-        public CommandPrefix GetCommandPrefixes() => Prefixes;
-
-        public async Task<string[]> ExecuteCommandAsync(Connection connection, string command)
-        {
-            await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND, command, false);
-            return new string[] { "Command Executed" };
-        }
-
-        public async Task<Dvar<T>> GetDvarAsync<T>(Connection connection, string dvarName)
-        {
-            // why can't this be real :(
-            if (dvarName == "version")
-                return new Dvar<T>(dvarName)
-                {
-                    Value = (T)Convert.ChangeType("IW5 MP 1.9 build 461 Fri Sep 14 00:04:28 2012 win-x86", typeof(T))
-                };
-
-            if (dvarName == "shortversion")
-                return new Dvar<T>(dvarName)
-                {
-                    Value = (T)Convert.ChangeType("1.9", typeof(T))
-                };
-
-            if (dvarName == "mapname")
-                return new Dvar<T>(dvarName)
-                {
-                    Value = (T)Convert.ChangeType("Unknown", typeof(T))
-                };
-
-            if (dvarName == "g_gametype")
-                return new Dvar<T>(dvarName)
-                {
-                    Value = (T)Convert.ChangeType("Unknown", typeof(T))
-                };
-
-            if (dvarName == "fs_game")
-                return new Dvar<T>(dvarName)
-                {
-                    Value = (T)Convert.ChangeType("", typeof(T))
-                };
-
-            if (dvarName == "g_logsync")
-                return new Dvar<T>(dvarName)
-                {
-                    Value = (T)Convert.ChangeType(1, typeof(T))
-                };
-
-            if (dvarName == "fs_basepath")
-                return new Dvar<T>(dvarName)
-                {
-                    Value = (T)Convert.ChangeType("", typeof(T))
-                };
-
-
-
-            string[] LineSplit = await connection.SendQueryAsync(StaticHelpers.QueryType.DVAR, dvarName);
-
-            if (LineSplit.Length < 4)
-            {
-                var e = new DvarException($"DVAR \"{dvarName}\" does not exist");
-                e.Data["dvar_name"] = dvarName;
-                throw e;
-            }
-
-            string[] ValueSplit = LineSplit[1].Split(new char[] { '"' });
-
-            if (ValueSplit.Length == 0)
-            {
-                var e = new DvarException($"DVAR \"{dvarName}\" does not exist");
-                e.Data["dvar_name"] = dvarName;
-                throw e;
-            }
-
-            string DvarName = dvarName;
-            string DvarCurrentValue = Regex.Replace(ValueSplit[3].StripColors(), @"\^[0-9]", "");
-
-            return new Dvar<T>(DvarName)
-            {
-                Value = (T)Convert.ChangeType(DvarCurrentValue, typeof(T))
-            };
-        }
-
-        public async Task<List<EFClient>> GetStatusAsync(Connection connection)
-        {
-            string[] response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND, "status");
-            return ClientsFromStatus(response);
-        }
-
-        public async Task<bool> SetDvarAsync(Connection connection, string dvarName, object dvarValue)
-        {
-            // T6M doesn't respond with anything when a value is set, so we can only hope for the best :c
-            await connection.SendQueryAsync(StaticHelpers.QueryType.DVAR, $"set {dvarName} {dvarValue}", false);
-            return true;
-        }
-
-        private List<EFClient> ClientsFromStatus(string[] status)
-        {
-            List<EFClient> StatusPlayers = new List<EFClient>();
-
-            foreach (string statusLine in status)
-            {
-                String responseLine = statusLine;
-
-                if (Regex.Matches(responseLine, @"^ *\d+", RegexOptions.IgnoreCase).Count > 0) // its a client line!
-                {
-                    String[] playerInfo = responseLine.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
-
-                    // this happens when the client is in a zombie state
-                    if (playerInfo.Length < 5)
-                        continue;
-                    int clientId = -1;
-                    int Ping = -1;
-
-                    Int32.TryParse(playerInfo[2], out Ping);
-                    string name = Encoding.UTF8.GetString(Encoding.Convert(Utilities.EncodingType, Encoding.UTF8, Utilities.EncodingType.GetBytes(responseLine.Substring(23, 15).StripColors().Trim())));
-                    long networkId = 0;//playerInfo[4].ConvertLong();
-                    int.TryParse(playerInfo[0], out clientId);
-                    var regex = Regex.Match(responseLine, @"\d+\.\d+\.\d+.\d+\:\d{1,5}");
-                    int ipAddress = regex.Value.Split(':')[0].ConvertToIP();
-                    regex = Regex.Match(responseLine, @" +(\d+ +){3}");
-                    int score = Int32.Parse(regex.Value.Split(' ', StringSplitOptions.RemoveEmptyEntries)[0]);
-
-                    var p = new EFClient()
-                    {
-                        Name = name,
-                        NetworkId = networkId,
-                        ClientNumber = clientId,
-                        IPAddress = ipAddress,
-                        Ping = Ping,
-                        Score = score,
-                        IsBot = false,
-                        State = EFClient.ClientState.Connecting
-                    };
-
-                    StatusPlayers.Add(p);
-
-                    if (p.IsBot)
-                        p.NetworkId = -p.ClientNumber;
-                }
-            }
-
-            return StatusPlayers;
-        }
-    }
-}

Application/RconParsers/T6MRConParser.cs

@@ -1,124 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-
-using SharedLibraryCore;
-using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.Objects;
-using SharedLibraryCore.RCon;
-using SharedLibraryCore.Exceptions;
-using System.Text;
-using SharedLibraryCore.Database.Models;
-
-namespace IW4MAdmin.Application.RconParsers
-{
-    public class T6MRConParser : IRConParser
-    {
-        private static readonly CommandPrefix Prefixes = new CommandPrefix()
-        {
-            Tell = "tell {0} {1}",
-            Say = "say {0}",
-            Kick = "clientkick_for_reason {0} \"{1}\"",
-            Ban = "clientkick_for_reason {0} \"{1}\"",
-            TempBan = "clientkick_for_reason {0} \"{1}\""
-        };
-
-        public CommandPrefix GetCommandPrefixes() => Prefixes;
-
-        public async Task<string[]> ExecuteCommandAsync(Connection connection, string command)
-        {
-            await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND, command, false);
-            return new string[] { "Command Executed" };
-        }
-
-        public async Task<Dvar<T>> GetDvarAsync<T>(Connection connection, string dvarName)
-        {
-            string[] LineSplit = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND, $"get {dvarName}");
-
-            if (LineSplit.Length < 2)
-            {
-                var e = new DvarException($"DVAR \"{dvarName}\" does not exist");
-                e.Data["dvar_name"] = dvarName;
-                throw e;
-            }
-
-            string[] ValueSplit = LineSplit[1].Split(new char[] { '"' });
-
-            if (ValueSplit.Length == 0)
-            {
-                var e = new DvarException($"DVAR \"{dvarName}\" does not exist");
-                e.Data["dvar_name"] = dvarName;
-                throw e;
-            }
-
-            string DvarName = dvarName;
-            string DvarCurrentValue = Regex.Replace(ValueSplit[1], @"\^[0-9]", "");
-
-            return new Dvar<T>(DvarName)
-            {
-                Value = (T)Convert.ChangeType(DvarCurrentValue, typeof(T))
-            };
-        }
-
-        public async Task<List<EFClient>> GetStatusAsync(Connection connection)
-        {
-            string[] response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND, "status");
-            return ClientsFromStatus(response);
-        }
-
-        public async Task<bool> SetDvarAsync(Connection connection, string dvarName, object dvarValue)
-        {
-            // T6M doesn't respond with anything when a value is set, so we can only hope for the best :c
-            await connection.SendQueryAsync(StaticHelpers.QueryType.DVAR, $"set {dvarName} {dvarValue}", false);
-            return true;
-        }
-
-        private List<EFClient> ClientsFromStatus(string[] status)
-        {
-            List<EFClient> StatusPlayers = new List<EFClient>();
-
-            foreach (string statusLine in status)
-            {
-                String responseLine = statusLine;
-
-                if (Regex.Matches(responseLine, @"^ *\d+", RegexOptions.IgnoreCase).Count > 0) // its a client line!
-                {
-                    String[] playerInfo = responseLine.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
-                    int clientId = -1;
-                    int Ping = -1;
-
-                    Int32.TryParse(playerInfo[3], out Ping);
-                    var regex = Regex.Match(responseLine, @"\^7.*\ +0 ");
-                    string name = Encoding.UTF8.GetString(Encoding.Convert(Utilities.EncodingType, Encoding.UTF8, Utilities.EncodingType.GetBytes(regex.Value.Substring(0, regex.Value.Length - 2).StripColors().Trim())));
-                    long networkId = playerInfo[4].ConvertLong();
-                    int.TryParse(playerInfo[0], out clientId);
-                    regex = Regex.Match(responseLine, @"\d+\.\d+\.\d+.\d+\:\d{1,5}");
-#if DEBUG
-                    Ping = 1;
-#endif
-                    int ipAddress = regex.Value.Split(':')[0].ConvertToIP();
-                    regex = Regex.Match(responseLine, @"[0-9]{1,2}\s+[0-9]+\s+");
-                    var p = new EFClient()
-                    {
-                        Name = name,
-                        NetworkId = networkId,
-                        ClientNumber = clientId,
-                        IPAddress = ipAddress,
-                        Ping = Ping,
-                        Score = 0,
-                        State = EFClient.ClientState.Connecting,
-                        IsBot = networkId == 0
-                    };
-
-                    if (p.IsBot)
-                        p.NetworkId = -p.ClientNumber;
-
-                    StatusPlayers.Add(p);
-                }
-            }
-
-            return StatusPlayers;
-        }
-    }
-}

IW4MAdmin.sln

@@ -38,9 +38,11 @@ Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "DiscordWebhook", "DiscordWe
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ScriptPlugins", "ScriptPlugins", "{3F9ACC27-26DB-49FA-BCD2-50C54A49C9FA}"
 	ProjectSection(SolutionItems) = preProject
+		Plugins\ScriptPlugins\ParserIW3.js = Plugins\ScriptPlugins\ParserIW3.js
+		Plugins\ScriptPlugins\ParserPT6.js = Plugins\ScriptPlugins\ParserPT6.js
+		Plugins\ScriptPlugins\ParserTeknoMW3.js = Plugins\ScriptPlugins\ParserTeknoMW3.js
 		Plugins\ScriptPlugins\SharedGUIDKick.js = Plugins\ScriptPlugins\SharedGUIDKick.js
 		Plugins\ScriptPlugins\VPNDetection.js = Plugins\ScriptPlugins\VPNDetection.js
-		Plugins\ScriptPlugins\VpnDetectionPrivate.js = Plugins\ScriptPlugins\VpnDetectionPrivate.js
 	EndProjectSection
 EndProject
 Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "GameLogServer", "GameLogServer\GameLogServer.pyproj", "{42EFDA12-10D3-4C40-A210-9483520116BC}"

Master/Master.pyproj

@@ -17,7 +17,7 @@
     <SuppressCollectPythonCloudServiceFiles>true</SuppressCollectPythonCloudServiceFiles>
     <Name>Master</Name>
     <RootNamespace>Master</RootNamespace>
-    <InterpreterId>MSBuild|env|X:\IW4MAdmin\GameLogServer\GameLogServer.pyproj</InterpreterId>
+    <InterpreterId>MSBuild|env_master|$(MSBuildProjectFullPath)</InterpreterId>
     <IsWindowsApplication>False</IsWindowsApplication>
     <PythonRunWebServerCommand>
     </PythonRunWebServerCommand>
@@ -119,7 +119,15 @@
     <Content Include="master\templates\layout.html" />
   </ItemGroup>
   <ItemGroup>
-    <InterpreterReference Include="MSBuild|env|X:\IW4MAdmin\GameLogServer\GameLogServer.pyproj" />
+    <Interpreter Include="env_master\">
+      <Id>env_master</Id>
+      <Version>3.6</Version>
+      <Description>env_master (Python 3.6 (64-bit))</Description>
+      <InterpreterPath>Scripts\python.exe</InterpreterPath>
+      <WindowsInterpreterPath>Scripts\pythonw.exe</WindowsInterpreterPath>
+      <PathEnvironmentVariable>PYTHONPATH</PathEnvironmentVariable>
+      <Architecture>X64</Architecture>
+    </Interpreter>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.Web.targets" />
   <!-- Specify pre- and post-build commands in the BeforeBuild and 

Master/master/models/servermodel.py

@@ -1,8 +1,9 @@
 
 class ServerModel(object):
-    def __init__(self, id, port, game, hostname, clientnum, maxclientnum, map, gametype, ip):
+    def __init__(self, id, port, game, hostname, clientnum, maxclientnum, map, gametype, ip, version):
         self.id = id
         self.port = port
+        self.version = version
         self.game = game
         self.hostname = hostname
         self.clientnum = clientnum

Master/master/resources/instance.py

@@ -25,6 +25,8 @@ class Instance(Resource):
             for server in request.json['servers']:
                 if 'ip' not in server or server['ip'] == 'localhost':
                     server['ip'] = request.remote_addr
+                if 'version' not in server:
+                    server['version'] = 'Unknown'
             instance = InstanceSchema().load(request.json)
         except ValidationError as err:
             return {'message' : err.messages }, 400
@@ -37,6 +39,8 @@ class Instance(Resource):
             for server in request.json['servers']:
                if 'ip' not in server or server['ip'] == 'localhost':
                     server['ip'] = request.remote_addr
+               if 'version' not in server:
+                    server['version'] = 'Unknown'
             instance = InstanceSchema().load(request.json)
         except ValidationError as err:
             return {'message' : err.messages }, 400

Master/master/schema/serverschema.py

@@ -13,6 +13,10 @@ class ServerSchema(Schema):
         required=True,
         validate=validate.Range(1, 65535, 'invalid port')
     )
+    version = fields.String(
+        required=False,
+        validate=validate.Length(0, 128, 'invalid server version')
+    )
     game = fields.String(
         required=True,
         validate=validate.Length(1, 5, 'invalid game name')

Plugins/Login/Plugin.cs

@@ -6,7 +6,6 @@ using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Exceptions;
 using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.Objects;
 
 namespace IW4MAdmin.Plugins.Login
 {
@@ -23,7 +22,7 @@ namespace IW4MAdmin.Plugins.Login
 
         public Task OnEventAsync(GameEvent E, Server S)
         {
-            if (E.Remote || Config.RequirePrivilegedClientLogin == false)
+            if (E.IsRemote || Config.RequirePrivilegedClientLogin == false)
                 return Task.CompletedTask;
 
             if (E.Type == GameEvent.EventType.Connect)

Plugins/ScriptPlugins/ParserIW3.js

@@ -0,0 +1,33 @@
+var rconParser;
+var eventParser;
+
+var plugin = {
+    author: 'RaidMax',
+    version: 0.1,
+    name: 'IW3 Parser',
+    isParser: true,
+
+    onEventAsync: function (gameEvent, server) {
+    },
+
+    onLoadAsync: function (manager) {
+        rconParser = manager.GenerateDynamicRConParser();
+        eventParser = manager.GenerateDynamicEventParser();
+
+        rconParser.Configuration.CommandPrefixes.Tell    = 'tell {0} {1}';
+        rconParser.Configuration.CommandPrefixes.Say     = 'say {0}';
+        rconParser.Configuration.CommandPrefixes.Kick    = 'clientkick {0} "{1}"';
+        rconParser.Configuration.CommandPrefixes.Ban     = 'clientkick {0} "{1}"';
+        rconParser.Configuration.CommandPrefixes.TempBan = 'tempbanclient {0} "{1}"';
+        rconParser.Version = 'CoD4 MP 1.8 build 13620 Thu Oct 04 00:43:04 2007 win-x86';
+
+        eventParser.Configuration.GameDirectory = 'main';
+        eventParser.Version = 'CoD4 MP 1.8 build 13620 Thu Oct 04 00:43:04 2007 win-x86';
+    },
+
+    onUnloadAsync: function () {
+    },
+
+    onTickAsync: function (server) {
+    }
+};

Plugins/ScriptPlugins/ParserPT6.js

@@ -0,0 +1,49 @@
+var rconParser;
+var eventParser;
+
+var plugin = {
+    author: 'RaidMax',
+    version: 0.1,
+    name: 'Plutoniun T6 Parser',
+    isParser: true,
+
+    onEventAsync: function (gameEvent, server) {
+    },
+
+    onLoadAsync: function (manager) {
+        rconParser = manager.GenerateDynamicRConParser();
+        eventParser = manager.GenerateDynamicEventParser();
+
+        rconParser.Configuration.CommandPrefixes.Tell        = 'tell {0} {1}';
+        rconParser.Configuration.CommandPrefixes.Say         = 'say {0}';
+        rconParser.Configuration.CommandPrefixes.Kick        = 'clientkick_for_reason {0} "{1}"';
+        rconParser.Configuration.CommandPrefixes.Ban         = 'clientkick_for_reason {0} "{1}"';
+        rconParser.Configuration.CommandPrefixes.TempBan     = 'clientkick_for_reason {0} "{1}"';
+        rconParser.Configuration.CommandPrefixes.RConGetDvar = '\xff\xff\xff\xffrcon {0} get {1}';
+
+        rconParser.Configuration.Dvar.Pattern = '^(.+) is "(.+)?"$';
+        rconParser.Configuration.Dvar.AddMapping(106, 1);
+        rconParser.Configuration.Dvar.AddMapping(107, 2);
+        rconParser.Configuration.WaitForResponse = false;
+
+        rconParser.Configuration.Status.Pattern = '^ *([0-9]+) +([0-9]+) +(.+) +((?:[A-Z]+|[0-9]+)) +((?:[A-Z]|[0-9]){8,16}) +(.{0,16}) +([0-9]+) +(\\d+\\.\\d+\\.\\d+\\.\\d+\\:-?\\d{1,5}|0+\\.0+:-?\\d{1,5}|loopback) +(-?[0-9]+) +([0-9]+) *$'
+        rconParser.Configuration.Status.AddMapping(100, 1);
+        rconParser.Configuration.Status.AddMapping(101, 2);
+        rconParser.Configuration.Status.AddMapping(102, 4);
+        rconParser.Configuration.Status.AddMapping(103, 5);
+        rconParser.Configuration.Status.AddMapping(104, 6);
+        rconParser.Configuration.Status.AddMapping(105, 8);
+
+
+        eventParser.Configuration.GameDirectory = 't6r\\\\data';
+
+        rconParser.Version = 'Call of Duty Multiplayer - Ship COD_T6_S MP build 1.0.44 CL(1759941) CODPCAB2 CEG Fri May 9 19:19:19 2014 win-x86 813e66d5';
+        eventParser.Version = 'Call of Duty Multiplayer - Ship COD_T6_S MP build 1.0.44 CL(1759941) CODPCAB2 CEG Fri May 9 19:19:19 2014 win-x86 813e66d5';
+    },
+
+    onUnloadAsync: function () {
+    },
+
+    onTickAsync: function (server) {
+    }
+};

Plugins/ScriptPlugins/ParserTeknoMW3.js

@@ -0,0 +1,40 @@
+var rconParser;
+var eventParser;
+
+var plugin = {
+    author: 'RaidMax',
+    version: 0.1,
+    name: 'Tekno MW3 Parser',
+    isParser: true,
+
+    onEventAsync: function (gameEvent, server) {
+    },
+
+    onLoadAsync: function (manager) {
+        rconParser = manager.GenerateDynamicRConParser();
+        eventParser = manager.GenerateDynamicEventParser();
+
+        rconParser.Configuration.Status.Pattern = '^ *([0-9]+) +([0-9]+) +((?:[A-Z]+|[0-9]+)) +((?:[A-Z]|[0-9]){16,32})\t +(.{0,16}) +([0-9]+) +(\\d+\\.\\d+\\.\\d+\\.\\d+\\:-?\\d{1,5}|0+\\.0+\\:-?\\d{1,5}|loopback) *$';
+        rconParser.Configuration.Status.AddMapping(104, 5); // RConName
+        rconParser.Configuration.Status.AddMapping(103, 4); // RConNetworkId
+        rconParser.Configuration.CommandPrefixes.RConGetInfo = undefined;
+        rconParser.Configuration.CommandPrefixes.RConResponse = '\xff\xff\xff\xff';
+        rconParser.Configuration.CommandPrefixes.Tell = 'tell {0} {1}';
+        rconParser.Configuration.CommandPrefixes.Say = 'say {0}';
+        rconParser.Configuration.CommandPrefixes.Kick = 'dropclient {0} "{1}"';
+        rconParser.Configuration.CommandPrefixes.Ban = 'dropclient {0} "{1}"';
+        rconParser.Configuration.CommandPrefixes.TempBan = 'tempbanclient {0} "{1}"';
+        rconParser.Configuration.Dvar.AddMapping(107, 1); // RCon DvarValue
+        rconParser.Configuration.Dvar.Pattern = '^(.*)$';
+        rconParser.Version = 'IW5 MP 1.4 build 382 latest Thu Jan 19 2012 11:09:49AM win-x86';
+
+        eventParser.Configuration.GameDirectory = 'scripts';
+        eventParser.Version = 'IW5 MP 1.4 build 382 latest Thu Jan 19 2012 11:09:49AM win-x86';
+    },
+
+    onUnloadAsync: function () {
+    },
+
+    onTickAsync: function (server) {
+    }
+};

Plugins/Stats/Helpers/StatManager.cs

@@ -618,8 +618,9 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
                                         }
                                     },
                         Level = EFClient.Permission.Console,
-                        CurrentServer = attacker.CurrentServer
-                    });
+                        CurrentServer = attacker.CurrentServer,
+
+                    }, false);
                     if (clientDetection.Tracker.HasChanges)
                     {
                         SaveTrackedSnapshots(clientDetection, ctx);

RunPublishPre.cmd

@@ -1,7 +1,7 @@
 dotnet publish WebfrontCore/WebfrontCore.csproj -c Prerelease -o X:\IW4MAdmin\Publish\WindowsPrerelease /p:PublishProfile=Prerelease
 dotnet publish Application/Application.csproj -c Prerelease -o X:\IW4MAdmin\Publish\WindowsPrerelease /p:PublishProfile=Prerelease
 dotnet publish GameLogServer/GameLogServer.pyproj -c Release -o X:\IW4MAdmin\Publish\WindowsPrerelease\GameLogServer
-dotnet publish GameLogServer/DiscordWebhook.pyproj -c Release -o X:\IW4MAdmin\Publish\WindowsPrerelease\DiscordWebhook
+::dotnet publish GameLogServer/DiscordWebhook.pyproj -c Release -o X:\IW4MAdmin\Publish\WindowsPrerelease\DiscordWebhook
 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsDevCmd.bat"
 msbuild  GameLogServer/GameLogServer.pyproj  /p:PublishProfile=PreRelease /p:DeployOnBuild=true /p:PublishProfileRootFolder=X:\IW4MAdmin\GameLogServer\
 msbuild  DiscordWebhook/DiscordWebhook.pyproj  /p:PublishProfile=PreRelease /p:DeployOnBuild=true /p:PublishProfileRootFolder=X:\IW4MAdmin\DiscordWebhook\

SharedLibraryCore/Commands/NativeCommands.cs

@@ -231,7 +231,7 @@ namespace SharedLibraryCore.Commands
 
         public override async Task ExecuteAsync(GameEvent E)
         {
-            var _ = !(await E.Target.Ban(E.Data, E.Origin).WaitAsync()).Failed ?
+            var _ = !(await E.Target.Ban(E.Data, E.Origin, false).WaitAsync()).Failed ?
                     E.Origin.Tell($"^5{E.Target} ^7{Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_BAN_SUCCESS"]}") :
                     E.Origin.Tell($"{Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_BAN_FAIL"]} {E.Target.Name}");
         }

SharedLibraryCore/Configuration/ApplicationConfiguration.cs

@@ -16,6 +16,8 @@ namespace SharedLibraryCore.Configuration
         public string SocialLinkAddress { get; set; }
         public string SocialLinkTitle { get; set; }
         public string WebfrontBindUrl { get; set; }
+        public string ManualWebfrontUrl { get; set; }
+        public string WebfrontUrl => string.IsNullOrEmpty(ManualWebfrontUrl) ? WebfrontBindUrl.Replace("0.0.0.0", "127.0.0.1") : ManualWebfrontUrl;
         public string CustomParserEncoding { get; set; }
         public string CustomLocale { get; set; }
         public string DatabaseProvider { get; set; } = "sqlite";

SharedLibraryCore/Configuration/ServerConfiguration.cs

@@ -1,6 +1,7 @@
 using SharedLibraryCore.Interfaces;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace SharedLibraryCore.Configuration
 {
@@ -11,11 +12,22 @@ namespace SharedLibraryCore.Configuration
         public string Password { get; set; }
         public IList<string> Rules { get; set; }
         public IList<string> AutoMessages { get; set; }
-        public bool UseT6MParser { get; set; }
-        public bool UseIW5MParser { get; set; }
         public string ManualLogPath { get; set; }
+        public string CustomParserVersion { get; set; }
         public int ReservedSlotNumber { get; set; }
 
+        private readonly IList<IRConParser> rconParsers;
+        private readonly IList<IEventParser> eventParsers;
+
+        public ServerConfiguration()
+        {
+            rconParsers = new List<IRConParser>();
+            eventParsers = new List<IEventParser>();
+        }
+
+        public void AddRConParser(IRConParser parser) => rconParsers.Add(parser);
+        public void AddEventParser(IEventParser parser) => eventParsers.Add(parser);
+
         public IBaseConfiguration Generate()
         {
             var loc = Utilities.CurrentLocalization.LocalizationIndex;
@@ -36,18 +48,25 @@ namespace SharedLibraryCore.Configuration
             }
 
             Password = Utilities.PromptString(loc["SETUP_SERVER_RCON"]);
-
             AutoMessages = new List<string>();
             Rules = new List<string>();
+            ReservedSlotNumber = loc["SETUP_SERVER_RESERVEDSLOT"].PromptInt(null, 0, 32);
 
+            var parserVersions = rconParsers.Select(_parser => _parser.Version).ToArray();
+            var selection = Utilities.PromptSelection(loc["SETUP_SERVER_RCON_PARSER_VERSION"], $"{loc["SETUP_PROMPT_DEFAULT"]} (IW4x)", null, parserVersions);
 
-            UseT6MParser = Utilities.PromptBool(loc["SETUP_SERVER_USET6M"]);
-            if (!UseT6MParser)
-                UseIW5MParser = Utilities.PromptBool(loc["SETUP_SERVER_USEIW5M"]);
-            if (UseIW5MParser)
-                ManualLogPath = Utilities.PromptString(loc["SETUP_SERVER_MANUALLOG"]);
+            if (selection.Item1 > 0)
+            {
+                CustomParserVersion = selection.Item2;
+            }
 
-            ReservedSlotNumber = loc["SETUP_SERVER_RESERVEDSLOT"].PromptInt(0, 32);
+            parserVersions = eventParsers.Select(_parser => _parser.Version).ToArray();
+            selection = Utilities.PromptSelection(loc["SETUP_SERVER_EVENT_PARSER_VERSION"], $"{loc["SETUP_PROMPT_DEFAULT"]} (IW4x)", null, parserVersions);
+
+            if (selection.Item1 > 0)
+            {
+                CustomParserVersion = selection.Item2;
+            }
 
             return this;
         }

SharedLibraryCore/Database/DatabaseContext.cs

@@ -36,6 +36,13 @@ namespace SharedLibraryCore.Database
                 this.ChangeTracker.LazyLoadingEnabled = false;
                 this.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking;
             }
+
+            else
+            {
+                this.ChangeTracker.AutoDetectChangesEnabled = true;
+                this.ChangeTracker.LazyLoadingEnabled = true;
+                this.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.TrackAll;
+            }
         }
 
         public DatabaseContext(string connStr, string provider)

SharedLibraryCore/Database/Models/EFPenalty.cs

@@ -1,10 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SharedLibraryCore.Database.Models
 {
@@ -31,6 +27,8 @@ namespace SharedLibraryCore.Database.Models
         [Required]
         public string Offense { get; set; }
         public string AutomatedOffense { get; set; }
+        [Required]
+        public bool IsEvadedOffense { get; set; }
         public Objects.Penalty.PenaltyType Type { get; set; }
     }
 }

SharedLibraryCore/Dvar.cs

@@ -2,12 +2,10 @@
 {
     public class Dvar<T>
     {
-        public string Name { get; private set; }
-        public T Value;
-
-        public Dvar(string name)
-        {
-            Name = name;
-        }
+        public string Name { get; set; }
+        public T Value { get; set; }
+        public T DefaultValue { get; set; }
+        public T LatchedValue { get; set; }
+        public string Domain { get; set; }
     }
 }

SharedLibraryCore/Events/GameEvent.cs

@@ -188,7 +188,7 @@ namespace SharedLibraryCore
         public EFClient Origin;
         public EFClient Target;
         public Server Owner;
-        public Boolean Remote = false;
+        public bool IsRemote { get; set; } = false;
         public object Extra { get; set; }
         public ManualResetEventSlim OnProcessed { get; set; }
         public DateTime Time { get; set; }

SharedLibraryCore/Helpers/BaseConfigurationHandler.cs

@@ -1,5 +1,6 @@
 using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json;
+using SharedLibraryCore.Exceptions;
 using SharedLibraryCore.Interfaces;
 using System;
 using System.Collections.Generic;

SharedLibraryCore/Helpers/ParserRegex.cs

@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SharedLibraryCore.Interfaces
+{
+    public sealed class ParserRegex
+    {
+        /// <summary>
+        /// represents the logical mapping of information provided by 
+        /// game logs, get status, and get dvar information
+        /// </summary>
+        public enum GroupType
+        {
+            EventType,
+            OriginNetworkId,
+            TargetNetworkId,
+            OriginClientNumber,
+            TargetClientNumber,
+            OriginName,
+            TargetName,
+            OriginTeam,
+            TargetTeam,
+            Weapon,
+            Damage,
+            MeansOfDeath,
+            HitLocation,
+            Message,
+            RConClientNumber = 100,
+            RConScore = 101,
+            RConPing = 102,
+            RConNetworkId = 103,
+            RConName = 104,
+            RConIpAddress = 105,
+            RConDvarName = 106,
+            RConDvarValue = 107,
+            RConDvarDefaultValue = 108,
+            RConDvarLatchedValue = 109,
+            RConDvarDomain = 110,
+            AdditionalGroup = 200
+        }
+
+        /// <summary>
+        /// stores the regular expression groups that will be mapped to group types
+        /// </summary>
+        public string Pattern { get; set; }
+
+        /// <summary>
+        /// stores the mapping from group type to group index in the regular expression
+        /// </summary>
+        public Dictionary<GroupType, int> GroupMapping { get; private set; }
+
+        /// <summary>
+        /// helper method to enable script parsers to app regex mapping
+        /// the first parameter specifies the group type contained in the regex pattern
+        /// the second parameter specifies the group index to retrieve in the matched regex pattern
+        /// </summary>
+        /// <param name="mapKey">group type</param>
+        /// <param name="mapValue">group index</param>
+        public void AddMapping(object mapKey, object mapValue)
+        {
+            if (int.TryParse(mapKey.ToString(), out int key) && int.TryParse(mapValue.ToString(), out int value))
+            {
+                if (GroupMapping.ContainsKey((GroupType)key))
+                {
+                    GroupMapping[(GroupType)key] = value;
+                }
+
+                else
+                {
+                    GroupMapping.Add((GroupType)key, value);
+                }
+            }
+
+            if (mapKey.GetType() == typeof(GroupType) && mapValue.GetType().ToString() == "System.Int32")
+            {
+                GroupType k = (GroupType)Enum.Parse(typeof(GroupType), mapKey.ToString());
+                int v = int.Parse(mapValue.ToString());
+
+                if (GroupMapping.ContainsKey(k))
+                {
+                    GroupMapping[k] = v;
+                }
+
+                else
+                {
+                    GroupMapping.Add(k, v);
+                }
+            }
+        }
+
+        public ParserRegex()
+        {
+            GroupMapping = new Dictionary<GroupType, int>();
+        }
+    }
+}

SharedLibraryCore/Helpers/Vector3.cs

@@ -21,6 +21,7 @@ namespace SharedLibraryCore.Helpers
         {
 
         }
+
         public Vector3(float x, float y, float z)
         {
             X = x;

SharedLibraryCore/Interfaces/IEventParser.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace SharedLibraryCore.Interfaces
+namespace SharedLibraryCore.Interfaces
 {
     public interface IEventParser
     {
@@ -18,6 +14,7 @@ namespace SharedLibraryCore.Interfaces
         /// Get game specific folder prefix for log files
         /// </summary>
         /// <returns>Game directory prefix</returns>
-        string GetGameDir();
+        IEventParserConfiguration Configuration { get; set; }
+        string Version { get; set; }
     }
 }

SharedLibraryCore/Interfaces/IEventParserConfiguration.cs

@@ -0,0 +1,34 @@
+namespace SharedLibraryCore.Interfaces
+{
+    public interface IEventParserConfiguration
+    {
+        /// <summary>
+        /// stores the fs_game directory (this folder may vary between different clients)
+        /// </summary>
+        string GameDirectory { get; set; }
+        /// <summary>
+        /// stores the regex information for a say event printed in the game log
+        /// </summary>
+        ParserRegex Say { get; set; }
+        /// <summary>
+        /// stores the regex information for a join event printed in the game log
+        /// </summary>
+        ParserRegex Join { get; set; }
+        /// <summary>
+        /// stores the regex information for a quit event printed in the game log
+        /// </summary>
+        ParserRegex Quit { get; set; }
+        /// <summary>
+        /// stores the regex information for a kill event printed in the game log
+        /// </summary>
+        ParserRegex Kill { get; set; }
+        /// <summary>
+        /// stores the regex information for a damage event printed in the game log
+        /// </summary>
+        ParserRegex Damage { get; set; }
+        /// <summary>
+        /// stores the regex information for an action event printed in the game log
+        /// </summary>
+        ParserRegex Action { get; set; }
+    }
+}

SharedLibraryCore/Interfaces/IManager.cs

@@ -40,6 +40,10 @@ namespace SharedLibraryCore.Interfaces
         /// </summary>
         /// <returns></returns>
         IPageList GetPageList();
+        IList<IRConParser> AdditionalRConParsers { get; }
+        IList<IEventParser> AdditionalEventParsers { get; }
+        IRConParser GenerateDynamicRConParser();
+        IEventParser GenerateDynamicEventParser();
         string Version { get;}
     }
 }

SharedLibraryCore/Interfaces/IRConParser.cs

@@ -3,15 +3,53 @@ using System.Threading.Tasks;
 using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Objects;
 using SharedLibraryCore.RCon;
+using static SharedLibraryCore.Server;
 
 namespace SharedLibraryCore.Interfaces
 {
     public interface IRConParser
     {
+        /// <summary>
+        /// retrieves the value of a given DVAR
+        /// </summary>
+        /// <typeparam name="T">type of DVAR expected (string, int, float etc...)</typeparam>
+        /// <param name="connection">RCon connection to retrieve with</param>
+        /// <param name="dvarName">name of DVAR</param>
+        /// <returns></returns>
         Task<Dvar<T>> GetDvarAsync<T>(Connection connection, string dvarName);
+
+        /// <summary>
+        /// set value of DVAR by name
+        /// </summary>
+        /// <param name="connection">RCon connection to use</param>
+        /// <param name="dvarName">name of DVAR to set</param>
+        /// <param name="dvarValue">value to set DVAR to</param>
+        /// <returns></returns>
         Task<bool> SetDvarAsync(Connection connection, string dvarName, object dvarValue);
+
+        /// <summary>
+        /// executes a console command on the server
+        /// </summary>
+        /// <param name="connection">RCon connection to use</param>
+        /// <param name="command">console command to execute</param>
+        /// <returns></returns>
         Task<string[]> ExecuteCommandAsync(Connection connection, string command);
+
+        /// <summary>
+        /// get the list of connected clients from status response
+        /// </summary>
+        /// <param name="connection">RCon connection to use</param>
+        /// <returns></returns>
         Task<List<EFClient>> GetStatusAsync(Connection connection);
-        CommandPrefix GetCommandPrefixes();
+
+        /// <summary>
+        /// stores the RCon configuration
+        /// </summary>
+        IRConParserConfiguration Configuration { get; set; }
+
+        /// <summary>
+        /// stores the game/client specific version (usually the value of the "version" DVAR)
+        /// </summary>
+        string Version { get; set; }
     }
 }

SharedLibraryCore/Interfaces/IRConParserConfiguration.cs

@@ -0,0 +1,29 @@
+using SharedLibraryCore.RCon;
+
+namespace SharedLibraryCore.Interfaces
+{
+    public interface IRConParserConfiguration
+    {
+        /// <summary>
+        /// stores the command format for console commands
+        /// </summary>
+        CommandPrefix CommandPrefixes { get; set; }
+        /// <summary>
+        /// optionally stores the game name type
+        /// </summary>
+        Server.Game GameName { get; set; }
+        /// <summary>
+        /// stores the regex info for parsing get status response
+        /// </summary>
+        ParserRegex Status { get; set; }
+        /// <summary>
+        /// stores the regex info for parsing get DVAR responses
+        /// </summary>
+        ParserRegex Dvar { get; set; }
+        /// <summary>
+        /// indicates if the application should wait for response from server
+        /// when executing a command
+        /// </summary>
+        bool WaitForResponse { get; set; }
+    }
+}

SharedLibraryCore/Migrations/20181216214513_AddEvadePenaltyFlag.Designer.cs

@@ -0,0 +1,694 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using SharedLibraryCore.Database;
+
+namespace SharedLibraryCore.Migrations
+{
+    [DbContext(typeof(DatabaseContext))]
+    [Migration("20181216214513_AddEvadePenaltyFlag")]
+    partial class AddEvadePenaltyFlag
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.1.4-rtm-31024");
+
+            modelBuilder.Entity("IW4MAdmin.Plugins.Stats.Models.EFACSnapshot", b =>
+                {
+                    b.Property<int>("SnapshotId")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Active");
+
+                    b.Property<int>("ClientId");
+
+                    b.Property<int>("CurrentSessionLength");
+
+                    b.Property<double>("CurrentStrain");
+
+                    b.Property<int>("CurrentViewAngleId");
+
+                    b.Property<int>("Deaths");
+
+                    b.Property<double>("Distance");
+
+                    b.Property<double>("EloRating");
+
+                    b.Property<int>("HitDestinationId");
+
+                    b.Property<int>("HitLocation");
+
+                    b.Property<int>("HitOriginId");
+
+                    b.Property<int>("HitType");
+
+                    b.Property<int>("Hits");
+
+                    b.Property<int>("Kills");
+
+                    b.Property<int>("LastStrainAngleId");
+
+                    b.Property<double>("SessionAngleOffset");
+
+                    b.Property<double>("SessionSPM");
+
+                    b.Property<int>("SessionScore");
+
+                    b.Property<double>("StrainAngleBetween");
+
+                    b.Property<int>("TimeSinceLastEvent");
+
+                    b.Property<int>("WeaponId");
+
+                    b.Property<DateTime>("When");
+
+                    b.HasKey("SnapshotId");
+
+                    b.HasIndex("ClientId");
+
+                    b.HasIndex("CurrentViewAngleId");
+
+                    b.HasIndex("HitDestinationId");
+
+                    b.HasIndex("HitOriginId");
+
+                    b.HasIndex("LastStrainAngleId");
+
+                    b.ToTable("EFACSnapshot");
+                });
+
+            modelBuilder.Entity("IW4MAdmin.Plugins.Stats.Models.EFClientKill", b =>
+                {
+                    b.Property<long>("KillId")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Active");
+
+                    b.Property<int>("AttackerId");
+
+                    b.Property<int>("Damage");
+
+                    b.Property<int?>("DeathOriginVector3Id");
+
+                    b.Property<int>("DeathType");
+
+                    b.Property<double>("Fraction");
+
+                    b.Property<int>("HitLoc");
+
+                    b.Property<bool>("IsKill");
+
+                    b.Property<int?>("KillOriginVector3Id");
+
+                    b.Property<int>("Map");
+
+                    b.Property<long>("ServerId");
+
+                    b.Property<int>("VictimId");
+
+                    b.Property<int?>("ViewAnglesVector3Id");
+
+                    b.Property<double>("VisibilityPercentage");
+
+                    b.Property<int>("Weapon");
+
+                    b.Property<DateTime>("When");
+
+                    b.HasKey("KillId");
+
+                    b.HasIndex("AttackerId");
+
+                    b.HasIndex("DeathOriginVector3Id");
+
+                    b.HasIndex("KillOriginVector3Id");
+
+                    b.HasIndex("ServerId");
+
+                    b.HasIndex("VictimId");
+
+                    b.HasIndex("ViewAnglesVector3Id");
+
+                    b.ToTable("EFClientKills");
+                });
+
+            modelBuilder.Entity("IW4MAdmin.Plugins.Stats.Models.EFClientMessage", b =>
+                {
+                    b.Property<long>("MessageId")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Active");
+
+                    b.Property<int>("ClientId");
+
+                    b.Property<string>("Message");
+
+                    b.Property<long>("ServerId");
+
+                    b.Property<DateTime>("TimeSent");
+
+                    b.HasKey("MessageId");
+
+                    b.HasIndex("ClientId");
+
+                    b.HasIndex("ServerId");
+
+                    b.HasIndex("TimeSent");
+
+                    b.ToTable("EFClientMessages");
+                });
+
+            modelBuilder.Entity("IW4MAdmin.Plugins.Stats.Models.EFClientRatingHistory", b =>
+                {
+                    b.Property<int>("RatingHistoryId")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Active");
+
+                    b.Property<int>("ClientId");
+
+                    b.HasKey("RatingHistoryId");
+
+                    b.HasIndex("ClientId");
+
+                    b.ToTable("EFClientRatingHistory");
+                });
+
+            modelBuilder.Entity("IW4MAdmin.Plugins.Stats.Models.EFClientStatistics", b =>
+                {
+                    b.Property<int>("ClientId");
+
+                    b.Property<long>("ServerId");
+
+                    b.Property<bool>("Active");
+
+                    b.Property<int>("Deaths");
+
+                    b.Property<double>("EloRating");
+
+                    b.Property<int>("Kills");
+
+                    b.Property<double>("MaxStrain");
+
+                    b.Property<double>("RollingWeightedKDR");
+
+                    b.Property<double>("SPM");
+
+                    b.Property<double>("Skill");
+
+                    b.Property<int>("TimePlayed");
+
+                    b.Property<double>("VisionAverage");
+
+                    b.HasKey("ClientId", "ServerId");
+
+                    b.HasIndex("ServerId");
+
+                    b.ToTable("EFClientStatistics");
+                });
+
+            modelBuilder.Entity("IW4MAdmin.Plugins.Stats.Models.EFHitLocationCount", b =>
+                {
+                    b.Property<int>("HitLocationCountId")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Active");
+
+                    b.Property<int>("ClientId")
+                        .HasColumnName("EFClientStatistics_ClientId");
+
+                    b.Property<int>("HitCount");
+
+                    b.Property<float>("HitOffsetAverage");
+
+                    b.Property<int>("Location");
+
+                    b.Property<float>("MaxAngleDistance");
+
+                    b.Property<long>("ServerId")
+                        .HasColumnName("EFClientStatistics_ServerId");
+
+                    b.HasKey("HitLocationCountId");
+
+                    b.HasIndex("ServerId");
+
+                    b.HasIndex("ClientId", "ServerId");
+
+                    b.ToTable("EFHitLocationCounts");
+                });
+
+            modelBuilder.Entity("IW4MAdmin.Plugins.Stats.Models.EFRating", b =>
+                {
+                    b.Property<int>("RatingId")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Active");
+
+                    b.Property<int>("ActivityAmount");
+
+                    b.Property<bool>("Newest");
+
+                    b.Property<double>("Performance");
+
+                    b.Property<int>("Ranking");
+
+                    b.Property<int>("RatingHistoryId");
+
+                    b.Property<long?>("ServerId");
+
+                    b.Property<DateTime>("When");
+
+                    b.HasKey("RatingId");
+
+                    b.HasIndex("Performance");
+
+                    b.HasIndex("Ranking");
+
+                    b.HasIndex("RatingHistoryId");
+
+                    b.HasIndex("ServerId");
+
+                    b.HasIndex("When");
+
+                    b.ToTable("EFRating");
+                });
+
+            modelBuilder.Entity("IW4MAdmin.Plugins.Stats.Models.EFServer", b =>
+                {
+                    b.Property<long>("ServerId");
+
+                    b.Property<bool>("Active");
+
+                    b.Property<string>("EndPoint");
+
+                    b.Property<int>("Port");
+
+                    b.HasKey("ServerId");
+
+                    b.ToTable("EFServers");
+                });
+
+            modelBuilder.Entity("IW4MAdmin.Plugins.Stats.Models.EFServerStatistics", b =>
+                {
+                    b.Property<int>("StatisticId")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Active");
+
+                    b.Property<long>("ServerId");
+
+                    b.Property<long>("TotalKills");
+
+                    b.Property<long>("TotalPlayTime");
+
+                    b.HasKey("StatisticId");
+
+                    b.HasIndex("ServerId");
+
+                    b.ToTable("EFServerStatistics");
+                });
+
+            modelBuilder.Entity("SharedLibraryCore.Database.Models.EFAlias", b =>
+                {
+                    b.Property<int>("AliasId")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Active");
+
+                    b.Property<DateTime>("DateAdded");
+
+                    b.Property<int?>("IPAddress");
+
+                    b.Property<int>("LinkId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(24);
+
+                    b.HasKey("AliasId");
+
+                    b.HasIndex("IPAddress");
+
+                    b.HasIndex("LinkId");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("EFAlias");
+                });
+
+            modelBuilder.Entity("SharedLibraryCore.Database.Models.EFAliasLink", b =>
+                {
+                    b.Property<int>("AliasLinkId")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Active");
+
+                    b.HasKey("AliasLinkId");
+
+                    b.ToTable("EFAliasLinks");
+                });
+
+            modelBuilder.Entity("SharedLibraryCore.Database.Models.EFChangeHistory", b =>
+                {
+                    b.Property<int>("ChangeHistoryId")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Active");
+
+                    b.Property<string>("Comment")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("CurrentValue");
+
+                    b.Property<int>("OriginEntityId");
+
+                    b.Property<string>("PreviousValue");
+
+                    b.Property<int>("TargetEntityId");
+
+                    b.Property<DateTime>("TimeChanged");
+
+                    b.Property<int>("TypeOfChange");
+
+                    b.HasKey("ChangeHistoryId");
+
+                    b.ToTable("EFChangeHistory");
+                });
+
+            modelBuilder.Entity("SharedLibraryCore.Database.Models.EFClient", b =>
+                {
+                    b.Property<int>("ClientId")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Active");
+
+                    b.Property<int>("AliasLinkId");
+
+                    b.Property<int>("Connections");
+
+                    b.Property<int>("CurrentAliasId");
+
+                    b.Property<DateTime>("FirstConnection");
+
+                    b.Property<DateTime>("LastConnection");
+
+                    b.Property<int>("Level");
+
+                    b.Property<bool>("Masked");
+
+                    b.Property<long>("NetworkId");
+
+                    b.Property<string>("Password");
+
+                    b.Property<string>("PasswordSalt");
+
+                    b.Property<int>("TotalConnectionTime");
+
+                    b.HasKey("ClientId");
+
+                    b.HasIndex("AliasLinkId");
+
+                    b.HasIndex("CurrentAliasId");
+
+                    b.HasIndex("NetworkId")
+                        .IsUnique();
+
+                    b.ToTable("EFClients");
+                });
+
+            modelBuilder.Entity("SharedLibraryCore.Database.Models.EFMeta", b =>
+                {
+                    b.Property<int>("MetaId")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Active");
+
+                    b.Property<int>("ClientId");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Extra");
+
+                    b.Property<string>("Key")
+                        .IsRequired();
+
+                    b.Property<DateTime>("Updated");
+
+                    b.Property<string>("Value")
+                        .IsRequired();
+
+                    b.HasKey("MetaId");
+
+                    b.HasIndex("ClientId");
+
+                    b.ToTable("EFMeta");
+                });
+
+            modelBuilder.Entity("SharedLibraryCore.Database.Models.EFPenalty", b =>
+                {
+                    b.Property<int>("PenaltyId")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Active");
+
+                    b.Property<string>("AutomatedOffense");
+
+                    b.Property<DateTime?>("Expires");
+
+                    b.Property<bool>("IsEvadedOffense");
+
+                    b.Property<int>("LinkId");
+
+                    b.Property<int>("OffenderId");
+
+                    b.Property<string>("Offense")
+                        .IsRequired();
+
+                    b.Property<int>("PunisherId");
+
+                    b.Property<int>("Type");
+
+                    b.Property<DateTime>("When");
+
+                    b.HasKey("PenaltyId");
+
+                    b.HasIndex("LinkId");
+
+                    b.HasIndex("OffenderId");
+
+                    b.HasIndex("PunisherId");
+
+                    b.ToTable("EFPenalties");
+                });
+
+            modelBuilder.Entity("SharedLibraryCore.Helpers.Vector3", b =>
+                {
+                    b.Property<int>("Vector3Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int?>("EFACSnapshotSnapshotId");
+
+                    b.Property<float>("X");
+
+                    b.Property<float>("Y");
+
+                    b.Property<float>("Z");
+
+                    b.HasKey("Vector3Id");
+
+                    b.HasIndex("EFACSnapshotSnapshotId");
+
+                    b.ToTable("Vector3");
+                });
+
+            modelBuilder.Entity("IW4MAdmin.Plugins.Stats.Models.EFACSnapshot", b =>
+                {
+                    b.HasOne("SharedLibraryCore.Database.Models.EFClient", "Client")
+                        .WithMany()
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("SharedLibraryCore.Helpers.Vector3", "CurrentViewAngle")
+                        .WithMany()
+                        .HasForeignKey("CurrentViewAngleId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("SharedLibraryCore.Helpers.Vector3", "HitDestination")
+                        .WithMany()
+                        .HasForeignKey("HitDestinationId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("SharedLibraryCore.Helpers.Vector3", "HitOrigin")
+                        .WithMany()
+                        .HasForeignKey("HitOriginId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("SharedLibraryCore.Helpers.Vector3", "LastStrainAngle")
+                        .WithMany()
+                        .HasForeignKey("LastStrainAngleId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("IW4MAdmin.Plugins.Stats.Models.EFClientKill", b =>
+                {
+                    b.HasOne("SharedLibraryCore.Database.Models.EFClient", "Attacker")
+                        .WithMany()
+                        .HasForeignKey("AttackerId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("SharedLibraryCore.Helpers.Vector3", "DeathOrigin")
+                        .WithMany()
+                        .HasForeignKey("DeathOriginVector3Id");
+
+                    b.HasOne("SharedLibraryCore.Helpers.Vector3", "KillOrigin")
+                        .WithMany()
+                        .HasForeignKey("KillOriginVector3Id");
+
+                    b.HasOne("IW4MAdmin.Plugins.Stats.Models.EFServer", "Server")
+                        .WithMany()
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("SharedLibraryCore.Database.Models.EFClient", "Victim")
+                        .WithMany()
+                        .HasForeignKey("VictimId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("SharedLibraryCore.Helpers.Vector3", "ViewAngles")
+                        .WithMany()
+                        .HasForeignKey("ViewAnglesVector3Id");
+                });
+
+            modelBuilder.Entity("IW4MAdmin.Plugins.Stats.Models.EFClientMessage", b =>
+                {
+                    b.HasOne("SharedLibraryCore.Database.Models.EFClient", "Client")
+                        .WithMany()
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("IW4MAdmin.Plugins.Stats.Models.EFServer", "Server")
+                        .WithMany()
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("IW4MAdmin.Plugins.Stats.Models.EFClientRatingHistory", b =>
+                {
+                    b.HasOne("SharedLibraryCore.Database.Models.EFClient", "Client")
+                        .WithMany()
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("IW4MAdmin.Plugins.Stats.Models.EFClientStatistics", b =>
+                {
+                    b.HasOne("SharedLibraryCore.Database.Models.EFClient", "Client")
+                        .WithMany()
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("IW4MAdmin.Plugins.Stats.Models.EFServer", "Server")
+                        .WithMany()
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("IW4MAdmin.Plugins.Stats.Models.EFHitLocationCount", b =>
+                {
+                    b.HasOne("SharedLibraryCore.Database.Models.EFClient", "Client")
+                        .WithMany()
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("IW4MAdmin.Plugins.Stats.Models.EFServer", "Server")
+                        .WithMany()
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("IW4MAdmin.Plugins.Stats.Models.EFClientStatistics")
+                        .WithMany("HitLocations")
+                        .HasForeignKey("ClientId", "ServerId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("IW4MAdmin.Plugins.Stats.Models.EFRating", b =>
+                {
+                    b.HasOne("IW4MAdmin.Plugins.Stats.Models.EFClientRatingHistory", "RatingHistory")
+                        .WithMany("Ratings")
+                        .HasForeignKey("RatingHistoryId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("IW4MAdmin.Plugins.Stats.Models.EFServer", "Server")
+                        .WithMany()
+                        .HasForeignKey("ServerId");
+                });
+
+            modelBuilder.Entity("IW4MAdmin.Plugins.Stats.Models.EFServerStatistics", b =>
+                {
+                    b.HasOne("IW4MAdmin.Plugins.Stats.Models.EFServer", "Server")
+                        .WithMany()
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("SharedLibraryCore.Database.Models.EFAlias", b =>
+                {
+                    b.HasOne("SharedLibraryCore.Database.Models.EFAliasLink", "Link")
+                        .WithMany("Children")
+                        .HasForeignKey("LinkId")
+                        .OnDelete(DeleteBehavior.Restrict);
+                });
+
+            modelBuilder.Entity("SharedLibraryCore.Database.Models.EFClient", b =>
+                {
+                    b.HasOne("SharedLibraryCore.Database.Models.EFAliasLink", "AliasLink")
+                        .WithMany()
+                        .HasForeignKey("AliasLinkId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("SharedLibraryCore.Database.Models.EFAlias", "CurrentAlias")
+                        .WithMany()
+                        .HasForeignKey("CurrentAliasId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("SharedLibraryCore.Database.Models.EFMeta", b =>
+                {
+                    b.HasOne("SharedLibraryCore.Database.Models.EFClient", "Client")
+                        .WithMany("Meta")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("SharedLibraryCore.Database.Models.EFPenalty", b =>
+                {
+                    b.HasOne("SharedLibraryCore.Database.Models.EFAliasLink", "Link")
+                        .WithMany("ReceivedPenalties")
+                        .HasForeignKey("LinkId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("SharedLibraryCore.Database.Models.EFClient", "Offender")
+                        .WithMany("ReceivedPenalties")
+                        .HasForeignKey("OffenderId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.HasOne("SharedLibraryCore.Database.Models.EFClient", "Punisher")
+                        .WithMany("AdministeredPenalties")
+                        .HasForeignKey("PunisherId")
+                        .OnDelete(DeleteBehavior.Restrict);
+                });
+
+            modelBuilder.Entity("SharedLibraryCore.Helpers.Vector3", b =>
+                {
+                    b.HasOne("IW4MAdmin.Plugins.Stats.Models.EFACSnapshot")
+                        .WithMany("PredictedViewAngles")
+                        .HasForeignKey("EFACSnapshotSnapshotId");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

SharedLibraryCore/Migrations/20181216214513_AddEvadePenaltyFlag.cs

@@ -0,0 +1,183 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace SharedLibraryCore.Migrations
+{
+    public partial class AddEvadePenaltyFlag : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            if (migrationBuilder.ActiveProvider == "Microsoft.EntityFrameworkCore.Sqlite")
+            {
+                migrationBuilder.Sql(@"PRAGMA foreign_keys = 0;
+
+                    CREATE TABLE sqlitestudio_temp_table AS SELECT *
+                                                              FROM EFPenalties;
+                    
+                    DROP TABLE EFPenalties;
+                    
+                    CREATE TABLE EFPenalties (
+                        PenaltyId        INTEGER NOT NULL
+                                                 CONSTRAINT PK_EFPenalties PRIMARY KEY AUTOINCREMENT,
+                        Active           INTEGER NOT NULL,
+                        Expires          TEXT,
+                        LinkId           INTEGER NOT NULL,
+                        OffenderId       INTEGER NOT NULL,
+                        Offense          TEXT    NOT NULL,
+                        PunisherId       INTEGER NOT NULL,
+                        IsEvadedOffense  BOOLEAN NOT NULL
+                                                 DEFAULT (0),
+                        Type             INTEGER NOT NULL,
+                        [When]           TEXT    NOT NULL,
+                        AutomatedOffense TEXT,
+                        CONSTRAINT FK_EFPenalties_EFAliasLinks_LinkId FOREIGN KEY (
+                            LinkId
+                        )
+                        REFERENCES EFAliasLinks (AliasLinkId) ON DELETE CASCADE,
+                        CONSTRAINT FK_EFPenalties_EFClients_OffenderId FOREIGN KEY (
+                            OffenderId
+                        )
+                        REFERENCES EFClients (ClientId) ON DELETE RESTRICT,
+                        CONSTRAINT FK_EFPenalties_EFClients_PunisherId FOREIGN KEY (
+                            PunisherId
+                        )
+                        REFERENCES EFClients (ClientId) ON DELETE RESTRICT
+                    );
+                    
+                    INSERT INTO EFPenalties (
+                            PenaltyId,
+                            Active,
+                            Expires,
+                            LinkId,
+                            OffenderId,
+                            Offense,
+                            PunisherId,
+                            Type,
+                            [When],
+                            AutomatedOffense
+                        )
+                        SELECT PenaltyId,
+                               Active,
+                               Expires,
+                               LinkId,
+                               OffenderId,
+                               Offense,
+                               PunisherId,
+                               Type,
+                               ""When"",
+                               AutomatedOffense
+                          FROM sqlitestudio_temp_table;
+
+                    DROP TABLE sqlitestudio_temp_table;
+
+                    CREATE INDEX IX_EFPenalties_LinkId ON EFPenalties(
+                        ""LinkId""
+                    );
+
+                    CREATE INDEX IX_EFPenalties_OffenderId ON EFPenalties(
+                        ""OffenderId""
+                    );
+
+                    CREATE INDEX IX_EFPenalties_PunisherId ON EFPenalties(
+                        ""PunisherId""
+                    );
+
+                    PRAGMA foreign_keys = 1;", suppressTransaction: false);
+            }
+
+            else
+            {
+                migrationBuilder.AddColumn<bool>(
+                    name: "IsEvadedOffense",
+                    table: "EFPenalties",
+                    nullable: false,
+                    defaultValue: false);
+            }
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            if (migrationBuilder.ActiveProvider == "Microsoft.EntityFrameworkCore.Sqlite")
+            {
+                migrationBuilder.Sql(@"PRAGMA foreign_keys = 0;
+
+                CREATE TABLE sqlitestudio_temp_table AS SELECT *
+                                          FROM EFPenalties;
+
+                DROP TABLE EFPenalties;
+                
+                CREATE TABLE EFPenalties (
+                    PenaltyId        INTEGER NOT NULL
+                                             CONSTRAINT PK_EFPenalties PRIMARY KEY AUTOINCREMENT,
+                    Active           INTEGER NOT NULL,
+                    Expires          TEXT,
+                    LinkId           INTEGER NOT NULL,
+                    OffenderId       INTEGER NOT NULL,
+                    Offense          TEXT    NOT NULL,
+                    PunisherId       INTEGER NOT NULL,
+                    Type             INTEGER NOT NULL,
+                    [When]           TEXT    NOT NULL,
+                    AutomatedOffense TEXT,
+                    CONSTRAINT FK_EFPenalties_EFAliasLinks_LinkId FOREIGN KEY (
+                        LinkId
+                    )
+                    REFERENCES EFAliasLinks (AliasLinkId) ON DELETE CASCADE,
+                    CONSTRAINT FK_EFPenalties_EFClients_OffenderId FOREIGN KEY (
+                        OffenderId
+                    )
+                    REFERENCES EFClients (ClientId) ON DELETE RESTRICT,
+                    CONSTRAINT FK_EFPenalties_EFClients_PunisherId FOREIGN KEY (
+                        PunisherId
+                    )
+                    REFERENCES EFClients (ClientId) ON DELETE RESTRICT
+                );
+                
+                INSERT INTO EFPenalties (
+                            PenaltyId,
+                            Active,
+                            Expires,
+                            LinkId,
+                            OffenderId,
+                            Offense,
+                            PunisherId,
+                            Type,
+                            [When],
+                            AutomatedOffense
+                        )
+                        SELECT PenaltyId,
+                               Active,
+                               Expires,
+                               LinkId,
+                               OffenderId,
+                               Offense,
+                               PunisherId,
+                               Type,
+                               ""When"",
+                               AutomatedOffense
+                          FROM sqlitestudio_temp_table;
+
+                 DROP TABLE sqlitestudio_temp_table;
+
+                 CREATE INDEX IX_EFPenalties_LinkId ON EFPenalties(
+                     ""LinkId""
+                 );
+
+                 CREATE INDEX IX_EFPenalties_OffenderId ON EFPenalties(
+                     ""OffenderId""
+                 );
+
+                 CREATE INDEX IX_EFPenalties_PunisherId ON EFPenalties(
+                     ""PunisherId""
+                 );
+
+                 PRAGMA foreign_keys = 1;", suppressTransaction: false);
+            }
+
+            else
+            {
+                migrationBuilder.DropColumn(
+                    name: "IsEvadedOffense",
+                    table: "EFPenalties");
+            }
+        }
+    }
+}

SharedLibraryCore/Migrations/DatabaseContextModelSnapshot.cs

@@ -457,6 +457,8 @@ namespace SharedLibraryCore.Migrations
 
                     b.Property<DateTime?>("Expires");
 
+                    b.Property<bool>("IsEvadedOffense");
+
                     b.Property<int>("LinkId");
 
                     b.Property<int>("OffenderId");

SharedLibraryCore/Objects/EFClient.cs

@@ -348,7 +348,7 @@ namespace SharedLibraryCore.Database.Models
         /// </summary>
         /// <param name="banReason">reason for the ban</param>
         /// <param name="sender">client performing the ban</param>
-        public GameEvent Ban(String banReason, EFClient sender)
+        public GameEvent Ban(String banReason, EFClient sender, bool isEvade)
         {
             var e = new GameEvent()
             {
@@ -357,7 +357,8 @@ namespace SharedLibraryCore.Database.Models
                 Data = banReason,
                 Origin = sender,
                 Target = this,
-                Owner = sender.CurrentServer
+                Owner = sender.CurrentServer,
+                Extra = isEvade
             };
 
             // enforce level restrictions
@@ -405,6 +406,9 @@ namespace SharedLibraryCore.Database.Models
         {
             var loc = Utilities.CurrentLocalization.LocalizationIndex;
 
+            LastConnection = DateTime.UtcNow;
+            Connections += 1;
+
             if (Name.Length < 3)
             {
                 CurrentServer.Logger.WriteDebug($"Kicking {this} because their name is too short");
@@ -429,16 +433,16 @@ namespace SharedLibraryCore.Database.Models
             }
 
             // reserved slots stuff
-            if (CurrentServer.MaxClients - (CurrentServer.GetClientsAsList().Count(_client => !_client.IsPrivileged())) < CurrentServer.ServerConfig.ReservedSlotNumber &&
-               !this.IsPrivileged())
+            // todo: bots don't seem to honor party_maxplayers/sv_maxclients
+            if (CurrentServer.MaxClients - (CurrentServer.GetClientsAsList().Count(_client => !_client.IsPrivileged() && !_client.IsBot)) < CurrentServer.ServerConfig.ReservedSlotNumber &&
+               !this.IsPrivileged() &&
+               CurrentServer.GetClientsAsList().Count <= CurrentServer.MaxClients &&
+               CurrentServer.MaxClients != 0)
             {
                 CurrentServer.Logger.WriteDebug($"Kicking {this} their spot is reserved");
                 Kick(loc["SERVER_KICK_SLOT_IS_RESERVED"], Utilities.IW4MAdminClient(CurrentServer));
                 return;
             }
-
-            LastConnection = DateTime.UtcNow;
-            Connections += 1;
         }
 
         public async Task OnDisconnect()
@@ -449,15 +453,78 @@ namespace SharedLibraryCore.Database.Models
             await CurrentServer.Manager.GetClientService().Update(this);
         }
 
-        public async Task OnJoin(int? ipAddress)
+        public async Task<bool> OnJoin(int? ipAddress)
         {
+            CurrentServer.Logger.WriteDebug($"Start join for {this}::{ipAddress}::{Level.ToString()}");
+       
             IPAddress = ipAddress;
-
-            await CurrentServer.Manager.GetClientService().UpdateAlias(this);
-
             var loc = Utilities.CurrentLocalization.LocalizationIndex;
+            var autoKickClient = Utilities.IW4MAdminClient(CurrentServer);
+
+            if (ipAddress != null)
+            {
+                // todo: remove this in a few weeks because it's just temporary for server forwarding
+                if (IPAddressString == "66.150.121.184" || IPAddressString == "62.210.178.177")
+                {
+                    Kick($"Your favorite servers are outdated. Please remove and re-add this server. ({CurrentServer.Hostname})", autoKickClient);
+                    return false;
+                }
+                await CurrentServer.Manager.GetClientService().UpdateAlias(this);
+            }
+
+            OnConnect();
+            await CurrentServer.Manager.GetClientService().Update(this);
+
+            CurrentServer.Logger.WriteDebug($"OnConnect finished for {this}");
+
+            #region CLIENT_BAN
+            // kick them as their level is banned
+            if (Level == Permission.Banned)
+            {
+                CurrentServer.Logger.WriteDebug($"Kicking {this} because they are banned");
+                var ban = ReceivedPenalties.FirstOrDefault(_penalty => _penalty.Expires == null && _penalty.Active);
+
+                if (ban == null)
+                {
+                    // this is from the old system before bans were applied to all accounts
+                    ban = (await CurrentServer.Manager
+                        .GetPenaltyService()
+                        .GetActivePenaltiesAsync(AliasLinkId))
+                        .FirstOrDefault(_penalty => _penalty.Type == Penalty.PenaltyType.Ban);
+
+                    CurrentServer.Logger.WriteError($"Client {this} is banned, but no penalty exists for their ban");
+
+                    // hack: re apply the automated offense to the reban
+                    if (ban.AutomatedOffense != null)
+                    {
+                        autoKickClient.AdministeredPenalties?.Add(new EFPenalty()
+                        {
+                            AutomatedOffense = ban.AutomatedOffense
+                        });
+                    }
+
+                    // this is a reban of the new GUID and IP
+                    Ban($"{ban.Offense}", autoKickClient, false);
+                    return false;
+                }
+
+                Kick($"{loc["SERVER_BAN_PREV"]} {ban?.Offense}", autoKickClient);
+                return false;
+            }
+
+            var tempBan = ReceivedPenalties.FirstOrDefault(_penalty => _penalty.Type == Penalty.PenaltyType.TempBan && _penalty.Expires > DateTime.UtcNow && _penalty.Active);
+            // they have an active tempban tied to their GUID
+            if (tempBan != null)
+            {
+                CurrentServer.Logger.WriteDebug($"Kicking {this} because they are temporarily banned");
+                Kick($"{loc["SERVER_TB_REMAIN"]} ({(tempBan.Expires.Value - DateTime.UtcNow).TimeSpanText()} {loc["WEBFRONT_PENALTY_TEMPLATE_REMAINING"]})", autoKickClient);
+                return false;
+            }
+            #endregion
+
+            // we want to get any penalties that are tied to their IP or AliasLink (but not necessarily their GUID)
             var activePenalties = await CurrentServer.Manager.GetPenaltyService().GetActivePenaltiesAsync(AliasLinkId, ipAddress);
-            var currentBan = activePenalties.FirstOrDefault(p => p.Type == Penalty.PenaltyType.Ban || p.Type == Penalty.PenaltyType.TempBan);
+            var currentBan = activePenalties.FirstOrDefault(p => p.Type == Penalty.PenaltyType.Ban);
 
             var currentAutoFlag = activePenalties.Where(p => p.Type == Penalty.PenaltyType.Flag && p.PunisherId == 1)
                 .Where(p => p.Active)
@@ -474,35 +541,31 @@ namespace SharedLibraryCore.Database.Models
 
             if (currentBan != null)
             {
-                CurrentServer.Logger.WriteInfo($"Banned client {this} trying to join...");
-                var autoKickClient = Utilities.IW4MAdminClient(CurrentServer);
+                CurrentServer.Logger.WriteInfo($"Banned client {this} trying to evade...");
 
                 // reban the "evading" guid
-                if (Level != Permission.Banned &&
-                    currentBan.Type == Penalty.PenaltyType.Ban)
+                if (Level != Permission.Banned)
                 {
                     CurrentServer.Logger.WriteInfo($"Banned client {this} connected using a new GUID");
+
                     // hack: re apply the automated offense to the reban
                     if (currentBan.AutomatedOffense != null)
                     {
-                        autoKickClient.AdministeredPenalties.Add(new EFPenalty()
+                        autoKickClient.AdministeredPenalties?.Add(new EFPenalty()
                         {
                             AutomatedOffense = currentBan.AutomatedOffense
                         });
                     }
-                    Ban($"{currentBan.Offense}", autoKickClient);
-                }
-
-                // the player is permanently banned
-                else if (currentBan.Type == Penalty.PenaltyType.Ban)
-                {
-                    Kick($"{loc["SERVER_BAN_PREV"]} {currentBan.Offense} ({loc["SERVER_BAN_APPEAL"]} {CurrentServer.Website})", autoKickClient);
+                    // this is a reban of the new GUID and IP
+                    Ban($"{currentBan.Offense}", autoKickClient, true);
                 }
 
                 else
                 {
-                    Kick($"{loc["SERVER_TB_REMAIN"]} ({(currentBan.Expires.Value - DateTime.UtcNow).TimeSpanText()} {loc["WEBFRONT_PENALTY_TEMPLATE_REMAINING"]})", autoKickClient);
+                    CurrentServer.Logger.WriteError($"Banned client {this} is banned but, no ban penalty was found (2)");
                 }
+
+                return false;
             }
 
             else
@@ -516,6 +579,7 @@ namespace SharedLibraryCore.Database.Models
                 };
 
                 CurrentServer.Manager.GetEventHandler().AddEvent(e);
+                return true;
             }
         }
 

SharedLibraryCore/RCon/CommandPrefix.cs

@@ -13,5 +13,11 @@ namespace SharedLibraryCore.RCon
         public string Ban { get; set; }
         public string Unban { get; set; }
         public string TempBan { get; set; }
+        public string RConCommand { get; set; }
+        public string RConGetDvar { get; set; }
+        public string RConSetDvar { get; set; }
+        public string RConGetStatus { get; set; }
+        public string RConGetInfo { get; set; }
+        public string RConResponse { get; set; }
     }
 }

SharedLibraryCore/RCon/Connection.cs

@@ -5,7 +5,6 @@ using System.Collections.Concurrent;
 using System.Linq;
 using System.Net;
 using System.Net.Sockets;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -29,16 +28,24 @@ namespace SharedLibraryCore.RCon
         static readonly ConcurrentDictionary<EndPoint, ConnectionState> ActiveQueries = new ConcurrentDictionary<EndPoint, ConnectionState>();
         public IPEndPoint Endpoint { get; private set; }
         public string RConPassword { get; private set; }
-        ILogger Log;
 
-        public Connection(string ipAddress, int port, string password, ILogger log)
+        private readonly ILogger Log;
+        private IRConParserConfiguration Config;
+
+        public Connection(string ipAddress, int port, string password, ILogger log, IRConParserConfiguration config)
         {
             Endpoint = new IPEndPoint(IPAddress.Parse(ipAddress), port);
             RConPassword = password;
             Log = log;
+            Config = config;
         }
 
-        public async Task<string[]> SendQueryAsync(StaticHelpers.QueryType type, string parameters = "", bool waitForResponse = true)
+        public void SetConfiguration(IRConParserConfiguration config)
+        {
+            Config = config;
+        }
+
+        public async Task<string[]> SendQueryAsync(StaticHelpers.QueryType type, string parameters = "")
         {
             if (!ActiveQueries.ContainsKey(this.Endpoint))
             {
@@ -68,27 +75,33 @@ namespace SharedLibraryCore.RCon
 #endif
 
             byte[] payload = null;
+            bool waitForResponse = Config.WaitForResponse;
 
             switch (type)
             {
-                case StaticHelpers.QueryType.DVAR:
+                case StaticHelpers.QueryType.GET_DVAR:
+                    waitForResponse |= true;
+                    payload = Utilities.EncodingType.GetBytes(string.Format(Config.CommandPrefixes.RConGetDvar, RConPassword, parameters + '\0'));
+                    break;
+                case StaticHelpers.QueryType.SET_DVAR:
+                    payload = Utilities.EncodingType.GetBytes(string.Format(Config.CommandPrefixes.RConSetDvar, RConPassword, parameters + '\0'));
+                    break;
                 case StaticHelpers.QueryType.COMMAND:
-                    var header = "ÿÿÿÿrcon ".Select(Convert.ToByte).ToList();
-                    byte[] p = Utilities.EncodingType.GetBytes($"{RConPassword} {parameters}");
-                    header.AddRange(p);
-                    payload = header.ToArray();
+                    payload = Utilities.EncodingType.GetBytes(string.Format(Config.CommandPrefixes.RConCommand, RConPassword, parameters + '\0'));
                     break;
                 case StaticHelpers.QueryType.GET_STATUS:
-                    payload = "ÿÿÿÿgetstatus".Select(Convert.ToByte).ToArray();
+                    waitForResponse |= true;
+                    payload = (Config.CommandPrefixes.RConGetStatus + '\0').Select(Convert.ToByte).ToArray();
                     break;
                 case StaticHelpers.QueryType.GET_INFO:
-                    payload = "ÿÿÿÿgetinfo".Select(Convert.ToByte).ToArray();
+                    waitForResponse |= true;
+                    payload = (Config.CommandPrefixes.RConGetInfo + '\0').Select(Convert.ToByte).ToArray();
                     break;
             }
 
             byte[] response = null;
 
-            retrySend:
+        retrySend:
             using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp)
             {
                 //DontFragment = true,
@@ -107,7 +120,7 @@ namespace SharedLibraryCore.RCon
                 {
                     response = await SendPayloadAsync(payload, waitForResponse);
 
-                    if (response.Length == 0)
+                    if (response.Length == 0 && waitForResponse)
                     {
                         throw new Exception();
                     }

SharedLibraryCore/RCon/StaticHelpers.cs

@@ -24,7 +24,12 @@ namespace SharedLibraryCore.RCon
             /// retrieve the value of a DVAR
             /// RCon password is required
             /// </summary>
-            DVAR,
+            GET_DVAR,
+            /// <summary>
+            /// set the value of a DVAR
+            /// RCon password is required
+            /// </summary>
+            SET_DVAR,
             /// <summary>
             /// execute a command
             /// RCon password is required
@@ -43,7 +48,10 @@ namespace SharedLibraryCore.RCon
         /// <summary>
         /// interval in milliseconds to wait before sending the next RCon request
         /// </summary>
-        public static readonly int FloodProtectionInterval = 635;
+        public static readonly int FloodProtectionInterval = 650;
+        /// <summary>
+        /// how mant failed connection attempts before aborting connection
+        /// </summary>
         public static readonly int AllowedConnectionFails = 3;
     }
 }

SharedLibraryCore/ScriptPlugin.cs

@@ -1,7 +1,6 @@
 using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Interfaces;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -84,6 +83,21 @@ namespace SharedLibraryCore
             this.Name = pluginObject.name;
             this.Version = (float)pluginObject.version;
 
+
+            try
+            {
+                if (pluginObject.isParser)
+                {
+                    await OnLoadAsync(mgr);
+                    IEventParser eventParser = (IEventParser)ScriptEngine.GetValue("eventParser").ToObject();
+                    IRConParser rconParser = (IRConParser)ScriptEngine.GetValue("rconParser").ToObject();
+                    Manager.AdditionalEventParsers.Add(eventParser);
+                    Manager.AdditionalRConParsers.Add(rconParser);
+                }
+            }
+            catch { }
+
+
             if (!firstRun)
             {
                 await OnLoadAsync(mgr);
@@ -113,6 +127,9 @@ namespace SharedLibraryCore
             return Task.FromResult(ScriptEngine.Execute("plugin.onTickAsync(_server)").GetCompletionValue());
         }
 
-        public Task OnUnloadAsync() => Task.FromResult(ScriptEngine.Execute("plugin.onUnloadAsync()").GetCompletionValue());
+        public Task OnUnloadAsync()
+        {
+            return Task.FromResult(ScriptEngine.Execute("plugin.onUnloadAsync()").GetCompletionValue());
+        }
     }
 }

SharedLibraryCore/Server.cs

@@ -36,7 +36,7 @@ namespace SharedLibraryCore
             Logger = Manager.GetLogger(this.EndPoint);
             Logger.WriteInfo(this.ToString());
             ServerConfig = config;
-            RemoteConnection = new RCon.Connection(IP, Port, Password, Logger);
+            RemoteConnection = new RCon.Connection(IP, Port, Password, Logger, null);
 
             Clients = new List<EFClient>(new EFClient[18]);
             Reports = new List<Report>();
@@ -66,7 +66,7 @@ namespace SharedLibraryCore
         //Returns list of all current players
         public List<EFClient> GetClientsAsList()
         {
-            return Clients.FindAll(x => x != null);
+            return Clients.FindAll(x => x != null && x.NetworkId != 0);
         }
 
         /// <summary>
@@ -120,7 +120,7 @@ namespace SharedLibraryCore
         /// <param name="message">Message to be sent to all players</param>
         public GameEvent Broadcast(string message, EFClient sender = null)
         {
-            string formattedMessage = String.Format(RconParser.GetCommandPrefixes().Say, $"{(CustomSayEnabled ? $"{CustomSayName}: " : "")}{message}");
+            string formattedMessage = String.Format(RconParser.Configuration.CommandPrefixes.Say, $"{(CustomSayEnabled ? $"{CustomSayName}: " : "")}{message}");
 
 #if DEBUG == true
             Logger.WriteVerbose(message.StripColors());
@@ -146,7 +146,7 @@ namespace SharedLibraryCore
         protected async Task Tell(String Message, EFClient Target)
         {
 #if !DEBUG
-            string formattedMessage = String.Format(RconParser.GetCommandPrefixes().Tell, Target.ClientNumber, $"{(CustomSayEnabled ? $"{CustomSayName}: " : "")}{Message}");
+            string formattedMessage = String.Format(RconParser.Configuration.CommandPrefixes.Tell, Target.ClientNumber, $"{(CustomSayEnabled ? $"{CustomSayName}: " : "")}{Message}");
             if (Target.ClientNumber > -1 && Message.Length > 0 && Target.Level != EFClient.Permission.Console)
                 await this.ExecuteCommandAsync(formattedMessage);
 #else
@@ -208,7 +208,7 @@ namespace SharedLibraryCore
         /// <param name="Reason">The reason for the ban</param>
         /// <param name="Target">The person to ban</param>
         /// <param name="Origin">The person who banned the target</param>
-        abstract protected Task Ban(String Reason, EFClient Target, EFClient Origin);
+        abstract protected Task Ban(String Reason, EFClient Target, EFClient Origin, bool isEvade = false);
 
         abstract protected Task Warn(String Reason, EFClient Target, EFClient Origin);
 
@@ -316,6 +316,8 @@ namespace SharedLibraryCore
 
         // Internal
         public string IP { get; protected set; }
+        public string Version { get; protected set; }
+
         protected int Port;
         protected string FSGame;
         protected int NextMessage;

SharedLibraryCore/Services/ClientService.cs

@@ -29,6 +29,7 @@ namespace SharedLibraryCore.Services
                     {
                         Active = false
                     },
+                    ReceivedPenalties = new List<EFPenalty>()
                 };
 
                 client.CurrentAlias = new Alias()
@@ -36,6 +37,7 @@ namespace SharedLibraryCore.Services
                     Name = entity.Name,
                     Link = client.AliasLink,
                     DateAdded = DateTime.UtcNow,
+                    IPAddress = entity.IPAddress,
                     // the first time a client is created, we may not have their ip, 
                     // so we create a temporary alias
                     Active = false
@@ -48,102 +50,143 @@ namespace SharedLibraryCore.Services
             }
         }
 
-        public async Task UpdateAlias(EFClient entity)
+        private async Task UpdateAlias(string name, int? ip, EFClient entity, DatabaseContext context)
         {
-            using (var context = new DatabaseContext())
+            // entity is the tracked db context item
+            // get all aliases by IP address and LinkId
+            var iqAliases = context.Aliases
+                .Include(a => a.Link)
+                .Where(a => (a.IPAddress == ip) ||
+                    a.LinkId == entity.AliasLinkId);
+
+#if DEBUG == true
+            var aliasSql = iqAliases.ToSql();
+#endif
+            var aliases = await iqAliases.ToListAsync();
+
+            // see if they have a matching IP + Name but new NetworkId
+            var existingExactAlias = aliases.FirstOrDefault(a => a.Name == name && a.IPAddress == ip);
+            bool exactAliasMatch = existingExactAlias != null;
+
+            // if existing alias matches link them
+            EFAliasLink aliasLink = existingExactAlias?.Link;
+            // if no exact matches find the first IP that matches
+            aliasLink = aliasLink ?? aliases.FirstOrDefault()?.Link;
+            // if no matches are found, use our current one
+            aliasLink = aliasLink ?? entity.AliasLink;
+
+            bool hasExistingAlias = aliases.Count > 0;
+
+            // this happens when an alias exists but the current link is a temporary one
+            if ((exactAliasMatch || hasExistingAlias) &&
+                (!entity.AliasLink.Active && entity.AliasLinkId != aliasLink.AliasLinkId))
             {
-                context.Attach(entity);
+                entity.AliasLinkId = aliasLink.AliasLinkId;
+                entity.AliasLink = aliasLink;
 
-                string name = entity.Name;
-                int? ip = entity.IPAddress;
+                //entity.CurrentServer.Logger.WriteDebug($"Updating alias link for {entity}");
+                await context.SaveChangesAsync();
 
-                bool hasExistingAlias = false;
-
-                // get all aliases by IP
-                var aliases = await context.Aliases
-                    .Include(a => a.Link)
-                    .Where(a => a.IPAddress != null && a.IPAddress == ip)
-                    .ToListAsync();
-
-                // see if they have a matching IP + Name but new NetworkId
-                var existingAlias = aliases.FirstOrDefault(a => a.Name == name);
-                // if existing alias matches link them
-                EFAliasLink aliasLink = existingAlias?.Link;
-                // if no exact matches find the first IP that matches
-                aliasLink = aliasLink ?? aliases.FirstOrDefault()?.Link;
-                // if no exact or IP matches, create new link
-                aliasLink = aliasLink ?? new EFAliasLink();
-
-                // this has to be set here because we can't evalute it properly later
-                hasExistingAlias = existingAlias != null;
-
-                if (hasExistingAlias && !entity.AliasLink.Active)
+                foreach (var alias in aliases.Union(new List<EFAlias>() { entity.CurrentAlias })
+                    .Where(_alias => !_alias.Active ||
+                    _alias.LinkId != aliasLink.AliasLinkId))
                 {
-                    entity.CurrentServer.Logger.WriteDebug($"Removing temporary alias for ${entity}");
+                    entity.CurrentServer.Logger.WriteDebug($"{entity} updating alias-link id is {alias.LinkId}");
+                    alias.Active = true;
+                    alias.LinkId = aliasLink.AliasLinkId;
+                }
 
-                    // we want to delete the temporary alias
-                    context.Entry(entity.CurrentAlias).State = EntityState.Deleted;
-                    entity.CurrentAlias = null;
+                //entity.CurrentServer.Logger.WriteDebug($"Saving updated aliases for {entity}");
+                await context.SaveChangesAsync();
 
-                    // we want to delete the temporary alias link
-                    context.Entry(entity.AliasLink).State = EntityState.Deleted;
-                    entity.AliasLink = null;
+                // todo: fix this
+                /*context.AliasLinks.Remove(entity.AliasLink);
+                entity.AliasLink = null;
 
-                    // they have an existing alias so assign it
-                    entity.CurrentAlias = existingAlias;
-                    entity.AliasLink = aliasLink;
+                //entity.CurrentServer.Logger.WriteDebug($"Removing temporary link for {entity}");
 
+                try
+                {
+                    await context.SaveChangesAsync();
+                }
+                catch
+                {
+                   // entity.CurrentServer.Logger.WriteDebug($"Failed to remove link for {entity}");
+                }*/
+            }
+
+            // the existing alias matches ip and name, so we can just ignore the temporary one
+            if (exactAliasMatch)
+            {
+                entity.CurrentServer.Logger.WriteDebug($"{entity} has exact alias match");
+                entity.CurrentAliasId = existingExactAlias.AliasId;
+                entity.CurrentAlias = existingExactAlias;
+                await context.SaveChangesAsync();
+            }
+
+            // theres no exact match, but they've played before with the GUID or IP
+            else if (hasExistingAlias)
+            {
+                //entity.CurrentServer.Logger.WriteDebug($"Connecting player is using a new alias {entity}");
+
+                // this happens when a temporary alias gets updated
+                if (entity.CurrentAlias.Name == name && entity.CurrentAlias.IPAddress == null)
+                {
+                    entity.CurrentAlias.IPAddress = ip;
+                    entity.CurrentAlias.Active = true;
+                    //entity.CurrentServer.Logger.WriteDebug($"Updating temporary alias for {entity}");
                     await context.SaveChangesAsync();
                 }
 
-                // update the temporary alias to permanent one
-                else if (!entity.AliasLink.Active)
+                else
                 {
-                    entity.CurrentServer.Logger.WriteDebug($"Linking permanent alias for ${entity}");
+                    var newAlias = new EFAlias()
+                    {
+                        DateAdded = DateTime.UtcNow,
+                        IPAddress = ip,
+                        LinkId = aliasLink.AliasLinkId,
+                        Name = name,
+                        Active = true,
+                    };
 
-                    // we want to track the current alias and link
-                    var alias = context.Update(entity.CurrentAlias).Entity;
-                    var _aliasLink = context.Update(entity.AliasLink).Entity;
-
-                    alias.Active = true;
-                    alias.IPAddress = ip;
-                    alias.Name = name;
-                    _aliasLink.Active = true;
-
-                    existingAlias = alias;
-                    aliasLink = _aliasLink;
+                    entity.CurrentAlias = newAlias;
+                    //entity.CurrentServer.Logger.WriteDebug($"Saving new alias for {entity}");
+                    await context.SaveChangesAsync();
                 }
+            }
 
-                // if no existing alias create new alias
-                existingAlias = existingAlias ?? new EFAlias()
-                {
-                    DateAdded = DateTime.UtcNow,
-                    IPAddress = ip,
-                    Link = aliasLink,
-                    Name = name,
-                };
+            // no record of them playing
+            else
+            {
+                //entity.CurrentServer.Logger.WriteDebug($"{entity} has not be seen before");
 
-                if (!hasExistingAlias)
-                {
-                    entity.CurrentServer.Logger.WriteDebug($"Connecting player does not have an existing alias {entity}");
-                }
-
-                entity.Level = hasExistingAlias ?
-                    await context.Clients.Where(c => c.AliasLinkId == existingAlias.LinkId)
-                        .MaxAsync(c => c.Level) :
-                    Permission.User;
-
-                if (entity.CurrentAlias != existingAlias ||
-                    entity.AliasLink != aliasLink)
-                {
-                    entity.CurrentAlias = existingAlias;
-                    entity.AliasLink = aliasLink;
-
-                    context.Update(entity);
-                }
+                entity.AliasLink.Active = true;
+                entity.CurrentAlias.Active = true;
+                entity.CurrentAlias.IPAddress = ip;
+                entity.CurrentAlias.Name = name;
 
+                //entity.CurrentServer.Logger.WriteDebug($"updating new alias for {entity}");
                 await context.SaveChangesAsync();
             }
+
+            var linkIds = aliases.Select(a => a.LinkId);
+
+            if (linkIds.Count() > 0 &&
+                aliases.Count(_alias => _alias.Name == name && _alias.IPAddress == ip) > 0)
+            {
+                var highestLevel = await context.Clients
+                    .Where(c => linkIds.Contains(c.AliasLinkId))
+                    .MaxAsync(c => c.Level);
+
+                if (entity.Level != highestLevel)
+                {
+                    entity.CurrentServer.Logger.WriteDebug($"{entity} updating user level");
+                    // todo: log level changes here
+                    context.Update(entity);
+                    entity.Level = highestLevel;
+                    await context.SaveChangesAsync();
+                }
+            }
         }
 
         public async Task<EFClient> Delete(EFClient entity)
@@ -220,6 +263,7 @@ namespace SharedLibraryCore.Services
                 context.Clients
                 .Include(c => c.CurrentAlias)
                 .Include(c => c.AliasLink.Children)
+                .Include(c => c.ReceivedPenalties)
                 .FirstOrDefault(c => c.NetworkId == networkId)
         );
 
@@ -231,16 +275,36 @@ namespace SharedLibraryCore.Services
             }
         }
 
+        public async Task UpdateAlias(EFClient entity)
+        {
+            using (var context = new DatabaseContext())
+            {
+                var client = context.Clients
+                    .Include(c => c.AliasLink)
+                    .Include(c => c.CurrentAlias)
+                    .First(e => e.ClientId == entity.ClientId);
+
+                client.CurrentServer = entity.CurrentServer;
+
+                await UpdateAlias(entity.Name, entity.IPAddress, client, context);
+
+                entity.CurrentAlias = client.CurrentAlias;
+                entity.CurrentAliasId = client.CurrentAliasId;
+                entity.AliasLink = client.AliasLink;
+                entity.AliasLinkId = client.AliasLinkId;
+            }
+        }
+
         public async Task<EFClient> Update(EFClient entity)
         {
             using (var context = new DatabaseContext())
             {
                 // grab the context version of the entity
                 var client = context.Clients
-                    .Include(c => c.AliasLink)
-                    .Include(c => c.CurrentAlias)
                     .First(e => e.ClientId == entity.ClientId);
 
+                client.CurrentServer = entity.CurrentServer;
+
                 // if their level has been changed
                 if (entity.Level != client.Level)
                 {
@@ -253,30 +317,11 @@ namespace SharedLibraryCore.Services
                     // update all related clients level
                     await matchingClients.ForEachAsync(c =>
                     {
+                        // todo: log that it has changed here
                         c.Level = entity.Level;
                     });
                 }
 
-                // their alias has been updated and not yet saved
-                if (entity.CurrentAlias.AliasId == 0)
-                {
-                    client.CurrentAlias = new EFAlias()
-                    {
-                        Active = entity.CurrentAlias.IPAddress.HasValue ? true : false,
-                        DateAdded = DateTime.UtcNow,
-                        IPAddress = entity.CurrentAlias.IPAddress,
-                        Name = entity.CurrentAlias.Name,
-                        Link = client.AliasLink
-                    };
-                }
-
-                else
-                {
-                    client.CurrentAliasId = entity.CurrentAliasId;
-                    client.IPAddress = entity.IPAddress;
-                    client.Name = entity.Name;
-                }
-
                 // set remaining non-navigation properties that may have been updated
                 client.Level = entity.Level;
                 client.LastConnection = entity.LastConnection;
@@ -325,7 +370,8 @@ namespace SharedLibraryCore.Services
                                     ClientId = client.ClientId,
                                     Level = client.Level,
                                     Password = client.Password,
-                                    PasswordSalt = client.PasswordSalt
+                                    PasswordSalt = client.PasswordSalt,
+                                    NetworkId = client.NetworkId
                                 };
 
 #if DEBUG == true
@@ -348,10 +394,10 @@ namespace SharedLibraryCore.Services
             using (var context = new DatabaseContext(disableTracking: true))
             {
                 long networkId = identifier.ConvertLong();
-                int ipAddress = identifier.ConvertToIP();
+                int? ipAddress = identifier.ConvertToIP();
 
                 var iqLinkIds = (from alias in context.Aliases
-                                 where alias.IPAddress == ipAddress ||
+                                 where (alias.IPAddress != null && alias.IPAddress == ipAddress) ||
                                 alias.Name.ToLower().Contains(identifier)
                                  select alias.LinkId).Distinct();
 

SharedLibraryCore/Services/PenaltyService.cs

@@ -18,38 +18,85 @@ namespace SharedLibraryCore.Services
         {
             using (var context = new DatabaseContext())
             {
-                // create the actual EFPenalty
-                EFPenalty addedEntity = new EFPenalty()
-                {
-                    OffenderId = newEntity.Offender.ClientId,
-                    PunisherId = newEntity.Punisher.ClientId,
-                    LinkId = newEntity.Link.AliasLinkId,
-                    Type = newEntity.Type,
-                    Expires = newEntity.Expires,
-                    Offense = newEntity.Offense,
-                    When = newEntity.When,
-                    AutomatedOffense = newEntity.AutomatedOffense
-                };
-
                 // make bans propogate to all aliases
-                if (addedEntity.Type == Objects.Penalty.PenaltyType.Ban)
+                if (newEntity.Type == Penalty.PenaltyType.Ban)
                 {
                     await context.Clients
-                        .Where(c => c.AliasLinkId == addedEntity.LinkId)
-                        .ForEachAsync(c => c.Level = Permission.Banned);
+                        .Include(c => c.ReceivedPenalties)
+                        .Where(c => c.AliasLinkId == newEntity.Link.AliasLinkId)
+                        .ForEachAsync(c =>
+                        {
+                            if (c.Level != Permission.Banned)
+                            {
+                                c.Level = Permission.Banned;
+                                c.ReceivedPenalties.Add(new EFPenalty()
+                                {
+                                    Active = true,
+                                    OffenderId = c.ClientId,
+                                    PunisherId = newEntity.Punisher.ClientId,
+                                    LinkId = c.AliasLinkId,
+                                    Type = newEntity.Type,
+                                    Expires = newEntity.Expires,
+                                    Offense = newEntity.Offense,
+                                    When = DateTime.UtcNow,
+                                    AutomatedOffense = newEntity.AutomatedOffense,
+                                    IsEvadedOffense = newEntity.IsEvadedOffense
+                                });
+                            }
+                        });
                 }
 
                 // make flags propogate to all aliases
-                else if (addedEntity.Type == Objects.Penalty.PenaltyType.Flag)
+                else if (newEntity.Type == Penalty.PenaltyType.Flag)
                 {
                     await context.Clients
-                      .Where(c => c.AliasLinkId == addedEntity.LinkId)
-                      .ForEachAsync(c => c.Level = Permission.Flagged);
+                      .Include(c => c.ReceivedPenalties)
+                      .Where(c => c.AliasLinkId == newEntity.Link.AliasLinkId)
+                      .ForEachAsync(c =>
+                      {
+                          if (c.Level != Permission.Flagged)
+                          {
+                              c.Level = Permission.Flagged;
+                              c.ReceivedPenalties.Add(new EFPenalty()
+                              {
+                                  Active = true,
+                                  OffenderId = c.ClientId,
+                                  PunisherId = newEntity.Punisher.ClientId,
+                                  LinkId = c.AliasLinkId,
+                                  Type = newEntity.Type,
+                                  Expires = newEntity.Expires,
+                                  Offense = newEntity.Offense,
+                                  When = DateTime.UtcNow,
+                                  AutomatedOffense = newEntity.AutomatedOffense,
+                                  IsEvadedOffense = newEntity.IsEvadedOffense
+                              });
+                          }
+                      });
+                }
+
+                // we just want to add it to the database
+                else
+                {
+                    var penalty = new EFPenalty()
+                    {
+                        Active = true,
+                        OffenderId = newEntity.Offender.ClientId,
+                        PunisherId = newEntity.Punisher.ClientId,
+                        LinkId = newEntity.Link.AliasLinkId,
+                        Type = newEntity.Type,
+                        Expires = newEntity.Expires,
+                        Offense = newEntity.Offense,
+                        When = DateTime.UtcNow,
+                        AutomatedOffense = newEntity.AutomatedOffense,
+                        IsEvadedOffense = newEntity.IsEvadedOffense
+                    };
+
+                    newEntity.Offender.ReceivedPenalties?.Add(penalty);
+                    context.Penalties.Add(penalty);
                 }
 
-                context.Penalties.Add(addedEntity);
                 await context.SaveChangesAsync();
-                return addedEntity;
+                return newEntity;
             }
         }
 
@@ -66,7 +113,6 @@ namespace SharedLibraryCore.Services
         public async Task<IList<EFPenalty>> Find(Func<EFPenalty, bool> expression)
         {
             throw await Task.FromResult(new Exception());
-
         }
 
         public Task<EFPenalty> Get(int entityID)
@@ -96,7 +142,7 @@ namespace SharedLibraryCore.Services
                    .OrderByDescending(p => p.When)
                    .Skip(offset)
                    .Take(count)
-                  .ToListAsync();
+                   .ToListAsync();
             }
         }
 
@@ -116,7 +162,7 @@ namespace SharedLibraryCore.Services
         /// <summary>
         /// Get a read-only copy of client penalties
         /// </summary>
-        /// <param name="clientI"></param>
+        /// <param name="clientId"></param>
         /// <param name="victim">Retreive penalties for clients receiving penalties, other wise given</param>
         /// <returns></returns>
         public async Task<List<ProfileMeta>> ReadGetClientPenaltiesAsync(int clientId, bool victim = true)
@@ -229,7 +275,8 @@ namespace SharedLibraryCore.Services
             Expression<Func<EFPenalty, bool>> filter = (p) => new Penalty.PenaltyType[]
                          {
                             Penalty.PenaltyType.TempBan,
-                            Penalty.PenaltyType.Ban, Penalty.PenaltyType.Flag
+                            Penalty.PenaltyType.Ban,
+                            Penalty.PenaltyType.Flag
                          }.Contains(p.Type) &&
                          p.Active &&
                          (p.Expires == null || p.Expires > now);
@@ -241,7 +288,7 @@ namespace SharedLibraryCore.Services
                     .Where(filter);
 
                 var iqIPPenalties = context.Aliases
-                    .Where(a => a.IPAddress == ip)
+                    .Where(a => a.IPAddress != null & a.IPAddress == ip)
                     .SelectMany(a => a.Link.ReceivedPenalties)
                     .Where(filter);
 
@@ -250,7 +297,10 @@ namespace SharedLibraryCore.Services
                 var ipPenaltiesSql = iqIPPenalties.ToSql();
 #endif
 
-                var activePenalties = (await iqLinkPenalties.ToListAsync()).Union(await iqIPPenalties.ToListAsync());
+                var activePenalties = (await iqLinkPenalties.ToListAsync())
+                    .Union(await iqIPPenalties.ToListAsync())
+                    .Distinct();
+
                 // this is a bit more performant in memory (ordering)
                 return activePenalties.OrderByDescending(p => p.When).ToList();
             }

SharedLibraryCore/SharedLibraryCore.csproj

@@ -21,18 +21,21 @@
 
   <ItemGroup>
     <PackageReference Include="Jint" Version="2.11.58" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.4" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="Npgsql" Version="4.0.3" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.2" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="Npgsql" Version="4.0.4" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.2.0" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.4" />
     <PackageReference Include="SimpleCrypto.NetCore" Version="1.0.0" />
   </ItemGroup>
 

SharedLibraryCore/Utilities.cs

@@ -1,6 +1,8 @@
-using Microsoft.EntityFrameworkCore.Query;
+#if DEBUG
+using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Query.Internal;
 using Microsoft.EntityFrameworkCore.Storage;
+#endif
 using SharedLibraryCore.Database.Models;
 using System;
 using System.Collections.Generic;
@@ -36,7 +38,8 @@ namespace SharedLibraryCore
                 CurrentAlias = new EFAlias()
                 {
                     Name = "IW4MAdmin"
-                }
+                },
+                AdministeredPenalties = new List<EFPenalty>()
             };
         }
 
@@ -209,7 +212,7 @@ namespace SharedLibraryCore
         /// </summary>
         /// <param name="input">Shorthand gametype reported from server</param>
         /// <returns></returns>
-        public static String GetLocalizedGametype(String input)
+        public static string GetLocalizedGametype(String input)
         {
             switch (input)
             {
@@ -278,11 +281,12 @@ namespace SharedLibraryCore
             return long.MinValue;
         }
 
-        public static int ConvertToIP(this string str)
+        public static int? ConvertToIP(this string str)
         {
-            System.Net.IPAddress.TryParse(str, out System.Net.IPAddress ip);
-
-            return ip == null ? int.MaxValue : BitConverter.ToInt32(ip.GetAddressBytes(), 0);
+            bool success = System.Net.IPAddress.TryParse(str, out System.Net.IPAddress ip);
+            return success && ip.GetAddressBytes().Count(_byte => _byte == 0) != 4 ?
+                (int?)BitConverter.ToInt32(ip.GetAddressBytes(), 0) :
+                null;
         }
 
         public static string ConvertIPtoString(this int? ip)
@@ -290,12 +294,12 @@ namespace SharedLibraryCore
             return !ip.HasValue ? "" : new System.Net.IPAddress(BitConverter.GetBytes(ip.Value)).ToString();
         }
 
-        public static String GetTimePassed(DateTime start)
+        public static string GetTimePassed(DateTime start)
         {
             return GetTimePassed(start, true);
         }
 
-        public static String GetTimePassed(DateTime start, bool includeAgo)
+        public static string GetTimePassed(DateTime start, bool includeAgo)
         {
             TimeSpan Elapsed = DateTime.UtcNow - start;
             string ago = includeAgo ? $" {CurrentLocalization.LocalizationIndex["WEBFRONT_PENALTY_TEMPLATE_AGO"]}" : "";
@@ -343,6 +347,11 @@ namespace SharedLibraryCore
 
         public static Game GetGame(string gameName)
         {
+            if (string.IsNullOrEmpty(gameName))
+            {
+                return Game.UKN;
+            }
+
             if (gameName.Contains("IW4"))
             {
                 return Game.IW4;
@@ -469,10 +478,57 @@ namespace SharedLibraryCore
             return p.Level > EFClient.Permission.User;
         }
 
-        public static bool PromptBool(string question)
+        /// <summary>
+        /// prompt user to answer a yes/no question
+        /// </summary>
+        /// <param name="question">question to prompt the user with</param>
+        /// <param name="description">description of the question's value</param>
+        /// <param name="defaultValue">default value to set if no input is entered</param>
+        /// <returns></returns>
+        public static bool PromptBool(string question, string description = null, bool defaultValue = true)
         {
-            Console.Write($"{question}? [y/n]: ");
-            return (Console.ReadLine().ToLower().FirstOrDefault() as char?) == 'y';
+            Console.Write($"{question}?{(string.IsNullOrEmpty(description) ? " " : $" ({description}) ")}[y/n]: ");
+            char response = Console.ReadLine().ToLower().FirstOrDefault();
+            return response != 0 ? response == 'y' : defaultValue;
+        }
+
+        /// <summary>
+        /// prompt user to make a selection
+        /// </summary>
+        /// <typeparam name="T">type of selection</typeparam>
+        /// <param name="question">question to prompt the user with</param>
+        /// <param name="defaultValue">default value to set if no input is entered</param>
+        /// <param name="description">description of the question's value</param>
+        /// <param name="selections">array of possible selections (should be able to convert to string)</param>
+        /// <returns></returns>
+        public static Tuple<int, T> PromptSelection<T>(string question, T defaultValue, string description = null, params T[] selections)
+        {
+            bool hasDefault = false;
+
+            if (defaultValue != null)
+            {
+                hasDefault = true;
+                selections = (new T[] { defaultValue }).Union(selections).ToArray();
+            }
+
+            Console.WriteLine($"{question}{(string.IsNullOrEmpty(description) ? "" : $" [{ description}:]")}");
+            Console.WriteLine(new string('=', 52));
+            for (int index = 0; index < selections.Length; index++)
+            {
+                Console.WriteLine($"{(hasDefault ? index : index + 1)}] {selections[index]}");
+            }
+            Console.WriteLine(new string('=', 52));
+
+            int selectionIndex = PromptInt(CurrentLocalization.LocalizationIndex["SETUP_PROMPT_MAKE_SELECTION"], null, hasDefault ? 0 : 1, selections.Length, hasDefault ? 0 : (int?)null);
+
+            if (!hasDefault)
+            {
+                selectionIndex--;
+            }
+
+            T selection = selections[selectionIndex ];
+
+            return Tuple.Create(selectionIndex, selection);
         }
 
         /// <summary>
@@ -481,13 +537,21 @@ namespace SharedLibraryCore
         /// <param name="question">question to prompt with</param>
         /// <param name="maxValue">maximum value to allow</param>
         /// <param name="minValue">minimum value to allow</param>
+        /// <param name="defaultValue">default value to set the return value to</param>
+        /// <param name="description">a description of the question's value</param>
         /// <returns>integer from user's input</returns>
-        public static int PromptInt(this string question, int minValue = 0, int maxValue = int.MaxValue)
+        public static int PromptInt(this string question, string description = null, int minValue = 0, int maxValue = int.MaxValue, int? defaultValue = null)
         {
-            Console.Write($"{question}: ");
+            Console.Write($"{question}{(string.IsNullOrEmpty(description) ? "" : $" ({description})")}{(defaultValue == null ? "" : $" [{CurrentLocalization.LocalizationIndex["SETUP_PROMPT_DEFAULT"]} {defaultValue.Value.ToString()}]")}: ");
             int response;
 
-            while (!int.TryParse(Console.ReadLine(), out response) ||
+            string inputOrDefault()
+            {
+                string input = Console.ReadLine();
+                return string.IsNullOrEmpty(input) && defaultValue != null ? defaultValue.ToString() : input;
+            }
+
+            while (!int.TryParse(inputOrDefault(), out response) ||
                 response < minValue ||
                 response > maxValue)
             {
@@ -496,19 +560,32 @@ namespace SharedLibraryCore
                 {
                     range = $" [{minValue}-{maxValue}]";
                 }
-                Console.Write($"Please enter a valid number{range}: ");
+                Console.Write($"{CurrentLocalization.LocalizationIndex["SETUP_PROMPT_INT"]}{range}: ");
             }
 
             return response;
         }
 
-        public static string PromptString(string question)
+        /// <summary>
+        /// prompt use to enter a string response
+        /// </summary>
+        /// <param name="question">question to prompt with</param>
+        /// <param name="description">description of the question's value</param>
+        /// <param name="defaultValue">default value to set the return value to</param>
+        /// <returns></returns>
+        public static string PromptString(string question, string description = null, string defaultValue = null)
         {
+            string inputOrDefault()
+            {
+                string input = Console.ReadLine();
+                return string.IsNullOrEmpty(input) && defaultValue != null ? defaultValue.ToString() : input;
+            }
+
             string response;
             do
             {
-                Console.Write($"{question}: ");
-                response = Console.ReadLine();
+                Console.Write($"{question}{(string.IsNullOrEmpty(description) ? "" : $" ({description})")}{(defaultValue == null ? "" : $" [{CurrentLocalization.LocalizationIndex["SETUP_PROMPT_DEFAULT"]} {defaultValue}]")}: ");
+                response = inputOrDefault();
             } while (string.IsNullOrWhiteSpace(response));
 
             return response;

WebfrontCore/Controllers/AccountController.cs

@@ -28,7 +28,8 @@ namespace WebfrontCore.Controllers
                     {
                         new Claim(ClaimTypes.NameIdentifier, client.Name),
                         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())
                     };
 
                     var claimsIdentity = new ClaimsIdentity(claims, "login");

WebfrontCore/Controllers/BaseController.cs

@@ -1,14 +1,14 @@
-using System;
-using System.Linq;
-using System.Security.Claims;
-using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
-
+using SharedLibraryCore;
 using SharedLibraryCore.Database;
 using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.Objects;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
 using WebfrontCore.ViewModels;
 
 namespace WebfrontCore.Controllers
@@ -23,14 +23,19 @@ namespace WebfrontCore.Controllers
         private static readonly byte[] LocalHost = { 127, 0, 0, 1 };
         private static string SocialLink;
         private static string SocialTitle;
+        protected List<Page> Pages;
 
         public BaseController()
         {
             if (Manager == null)
+            {
                 Manager = Program.Manager;
+            }
 
             if (Localization == null)
-                Localization = SharedLibraryCore.Utilities.CurrentLocalization.LocalizationIndex;
+            {
+                Localization = Utilities.CurrentLocalization.LocalizationIndex;
+            }
 
             if (Manager.GetApplicationSettings().Configuration().EnableSocialLink && SocialLink == null)
             {
@@ -38,6 +43,13 @@ namespace WebfrontCore.Controllers
                 SocialTitle = Manager.GetApplicationSettings().Configuration().SocialLinkTitle;
             }
 
+            Pages = Manager.GetPageList().Pages
+                .Select(page => new Page
+                {
+                    Name = page.Key,
+                    Location = page.Value
+                }).ToList();
+
             ViewBag.Version = Manager.Version;
         }
 
@@ -55,6 +67,7 @@ namespace WebfrontCore.Controllers
                 try
                 {
                     Client.ClientId = Convert.ToInt32(base.User.Claims.First(c => c.Type == ClaimTypes.Sid).Value);
+                    Client.NetworkId = User.Claims.First(_claim => _claim.Type == ClaimTypes.PrimarySid).Value.ConvertLong();
                     Client.Level = (EFClient.Permission)Enum.Parse(typeof(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 };
                 }
@@ -82,18 +95,11 @@ namespace WebfrontCore.Controllers
 
             Authorized = Client.ClientId >= 0;
             ViewBag.Authorized = Authorized;
-            ViewBag.Url = Manager.GetApplicationSettings().Configuration().WebfrontBindUrl;
+            ViewBag.Url = Manager.GetApplicationSettings().Configuration().WebfrontUrl;
             ViewBag.User = Client;
             ViewBag.SocialLink = SocialLink ?? "";
             ViewBag.SocialTitle = SocialTitle;
-
-            // grab the pages from plugins
-            ViewBag.Pages = Manager.GetPageList().Pages
-                .Select(page => new Page
-                {
-                    Name = page.Key,
-                    Location = page.Value
-                }).ToList();
+            ViewBag.Pages = Pages;
 
             base.OnActionExecuting(context);
         }

WebfrontCore/Controllers/ClientController.cs

@@ -43,10 +43,12 @@ namespace WebfrontCore.Controllers
                     .Where(a => a.Name != client.Name)
                     .Select(a => a.Name)
                     .Distinct()
-                     .OrderBy(a => a)
+                    .OrderBy(a => a)
                     .ToList(),
                 IPs = client.AliasLink.Children
                     .Select(i => i.IPAddress.ConvertIPtoString())
+                    .Union(new List<string>() { client.CurrentAlias.IPAddress.ConvertIPtoString() })
+                    .Where(i => !string.IsNullOrEmpty(i))
                     .Distinct()
                     .OrderBy(i => i)
                     .ToList(),

WebfrontCore/Controllers/ConsoleController.cs

@@ -33,6 +33,7 @@ namespace WebfrontCore.Controllers
             {
                 ClientId = Client.ClientId,
                 Level = Client.Level,
+                NetworkId = Client.NetworkId,
                 CurrentServer = server,
                 CurrentAlias = new EFAlias()
                 {
@@ -46,7 +47,7 @@ namespace WebfrontCore.Controllers
                 Data = command,
                 Origin = client,
                 Owner = server,
-                Remote = true
+                IsRemote = true
             };
 
             Manager.GetEventHandler().AddEvent(remoteEvent);

WebfrontCore/Controllers/ServerController.cs

@@ -35,7 +35,7 @@ namespace WebfrontCore.Controllers
                     Level = p.Level.ToLocalizedLevelName(),
                     LevelInt = (int)p.Level
                 }).ToList(),
-                ChatHistory = s.ChatHistory,
+                ChatHistory = s.ChatHistory.ToList(),
                 PlayerHistory = s.ClientHistory.ToArray(),
             };
             return PartialView("_ClientActivity", serverInfo);

WebfrontCore/Startup.cs

@@ -6,9 +6,6 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using SharedLibraryCore.Database;
-using System;
-using System.IO;
-using System.Reflection;
 
 namespace WebfrontCore
 {
@@ -62,6 +59,7 @@ namespace WebfrontCore
                 loggerFactory.AddDebug();
                 app.UseDeveloperExceptionPage();
             }
+
             else
             {
                 app.UseExceptionHandler("/Home/Error");

WebfrontCore/ViewComponents/PenaltyListViewComponent.cs

@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using SharedLibraryCore;
+using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Dtos;
 using SharedLibraryCore.Objects;
 using System;
@@ -12,6 +13,9 @@ namespace WebfrontCore.ViewComponents
     {
         public async Task<IViewComponentResult> InvokeAsync(int offset, Penalty.PenaltyType showOnly)
         {
+            string showEvadeString(EFPenalty penalty) => penalty.IsEvadedOffense == true ?
+                    $"({Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_PENALTY_EVADE"]}) " : "";
+
             var penalties = await Program.Manager.GetPenaltyService().GetRecentPenalties(12, offset, showOnly);
             var penaltiesDto = penalties.Select(p => new PenaltyInfo()
             {
@@ -25,7 +29,9 @@ namespace WebfrontCore.ViewComponents
 #if DEBUG
                 Offense = !string.IsNullOrEmpty(p.AutomatedOffense) ? p.AutomatedOffense : p.Offense,
 #else
-                Offense = User.Identity.IsAuthenticated && !string.IsNullOrEmpty(p.AutomatedOffense) ? p.AutomatedOffense : p.Offense,
+                Offense = (User.Identity.IsAuthenticated && !string.IsNullOrEmpty(p.AutomatedOffense)) ?
+                    $"{showEvadeString(p)}{p.AutomatedOffense}" :
+                    $"{showEvadeString(p)}{p.Offense}",
 #endif
                 Type = p.Type.ToString(),
                 TimePunished = Utilities.GetTimePassed(p.When, false),
@@ -40,7 +46,6 @@ namespace WebfrontCore.ViewComponents
 #else
             penaltiesDto = User.Identity.IsAuthenticated ? penaltiesDto.ToList() : penaltiesDto.Where(p => !p.Sensitive).ToList();
 #endif
-
             return View("_List", penaltiesDto);
         }
     }

WebfrontCore/ViewComponents/ServerListViewComponent.cs

@@ -28,7 +28,7 @@ namespace WebfrontCore.ViewComponents
                     Level = p.Level.ToLocalizedLevelName(),
                     LevelInt = (int)p.Level
                 }).ToList(),
-                ChatHistory = s.ChatHistory,
+                ChatHistory = s.ChatHistory.ToList(),
                 Online = !s.Throttled
             }).ToList();
             return View("_List", serverInfo);

WebfrontCore/Views/Server/_ClientActivity.cshtml

@@ -2,7 +2,7 @@
 
 @{
     Layout = null;
-    int half = (int)Math.Ceiling(Model.ClientCount / 2.0);
+    int half = Model.ClientCount == 0 || Model.Players.Count == 0 ? 0 : (int)Math.Ceiling(Model.ClientCount / 2.0);
 }
 <div class="col-12 col-md-8 d-none d-md-block">
     @{
@@ -43,7 +43,7 @@
         </div>
         <div class="col-6 text-right">
             @{
-                for (int i = half; i < Model.ClientCount; i++)
+                for (int i = half; i < Math.Min(Model.ClientCount, Model.Players.Count); i++)
                 {
                     string levelColorClass = !ViewBag.Authorized ? "" : $"level-color-{Model.Players[i].LevelInt}";
                     <span>@Html.ActionLink(Model.Players[i].Name, "ProfileAsync", "Client", new { id = Model.Players[i].ClientId }, new { @class = levelColorClass })</span><br />

WebfrontCore/Views/Shared/_Layout.cshtml

@@ -157,12 +157,11 @@
         <script type="text/javascript" src="~/lib/moment/moment.js"></script>
         <script type="text/javascript" src="~/lib/moment-timezone/builds/moment-timezone-with-data.js"></script>
         <script type="text/javascript" src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
-        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/canvasjs/1.7.0/canvasjs.min.js"></script>
+        <script type="text/javascript" src="~/lib/canvasjs/canvasjs.js"></script>
         <script type="text/javascript" src="~/js/action.js"></script>
         <script type="text/javascript" src="~/js/search.js"></script>
     </environment>
     <environment include="Production">
-        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/canvasjs/1.7.0/canvasjs.min.js"></script>
         <script type="text/javascript" src="~/js/global.min.js"></script>
     </environment>
     @RenderSection("scripts", required: false)

WebfrontCore/bundleconfig.json

@@ -17,6 +17,7 @@
       "wwwroot/lib/bootstrap/dist/js/bootstrap.min.js",
       "wwwroot/lib/moment/min/moment.min.js",
       "wwwroot/lib/moment-timezone/builds/moment-timezone.min.js",
+      "wwwroot/lib/canvasjs/canvasjs.js",
       "wwwroot/js/action.js",
       "wwwroot/js/console.js",
       "wwwroot/js/penalty.js",

WebfrontCore/wwwroot/js/profile.js

@@ -168,6 +168,7 @@ function shouldIncludePlural(num) {
 let mostRecentDate = 0;
 let currentStepAmount = 0;
 let lastStep = '';
+// todo: fix
 function timeStep(stepDifference) {
     let hours = stepDifference / (1000 * 60 * 60);
     let days = stepDifference / (1000 * 60 * 60 * 24);