Fix small issue with log reading

Add IsEvadedOffense to EFPenalty
Fix remote log reading in not Windows

.gitignore

@@ -220,7 +220,16 @@ Thumbs.db
 DEPLOY
 global.min.css
 global.min.js
-bootstrap-custom.css
 bootstrap-custom.min.css
 **/Master/static
-**/Master/dev_env
+**/Master/dev_env
+/WebfrontCore/Views/Plugins/Stats
+/WebfrontCore/wwwroot/**/dds
+
+/DiscordWebhook/env
+/DiscordWebhook/config.dev.json
+/GameLogServer/env
+launchSettings.json
+/VpnDetectionPrivate.js
+/Plugins/ScriptPlugins/VpnDetectionPrivate.js
+**/Master/env_master

Application/API/EventAPI.cs

@@ -1,75 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-using SharedLibraryCore;
-using SharedLibraryCore.Dtos;
-using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.Objects;
-
-namespace IW4MAdmin.Application.API
-{
-    class EventApi : IEventApi
-    {
-        Queue<EventInfo> Events = new Queue<EventInfo>();
-        DateTime LastFlagEvent;
-        static string[] FlaggedMessageContains =
-        {
-            " wh ",
-            "hax",
-            "cheat",
-            " hack ",
-            "aim",
-            "wall",
-            "cheto",
-            "hak",
-            "bot"
-        };
-        int FlaggedMessageCount;
-
-        public Queue<EventInfo> GetEvents() => Events;
-
-        public void OnServerEvent(object sender, GameEvent E)
-        {
-            if (E.Type == GameEvent.EventType.Say && E.Origin.Level < Player.Permission.Trusted)
-            {
-                bool flaggedMessage = false;
-                foreach (string msg in FlaggedMessageContains)
-                    flaggedMessage = flaggedMessage ? flaggedMessage : E.Data.ToLower().Contains(msg);
-
-                if (flaggedMessage)
-                    FlaggedMessageCount++;
-
-                if (FlaggedMessageCount > 3)
-                {
-                    if (Events.Count > 20)
-                        Events.Dequeue();
-
-                    FlaggedMessageCount = 0;
-
-                    E.Owner.Broadcast(Utilities.CurrentLocalization.LocalizationIndex["GLOBAL_REPORT"]).Wait(5000);
-                    Events.Enqueue(new EventInfo(
-                        EventInfo.EventType.ALERT,
-                        EventInfo.EventVersion.IW4MAdmin,
-                        "Chat indicates there may be a cheater",
-                        "Alert",
-                        E.Owner.Hostname, ""));
-                }
-
-                if ((DateTime.UtcNow - LastFlagEvent).Minutes >= 3)
-                {
-                    FlaggedMessageCount = 0;
-                    LastFlagEvent = DateTime.Now;
-                }
-            }
-
-            if (E.Type == GameEvent.EventType.Report)
-            {
-                Events.Enqueue(new EventInfo(
-                    EventInfo.EventType.ALERT,
-                    EventInfo.EventVersion.IW4MAdmin,
-                    $"**{E.Origin.Name}** has reported **{E.Target.Name}** for: {E.Data.Trim()}",
-                    E.Target.Name, E.Origin.Name, ""));
-            }
-        }
-    }
-}

Application/API/GameLogServer/IGameLogServer.cs

@@ -0,0 +1,12 @@
+using System.Threading.Tasks;
+using RestEase;
+
+namespace IW4MAdmin.Application.API.GameLogServer
+{
+    [Header("User-Agent", "IW4MAdmin-RestEase")]
+    public interface IGameLogServer
+    {
+        [Get("log/{path}")]
+        Task<LogInfo> Log([Path] string path);
+    }
+}

Application/API/GameLogServer/LogInfo.cs

@@ -0,0 +1,17 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace IW4MAdmin.Application.API.GameLogServer
+{
+    public class LogInfo
+    {
+        [JsonProperty("success")]
+        public bool Success { get; set; }
+        [JsonProperty("length")]
+        public int Length { get; set; }
+        [JsonProperty("data")]
+        public string Data { get; set; }
+    }
+}

Application/API/Master/ApiServer.cs

@@ -8,9 +8,13 @@ namespace IW4MAdmin.Application.API.Master
     public class ApiServer
     {
         [JsonProperty("id")]
-        public int Id { get; set; }
+        public long Id { get; set; }
+        [JsonProperty("ip")]
+        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,12 +39,14 @@ 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,
                                 MaxClientNum = s.MaxClients,
-                                Id = s.GetHashCode(),
+                                Id = s.EndPoint,
-                                Port = (short)s.GetPort()
+                                Port = (short)s.GetPort(),
+                                IPAddress = s.IP
                             }).ToList()
             };
 

Application/API/Master/IMasterApi.cs

@@ -36,7 +36,7 @@ namespace IW4MAdmin.Application.API.Master
     public class Endpoint
     {
 #if !DEBUG
-        private static IMasterApi api = RestClient.For<IMasterApi>("http://api.raidmax.org:5000");
+        private static readonly IMasterApi api = RestClient.For<IMasterApi>("http://api.raidmax.org:5000");
 #else
         private static IMasterApi api = RestClient.For<IMasterApi>("http://127.0.0.1");
 #endif

Application/Application.csproj

@@ -2,10 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <RuntimeFrameworkVersion>2.1.5</RuntimeFrameworkVersion>
     <MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
     <PackageId>RaidMax.IW4MAdmin.Application</PackageId>
-    <Version>2.1.0</Version>
+    <Version>2.2.2.4</Version>
     <Authors>RaidMax</Authors>
     <Company>Forever None</Company>
     <Product>IW4MAdmin</Product>
@@ -23,12 +24,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RestEase" Version="1.4.5" />
+    <PackageReference Include="RestEase" Version="1.4.7" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.0" />
   </ItemGroup>
 
   <PropertyGroup>
     <ServerGarbageCollection>true</ServerGarbageCollection>
+    <TieredCompilation>true</TieredCompilation>
+    <AssemblyVersion>2.2.2.4</AssemblyVersion>
+    <FileVersion>2.2.2.3</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -75,19 +79,21 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.NETCore.App" Version="2.0.7" />
+    <PackageReference Update="Microsoft.NETCore.App" Version="2.1.5" />
   </ItemGroup>
 
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-    <Exec Command="call $(ProjectDir)BuildScripts\PreBuild.bat $(SolutionDir) $(ProjectDir) $(TargetDir) $(OutDir)" />
+    <Exec Command="call $(ProjectDir)BuildScripts\PreBuild.bat $(ProjectDir)..\ $(ProjectDir) $(TargetDir) $(OutDir)" />
   </Target>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="call $(ProjectDir)BuildScripts\PostBuild.bat $(SolutionDir) $(ProjectDir) $(TargetDir) $(OutDir)" />
+    <GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
+      <Output TaskParameter="Assemblies" ItemName="CurrentAssembly" />
+    </GetAssemblyIdentity>
+    <Exec Command="call $(ProjectDir)BuildScripts\PostBuild.bat $(ProjectDir)..\ $(ProjectDir) $(TargetDir) $(OutDir) %(CurrentAssembly.Version)" />
   </Target>
 
   <Target Name="PostPublish" AfterTargets="Publish">
-    <Exec Command="call $(ProjectDir)BuildScripts\PostPublish.bat $(SolutionDir) $(ProjectDir) $(TargetDir) $(OutDir)" />
+    <Exec Command="call $(ProjectDir)BuildScripts\PostPublish.bat $(ProjectDir)..\ $(ProjectDir) $(TargetDir) $(ConfigurationName)" />
   </Target>
-
 </Project>

Application/BuildScripts/PostBuild.bat

@@ -2,6 +2,9 @@ set SolutionDir=%1
 set ProjectDir=%2
 set TargetDir=%3
 set OutDir=%4
+set Version=%5
+
+echo %Version% > "%SolutionDir%DEPLOY\version.txt"
 
 echo Copying dependency configs
 copy "%SolutionDir%WebfrontCore\%OutDir%*.deps.json" "%TargetDir%"
@@ -17,4 +20,15 @@ xcopy /y "%SolutionDir%Build\Plugins" "%TargetDir%Plugins\"
 echo Copying plugins for publish
 del %SolutionDir%BUILD\Plugins\Tests.dll
 xcopy /Y "%SolutionDir%BUILD\Plugins" "%SolutionDir%Publish\Windows\Plugins\"
-xcopy /Y "%SolutionDir%BUILD\Plugins" "%SolutionDir%Publish\WindowsPrerelease\Plugins\"
+xcopy /Y "%SolutionDir%BUILD\Plugins" "%SolutionDir%Publish\WindowsPrerelease\Plugins\"
+
+echo Copying script plugins for publish
+xcopy /Y "%SolutionDir%Plugins\ScriptPlugins" "%SolutionDir%Publish\Windows\Plugins\"
+xcopy /Y "%SolutionDir%Plugins\ScriptPlugins" "%SolutionDir%Publish\WindowsPrerelease\Plugins\"
+
+echo Copying GSC files for publish
+xcopy /Y  "%SolutionDir%_customcallbacks.gsc" "%SolutionDir%Publish\Windows\userraw\scripts\"
+xcopy /Y "%SolutionDir%_customcallbacks.gsc" "%SolutionDir%Publish\WindowsPrerelease\userraw\scripts\"
+
+xcopy /Y "%SolutionDir%_commands.gsc" "%SolutionDir%Publish\Windows\userraw\scripts\"
+xcopy /Y "%SolutionDir%_commands.gsc" "%SolutionDir%Publish\WindowsPrerelease\userraw\scripts\"

Application/BuildScripts/PostPublish.bat

@@ -1,6 +1,8 @@
 set SolutionDir=%1
 set ProjectDir=%2
 set TargetDir=%3
+set CurrentConfiguration=%4
+SET COPYCMD=/Y
 
 echo Deleting extra language files
 
@@ -54,6 +56,52 @@ del "%SolutionDir%Publish\Windows\*pdb"
 if exist "%SolutionDir%Publish\WindowsPrerelease\web.config" del "%SolutionDir%Publish\WindowsPrerelease\web.config"
 del "%SolutionDir%Publish\WindowsPrerelease\*pdb"
 
-echo making start script
+echo setting up library folders
-@echo dotnet IW4MAdmin.dll > "%SolutionDir%Publish\WindowsPrerelease\StartIW4MAdmin.cmd"
+
-@echo dotnet IW4MAdmin.dll > "%SolutionDir%Publish\Windows\StartIW4MAdmin.cmd"
+if "%CurrentConfiguration%" == "Prerelease" (
+	echo PR-Config
+	if not exist  "%SolutionDir%Publish\WindowsPrerelease\Configuration" md "%SolutionDir%Publish\WindowsPrerelease\Configuration"
+	move "%SolutionDir%Publish\WindowsPrerelease\DefaultSettings.json" "%SolutionDir%Publish\WindowsPrerelease\Configuration\"
+)
+
+if "%CurrentConfiguration%" == "Release" (
+	echo R-Config
+	if not exist  "%SolutionDir%Publish\Windows\Configuration" md "%SolutionDir%Publish\Windows\Configuration"
+	if exist "%SolutionDir%Publish\Windows\DefaultSettings.json" move "%SolutionDir%Publish\Windows\DefaultSettings.json" "%SolutionDir%Publish\Windows\Configuration\DefaultSettings.json"
+)
+
+if "%CurrentConfiguration%" == "Prerelease" (
+	echo PR-LIB
+	if not exist "%SolutionDir%Publish\WindowsPrerelease\Lib\" md "%SolutionDir%Publish\WindowsPrerelease\Lib\"
+	move "%SolutionDir%Publish\WindowsPrerelease\*.dll" "%SolutionDir%Publish\WindowsPrerelease\Lib\"
+	move "%SolutionDir%Publish\WindowsPrerelease\*.json" "%SolutionDir%Publish\WindowsPrerelease\Lib\"
+)
+
+if "%CurrentConfiguration%" == "Release" (
+	echo R-LIB
+	if not exist "%SolutionDir%Publish\Windows\Lib\" md "%SolutionDir%Publish\Windows\Lib\"
+	move "%SolutionDir%Publish\Windows\*.dll" "%SolutionDir%Publish\Windows\Lib\"
+	move "%SolutionDir%Publish\Windows\*.json" "%SolutionDir%Publish\Windows\Lib\"
+)
+
+if "%CurrentConfiguration%" == "Prerelease" (
+	echo PR-RT
+	move "%SolutionDir%Publish\WindowsPrerelease\runtimes" "%SolutionDir%Publish\WindowsPrerelease\Lib\runtimes"
+	if exist "%SolutionDir%Publish\WindowsPrerelease\refs" move "%SolutionDir%Publish\WindowsPrerelease\refs" "%SolutionDir%Publish\WindowsPrerelease\Lib\refs"
+)
+
+
+if "%CurrentConfiguration%" == "Release" (
+	echo R-RT
+	move "%SolutionDir%Publish\Windows\runtimes" "%SolutionDir%Publish\Windows\Lib\runtimes"
+	if exist "%SolutionDir%Publish\Windows\refs" move "%SolutionDir%Publish\Windows\refs" "%SolutionDir%Publish\Windows\Lib\refs"
+)
+
+echo making start scripts
+@(echo dotnet Lib/IW4MAdmin.dll && echo pause) > "%SolutionDir%Publish\WindowsPrerelease\StartIW4MAdmin.cmd"
+@(echo dotnet Lib/IW4MAdmin.dll && echo pause) > "%SolutionDir%Publish\Windows\StartIW4MAdmin.cmd"
+
+@(echo #!/bin/bash && echo dotnet Lib\IW4MAdmin.dll) > "%SolutionDir%Publish\WindowsPrerelease\StartIW4MAdmin.sh"
+@(echo #!/bin/bash && echo dotnet Lib\IW4MAdmin.dll) > "%SolutionDir%Publish\Windows\StartIW4MAdmin.sh"
+
+eCHO "%CurrentConfiguration%"

Application/DefaultSettings.json

@@ -25,11 +25,6 @@
           "Name": "mp_rust"
         },
 
-        {
-          "Alias": "Highrise",
-          "Name": "mp_highrise"
-        },
-
         {
           "Alias": "Terminal",
           "Name": "mp_terminal"
@@ -40,16 +35,6 @@
           "Name": "mp_crash"
         },
 
-        {
-          "Alias": "Skidrow",
-          "Name": "mp_nightshift"
-        },
-
-        {
-          "Alias": "Quarry",
-          "Name": "mp_quarry"
-        },
-
         {
           "Alias": "Afghan",
           "Name": "mp_afghan"
@@ -171,7 +156,7 @@
         },
 
         {
-          "Alias": "IW4 Credits",
+          "Alias": "Test map",
           "Name": "iw4_credits"
         },
 
@@ -190,6 +175,11 @@
           "Name": "mp_cargoship_sh"
         },
 
+        {
+          "Alias": "Cargoship",
+          "Name": "mp_cargoship"
+        },
+
         {
           "Alias": "Shipment",
           "Name": "mp_shipment"
@@ -216,23 +206,43 @@
         },
 
         {
-          "Alias": "Favela - Tropical",
+          "Alias": "Tropical Favela",
           "Name": "mp_fav_tropical"
         },
 
         {
-          "Alias": "Estate - Tropical",
+          "Alias": "Tropical Estate",
           "Name": "mp_estate_tropical"
         },
 
         {
-          "Alias": "Crash - Tropical",
+          "Alias": "Tropical Crash",
           "Name": "mp_crash_tropical"
         },
 
         {
           "Alias": "Forgotten City",
           "Name": "mp_bloc_sh"
+        },
+
+        {
+          "Alias": "Crossfire",
+          "Name": "mp_cross_fire"
+        },
+
+        {
+          "Alias": "Bloc",
+          "Name": "mp_bloc"
+        },
+
+        {
+          "Alias": "Oilrig",
+          "Name": "oilrig"
+        },
+
+        {
+          "Name": "Village",
+          "Alias":  "co_hunted"
         }
       ]
     },

Application/EventParsers/IW4EventParser.cs

@@ -1,134 +1,213 @@
-using System;
+using SharedLibraryCore;
-using System.Collections.Generic;
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Interfaces;
+using System;
 using System.Linq;
 using System.Text.RegularExpressions;
-using SharedLibraryCore;
-using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.Objects;
 
 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 cleanedEventLine = Regex.Replace(lineSplit[0], @"([0-9]+:[0-9]+ |^[0-9]+ )", "").Trim();
+            string eventType = lineSplit[0];
 
-            if (cleanedEventLine[0] == 'K')
+            if (eventType == "JoinTeam")
             {
-                if (!server.CustomCallback)
+                var origin = server.GetClientsAsList().FirstOrDefault(c => c.NetworkId == lineSplit[1].ConvertLong());
+
+                return new GameEvent()
                 {
-                    return new GameEvent()
+                    Type = GameEvent.EventType.JoinTeam,
-                    {
+                    Data = eventType,
-                        Type = GameEvent.EventType.Kill,
+                    Origin = origin,
-                        Data = logLine,
+                    Owner = server
-                        Origin = server.GetPlayersAsList().First(c => c.ClientNumber == Utilities.ClientIdFromString(lineSplit, 6)),
+                };
-                        Target = server.GetPlayersAsList().First(c => c.ClientNumber == Utilities.ClientIdFromString(lineSplit, 2)),
-                        Owner = server
-                    };
-                }
             }
 
-            if (cleanedEventLine == "say" || cleanedEventLine == "sayteam")
+            if (eventType == "say" || eventType == "sayteam")
             {
-                string message = lineSplit[4].Replace("\x15", "");
+                var matchResult = Regex.Match(logLine, SayRegex);
 
-                if (message[0] == '!' || message[0] == '@')
+                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.Command,
+                        Type = GameEvent.EventType.Say,
                         Data = message,
-                        Origin = server.GetPlayersAsList().First(c => c.ClientNumber == Utilities.ClientIdFromString(lineSplit, 2)),
+                        Origin = origin,
                         Owner = server,
                         Message = message
                     };
                 }
-
-                return new GameEvent()
-                {
-                    Type = GameEvent.EventType.Say,
-                    Data = message,
-                    Origin = server.GetPlayersAsList().First(c => c.ClientNumber == Utilities.ClientIdFromString(lineSplit, 2)),
-                    Owner = server,
-                    Message = message
-                };
             }
 
-            if (cleanedEventLine.Contains("ScriptKill"))
+            if (eventType == "K")
             {
-                return new GameEvent()
+                if (!server.CustomCallback)
                 {
-                    Type = GameEvent.EventType.ScriptKill,
+                    var origin = server.GetClientsAsList().First(c => c.ClientNumber == Utilities.ClientIdFromString(lineSplit, 6));
-                    Data = logLine,
+                    var target = server.GetClientsAsList().First(c => c.ClientNumber == Utilities.ClientIdFromString(lineSplit, 2));
-                    Origin = server.GetPlayersAsList().First(c => c.NetworkId == lineSplit[1].ConvertLong()),
-                    Target = server.GetPlayersAsList().First(c => c.NetworkId == lineSplit[2].ConvertLong()),
-                    Owner = server
-                };
-            }
 
-            if (cleanedEventLine.Contains("ScriptDamage"))
-            {
-                return new GameEvent()
-                {
-                    Type = GameEvent.EventType.ScriptDamage,
-                    Data = logLine,
-                    Origin = server.GetPlayersAsList().First(c => c.NetworkId == lineSplit[1].ConvertLong()),
-                    Target = server.GetPlayersAsList().First(c => c.NetworkId == lineSplit[2].ConvertLong()),
-                    Owner = server
-                };
-            }
-
-            if (cleanedEventLine[0] == 'D')
-            {
-                if (Regex.Match(cleanedEventLine, @"^(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)
-                {
                     return new GameEvent()
                     {
-                        Type = GameEvent.EventType.Damage,
+                        Type = GameEvent.EventType.Kill,
-                        Data = cleanedEventLine,
+                        Data = logLine,
-                        Origin = server.GetPlayersAsList().First(c => c.NetworkId == lineSplit[5].ConvertLong()),
+                        Origin = origin,
-                        Target = server.GetPlayersAsList().First(c => c.NetworkId == lineSplit[1].ConvertLong()),
+                        Target = target,
                         Owner = server
                     };
                 }
             }
 
-            if (cleanedEventLine.Contains("ExitLevel"))
+            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 = new Player()
+                    Origin = Utilities.IW4MAdminClient(server),
-                    {
+                    Target = Utilities.IW4MAdminClient(server),
-                        ClientId = 1
-                    },
-                    Target = new Player()
-                    {
-                        ClientId = 1
-                    },
                     Owner = server
                 };
             }
 
-            if (cleanedEventLine.Contains("InitGame"))
+            if (eventType.Contains("InitGame"))
             {
-                string dump = cleanedEventLine.Replace("InitGame: ", "");
+                string dump = eventType.Replace("InitGame: ", "");
 
                 return new GameEvent()
                 {
                     Type = GameEvent.EventType.MapChange,
                     Data = lineSplit[0],
-                    Origin = new Player()
+                    Origin = Utilities.IW4MAdminClient(server),
-                    {
+                    Target = Utilities.IW4MAdminClient(server),
-                        ClientId = 1
-                    },
-                    Target = new Player()
-                    {
-                        ClientId = 1
-                    },
                     Owner = server,
                     Extra = dump.DictionaryFromKeyValue()
                 };
@@ -137,19 +216,16 @@ namespace IW4MAdmin.Application.EventParsers
             return new GameEvent()
             {
                 Type = GameEvent.EventType.Unknown,
-                Origin = new Player()
+                Origin = Utilities.IW4MAdminClient(server),
-                {
+                Target = Utilities.IW4MAdminClient(server),
-                    ClientId = 1
-                },
-                Target = new Player()
-                {
-                    ClientId = 1
-                },
                 Owner = server
             };
         }
 
         // other parsers can derive from this parser so we make it virtual
-        public virtual string GetGameDir() => "userraw";
+        public virtual string GetGameDir()
+        {
+            return "userraw";
+        }
     }
 }

Application/EventParsers/IW5EventParser.cs

@@ -1,17 +1,16 @@
 using SharedLibraryCore;
-using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Objects;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
 
 namespace IW4MAdmin.Application.EventParsers
 {
     class IW5EventParser : IW4EventParser
     {
-        public override string GetGameDir() => "logs";
+        public override string GetGameDir()
+        {
+            return "logs";
+        }
 
         public override GameEvent GetEvent(Server server, string logLine)
         {
@@ -23,21 +22,25 @@ namespace IW4MAdmin.Application.EventParsers
 
                 int clientNum = Int32.Parse(lineSplit[2]);
 
-                var player = new Player()
+                var player = new EFClient()
                 {
                     NetworkId = lineSplit[1].ConvertLong(),
                     ClientNumber = clientNum,
-                    Name = lineSplit[3]
+                    CurrentAlias = new EFAlias()
+                    {
+                        Active = false,
+                        Name = lineSplit[3]
+                    }
                 };
 
                 return new GameEvent()
                 {
-                    Type = GameEvent.EventType.Join,
+                    Type = GameEvent.EventType.PreConnect,
-                    Origin = new Player()
+                    Origin = new EFClient()
                     {
                         ClientId = 1
                     },
-                    Target = new Player()
+                    Target = new EFClient()
                     {
                         ClientId = 1
                     },
@@ -47,7 +50,9 @@ namespace IW4MAdmin.Application.EventParsers
             }
 
             else
+            {
                 return base.GetEvent(server, logLine);
+            }
         }
     }
 }

Application/EventParsers/T6MEventParser.cs

@@ -11,101 +11,6 @@ namespace IW4MAdmin.Application.EventParsers
 {
     class T6MEventParser : IW4EventParser
     {
-        /*public GameEvent GetEvent(Server server, string logLine)
-        {
-            string cleanedEventLine = Regex.Replace(logLine, @"^ *[0-9]+:[0-9]+ *", "").Trim();
-            string[] lineSplit = cleanedEventLine.Split(';');
-
-            if (lineSplit[0][0] == 'K')
-            {
-                return new GameEvent()
-                {
-                    Type = GameEvent.EventType.Kill,
-                    Data = cleanedEventLine,
-                    Origin = server.GetPlayersAsList().First(c => c.ClientNumber == Utilities.ClientIdFromString(lineSplit, 6)),
-                    Target = server.GetPlayersAsList().First(c => c.ClientNumber == Utilities.ClientIdFromString(lineSplit, 2)),
-                    Owner = server
-                };
-            }
-
-            if (lineSplit[0][0] == 'D')
-            {
-                return new GameEvent()
-                {
-                    Type = GameEvent.EventType.Damage,
-                    Data = cleanedEventLine,
-                    Origin = server.GetPlayersAsList().First(c => c.ClientNumber == Utilities.ClientIdFromString(lineSplit, 6)),
-                    Target = server.GetPlayersAsList().First(c => c.ClientNumber == Utilities.ClientIdFromString(lineSplit, 2)),
-                    Owner = server
-                };
-            }
-
-            if (lineSplit[0] == "say" || lineSplit[0] == "sayteam")
-            {
-                return new GameEvent()
-                {
-                    Type = GameEvent.EventType.Say,
-                    Data = lineSplit[4],
-                    Origin = server.GetPlayersAsList().First(c => c.ClientNumber == Utilities.ClientIdFromString(lineSplit, 2)),
-                    Owner = server,
-                    Message = lineSplit[4]
-                };
-            }
-
-            if (lineSplit[0].Contains("ExitLevel"))
-            {
-                return new GameEvent()
-                {
-                    Type = GameEvent.EventType.MapEnd,
-                    Data = lineSplit[0],
-                    Origin = new Player()
-                    {
-                        ClientId = 1
-                    },
-                    Target = new Player()
-                    {
-                        ClientId = 1
-                    },
-                    Owner = server
-                };
-            }
-
-            if (lineSplit[0].Contains("InitGame"))
-            {
-                string dump = cleanedEventLine.Replace("InitGame: ", "");
-
-                return new GameEvent()
-                {
-                    Type = GameEvent.EventType.MapChange,
-                    Data = lineSplit[0],
-                    Origin = new Player()
-                    {
-                        ClientId = 1
-                    },
-                    Target = new Player()
-                    {
-                        ClientId = 1
-                    },
-                    Owner = server,
-                    Extra = dump.DictionaryFromKeyValue()
-                };
-            }
-
-            return new GameEvent()
-            {
-                Type = GameEvent.EventType.Unknown,
-                Origin = new Player()
-                {
-                    ClientId = 1
-                },
-                Target = new Player()
-                {
-                    ClientId = 1
-                },
-                Owner = server
-            };
-        }*/
-
         public override string GetGameDir() => $"t6r{Path.DirectorySeparatorChar}data";
     }
 }

Application/GameEventHandler.cs

@@ -1,105 +1,23 @@
 using SharedLibraryCore;
+using SharedLibraryCore.Events;
 using SharedLibraryCore.Interfaces;
-using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading;
 
 namespace IW4MAdmin.Application
 {
     class GameEventHandler : IEventHandler
     {
-        private ConcurrentQueue<GameEvent> EventQueue;
+        readonly IManager Manager;
-        private Queue<GameEvent> StatusSensitiveQueue;
-        private IManager Manager;
-
         public GameEventHandler(IManager mgr)
         {
-            EventQueue = new ConcurrentQueue<GameEvent>();
-            StatusSensitiveQueue = new Queue<GameEvent>();
-
             Manager = mgr;
         }
 
         public void AddEvent(GameEvent gameEvent)
         {
-#if DEBUG
+            ((Manager as ApplicationManager).OnServerEvent)(this, new GameEventArgs(null, false, gameEvent));
-            Manager.GetLogger().WriteDebug($"Got new event of type {gameEvent.Type} for {gameEvent.Owner}");
-#endif
-            // we need this to keep accurate track of the score
-            if (gameEvent.Type == GameEvent.EventType.Kill ||
-                gameEvent.Type == GameEvent.EventType.Damage ||
-                gameEvent.Type == GameEvent.EventType.ScriptDamage ||
-                gameEvent.Type == GameEvent.EventType.ScriptKill ||
-                gameEvent.Type == GameEvent.EventType.MapChange)
-            {
-#if DEBUG
-                Manager.GetLogger().WriteDebug($"Added sensitive event to queue");
-#endif
-                lock (StatusSensitiveQueue)
-                {
-                    StatusSensitiveQueue.Enqueue(gameEvent);
-                }
-                return;
-            }
-
-            else
-            {
-                EventQueue.Enqueue(gameEvent);
-                Manager.SetHasEvent();
-            }
-#if DEBUG
-            Manager.GetLogger().WriteDebug($"There are now {EventQueue.Count} events in queue");
-#endif
-        }
-
-        public string[] GetEventOutput()
-        {
-            throw new NotImplementedException();
-        }
-
-        public GameEvent GetNextSensitiveEvent()
-        {
-            if (StatusSensitiveQueue.Count > 0)
-            {
-                lock (StatusSensitiveQueue)
-                {
-                    if (!StatusSensitiveQueue.TryDequeue(out GameEvent newEvent))
-                    {
-                        Manager.GetLogger().WriteWarning("Could not dequeue time sensitive event for processing");
-                    }
-
-                    else
-                    {
-                        return newEvent;
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        public GameEvent GetNextEvent()
-        {
-            if (EventQueue.Count > 0)
-            {
-#if DEBUG
-                Manager.GetLogger().WriteDebug("Getting next event to be processed");
-#endif
-                if (!EventQueue.TryDequeue(out GameEvent newEvent))
-                {
-                    Manager.GetLogger().WriteWarning("Could not dequeue event for processing");
-                }
-
-                else
-                {
-                    return newEvent;
-                }
-            }
-
-            return null;
         }
     }
 }

Application/IO/GameLogEvent.cs

@@ -1,78 +0,0 @@
-using SharedLibraryCore;
-using SharedLibraryCore.Interfaces;
-using System;
-using System.IO;
-using System.Threading.Tasks;
-
-namespace IW4MAdmin.Application.IO
-{
-    class GameLogEvent
-    {
-        Server Server;
-        long PreviousFileSize;
-        GameLogReader Reader;
-        string GameLogFile;
-
-        class EventState
-        {
-            public ILogger Log { get; set; }
-            public string ServerId { get; set; }
-        }
-
-        public GameLogEvent(Server server, string gameLogPath, string gameLogName)
-        {
-            GameLogFile = gameLogPath;
-            Reader = new GameLogReader(gameLogPath, server.EventParser);
-            Server = server;
-
-            Task.Run(async () =>
-           {
-               while (!server.Manager.ShutdownRequested())
-               {
-                   OnEvent(new EventState()
-                   {
-                       Log = server.Manager.GetLogger(),
-                       ServerId = server.ToString()
-                   });
-                   await Task.Delay(100);
-               }
-           });
-        }
-
-        private void OnEvent(object state)
-        {
-            long newLength = new FileInfo(GameLogFile).Length;
- 
-            try
-            {
-                UpdateLogEvents(newLength);
-            }
-
-            catch (Exception e)
-            {
-                ((EventState)state).Log.WriteWarning($"Failed to update log event for {((EventState)state).ServerId}");
-                ((EventState)state).Log.WriteDebug($"Exception: {e.Message}");
-                ((EventState)state).Log.WriteDebug($"StackTrace: {e.StackTrace}");
-            }
-        }
-
-        private void UpdateLogEvents(long fileSize)
-        {
-            if (PreviousFileSize == 0)
-                PreviousFileSize = fileSize;
-
-            long fileDiff = fileSize - PreviousFileSize;
-
-            if (fileDiff < 1)
-                return;
-
-            PreviousFileSize = fileSize;
-
-            var events = Reader.EventsFromLog(Server, fileDiff, 0);
-            foreach (var ev in events)
-                Server.Manager.GetEventHandler().AddEvent(ev);
-
-            PreviousFileSize = fileSize;
-        }
-    }
-}

Application/IO/GameLogEventDetection.cs

@@ -0,0 +1,88 @@
+using SharedLibraryCore;
+using SharedLibraryCore.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace IW4MAdmin.Application.IO
+{
+    class GameLogEventDetection
+    {
+        Server Server;
+        long PreviousFileSize;
+        IGameLogReader Reader;
+        readonly string GameLogFile;
+
+        class EventState
+        {
+            public ILogger Log { get; set; }
+            public string ServerId { get; set; }
+        }
+
+        public GameLogEventDetection(Server server, string gameLogPath, string gameLogName)
+        {
+            GameLogFile = gameLogPath;
+            // todo: abtract this more
+            if (gameLogPath.StartsWith("http"))
+            {
+                Reader = new GameLogReaderHttp(gameLogPath, server.EventParser);
+            }
+            else
+            {
+                Reader = new GameLogReader(gameLogPath, server.EventParser);
+            }
+
+            Server = server;
+        }
+
+        public async Task PollForChanges()
+        {
+            while (!Server.Manager.ShutdownRequested())
+            {
+                if ((Server.Manager as ApplicationManager).IsInitialized)
+                {
+                    try
+                    {
+                        await UpdateLogEvents();
+                    }
+
+                    catch (Exception e)
+                    {
+                        Server.Logger.WriteWarning($"Failed to update log event for {Server.EndPoint}");
+                        Server.Logger.WriteDebug($"Exception: {e.Message}");
+                        Server.Logger.WriteDebug($"StackTrace: {e.StackTrace}");
+                    }
+                }
+                Thread.Sleep(Reader.UpdateInterval);
+            }
+        }
+
+        private async Task UpdateLogEvents()
+        {
+            long fileSize = Reader.Length;
+
+            if (PreviousFileSize == 0)
+                PreviousFileSize = fileSize;
+
+            long fileDiff = fileSize - PreviousFileSize;
+
+            // this makes the http log get pulled
+            if (fileDiff < 1 && fileSize != -1)
+                return;
+
+            PreviousFileSize = fileSize;
+
+            var events = await Reader.ReadEventsFromLog(Server, fileDiff, 0);
+
+            foreach (var ev in events)
+            {
+                Server.Manager.GetEventHandler().AddEvent(ev);
+                await ev.WaitAsync();
+            }
+
+            PreviousFileSize = fileSize;
+        }
+    }
+}

Application/IO/GameLogReader.cs

@@ -4,13 +4,18 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using System.Threading.Tasks;
 
 namespace IW4MAdmin.Application.IO
 {
-    class GameLogReader
+    class GameLogReader : IGameLogReader
     {
         IEventParser Parser;
-        string LogFile;
+        readonly string LogFile;
+
+        public long Length => new FileInfo(LogFile).Length;
+
+        public int UpdateInterval => 300;
 
         public GameLogReader(string logFile, IEventParser parser)
         {
@@ -18,7 +23,7 @@ namespace IW4MAdmin.Application.IO
             Parser = parser;
         }
 
-        public ICollection<GameEvent> EventsFromLog(Server server, long fileSizeDiff, long startPosition)
+        public async Task<ICollection<GameEvent>> ReadEventsFromLog(Server server, long fileSizeDiff, long startPosition)
         {
             // allocate the bytes for the new log lines
             List<string> logLines = new List<string>();
@@ -26,6 +31,7 @@ namespace IW4MAdmin.Application.IO
             // open the file as a stream
             using (var rd = new StreamReader(new FileStream(LogFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite), Utilities.EncodingType))
             {
+                // todo: max async
                 // take the old start position and go back the number of new characters
                 rd.BaseStream.Seek(-fileSizeDiff, SeekOrigin.End);
                 // the difference should be in the range of a int :P
@@ -51,9 +57,9 @@ namespace IW4MAdmin.Application.IO
                     
                     catch (Exception e)
                     {
-                        Program.ServerManager.GetLogger().WriteWarning("Could not properly parse event line");
+                        server.Logger.WriteWarning("Could not properly parse event line");
-                        Program.ServerManager.GetLogger().WriteDebug(e.Message);
+                        server.Logger.WriteDebug(e.Message);
-                        Program.ServerManager.GetLogger().WriteDebug(eventLine);
+                        server.Logger.WriteDebug(eventLine);
                     }
                 }
             }

Application/IO/GameLogReaderHttp.cs

@@ -0,0 +1,74 @@
+using IW4MAdmin.Application.API.GameLogServer;
+using RestEase;
+using SharedLibraryCore;
+using SharedLibraryCore.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading.Tasks;
+using static SharedLibraryCore.Utilities;
+
+namespace IW4MAdmin.Application.IO
+{
+    /// <summary>
+    /// provides capibility of reading log files over HTTP
+    /// </summary>
+    class GameLogReaderHttp : IGameLogReader
+    {
+        readonly IEventParser Parser;
+        readonly IGameLogServer Api;
+        readonly string LogFile;
+
+        public GameLogReaderHttp(string logFile, IEventParser parser)
+        {
+            LogFile = logFile;
+            Parser = parser;
+            Api = RestClient.For<IGameLogServer>(logFile);
+        }
+
+        public long Length => -1;
+
+        public int UpdateInterval => 350;
+
+        public async Task<ICollection<GameEvent>> ReadEventsFromLog(Server server, long fileSizeDiff, long startPosition)
+        {
+#if DEBUG == true
+            server.Logger.WriteDebug($"Begin reading from http log");
+#endif
+            var events = new List<GameEvent>();
+            string b64Path = server.LogPath.ToBase64UrlSafeString();
+            var response = await Api.Log(b64Path);
+
+            if (!response.Success)
+            {
+                server.Logger.WriteError($"Could not get log server info of {LogFile}/{b64Path} ({server.LogPath})");
+                return events;
+            }
+
+            // parse each line
+            foreach (string eventLine in response.Data.Split(Environment.NewLine))
+            {
+                if (eventLine.Length > 0)
+                {
+                    try
+                    {
+                        var e = Parser.GetEvent(server, eventLine);
+#if DEBUG == true
+                        server.Logger.WriteDebug($"Parsed event with id {e.Id}  from http");
+#endif
+                        events.Add(e);
+                    }
+
+                    catch (Exception e)
+                    {
+                        server.Logger.WriteWarning("Could not properly parse event line");
+                        server.Logger.WriteDebug(e.Message);
+                        server.Logger.WriteDebug(eventLine);
+                    }
+                }
+            }
+
+            return events;
+        }
+    }
+}

Application/Localization/Configure.cs

@@ -15,7 +15,7 @@ namespace IW4MAdmin.Application.Localization
         public static void Initialize(string customLocale)
         {
             string currentLocale = string.IsNullOrEmpty(customLocale) ? CultureInfo.CurrentCulture.Name : customLocale;
-            string[] localizationFiles = Directory.GetFiles("Localization", $"*.{currentLocale}.json");
+            string[] localizationFiles = Directory.GetFiles(Path.Join(Utilities.OperatingDirectory, "Localization"), $"*.{currentLocale}.json");
 
             try
             {
@@ -33,13 +33,13 @@ namespace IW4MAdmin.Application.Localization
             // culture doesn't exist so we just want language
             if (localizationFiles.Length == 0)
             {
-                localizationFiles = Directory.GetFiles("Localization", $"*.{currentLocale.Substring(0, 2)}*.json");
+                localizationFiles = Directory.GetFiles(Path.Join(Utilities.OperatingDirectory, "Localization"), $"*.{currentLocale.Substring(0, 2)}*.json");
             }
 
             // language doesn't exist either so defaulting to english
             if (localizationFiles.Length == 0)
             {
-                localizationFiles = Directory.GetFiles("Localization", "*.en-US.json");
+                localizationFiles = Directory.GetFiles(Path.Join(Utilities.OperatingDirectory, "Localization"), "*.en-US.json");
             }
 
             // this should never happen unless the localization folder is empty
@@ -59,12 +59,12 @@ namespace IW4MAdmin.Application.Localization
                 {
                     if (!localizationDict.TryAdd(item.Key, item.Value))
                     {
-                        Program.ServerManager.GetLogger().WriteError($"Could not add locale string {item.Key} to localization");
+                        Program.ServerManager.GetLogger(0).WriteError($"Could not add locale string {item.Key} to localization");
                     }
                 }
             }
 
-            string localizationFile = $"Localization{Path.DirectorySeparatorChar}IW4MAdmin.{currentLocale}-{currentLocale.ToUpper()}.json";
+            string localizationFile = $"{Path.Join(Utilities.OperatingDirectory, "Localization")}{Path.DirectorySeparatorChar}IW4MAdmin.{currentLocale}-{currentLocale.ToUpper()}.json";
 
             Utilities.CurrentLocalization = new SharedLibraryCore.Localization.Layout(localizationDict)
             {

Application/Localization/IW4MAdmin.en-US.json

@@ -114,11 +114,11 @@
         "COMMANDS_WARNCLEAR_DESC": "remove all warnings for a client",
         "COMMANDS_WARNCLEAR_SUCCESS": "All warning cleared for",
         "COMMANDS_WHO_DESC": "give information about yourself",
-        "GLOBAL_DAYS": "days",
+        "GLOBAL_TIME_DAYS": "days",
         "GLOBAL_ERROR": "Error",
-        "GLOBAL_HOURS": "hours",
+        "GLOBAL_TIME_HOURS": "hours",
         "GLOBAL_INFO": "Info",
-        "GLOBAL_MINUTES": "minutes",
+        "GLOBAL_TIME_MINUTES": "minutes",
         "GLOBAL_REPORT": "If you suspect someone of ^5CHEATING ^7use the ^5!report ^7command",
         "GLOBAL_VERBOSE": "Verbose",
         "GLOBAL_WARNING": "Warning",

Application/Localization/IW4MAdmin.es-EC.json

@@ -114,11 +114,11 @@
         "COMMANDS_WARNCLEAR_DESC": "eliminar todas las advertencias de un cliente",
         "COMMANDS_WARNCLEAR_SUCCESS": "Todas las advertencias borradas para",
         "COMMANDS_WHO_DESC": "da información sobre ti",
-        "GLOBAL_DAYS": "días",
+        "GLOBAL_TIME_DAYS": "días",
         "GLOBAL_ERROR": "Error",
-        "GLOBAL_HOURS": "horas",
+        "GLOBAL_TIME_HOURS": "horas",
         "GLOBAL_INFO": "Información",
-        "GLOBAL_MINUTES": "minutos",
+        "GLOBAL_TIME_MINUTES": "minutos",
         "GLOBAL_REPORT": "Si sospechas que alguien ^5usa cheats ^7usa el comando ^5!report",
         "GLOBAL_VERBOSE": "Detallado",
         "GLOBAL_WARNING": "Advertencia",

Application/Localization/IW4MAdmin.pt-BR.json

@@ -114,11 +114,11 @@
         "COMMANDS_WARNCLEAR_DESC": "remove todos os avisos para um cliente",
         "COMMANDS_WARNCLEAR_SUCCESS": "Todos as advertências foram apagados para",
         "COMMANDS_WHO_DESC": "dá informações sobre você",
-        "GLOBAL_DAYS": "dias",
+        "GLOBAL_TIME_DAYS": "dias",
         "GLOBAL_ERROR": "Erro",
-        "GLOBAL_HOURS": "horas",
+        "GLOBAL_TIME_HOURS": "horas",
         "GLOBAL_INFO": "Informação",
-        "GLOBAL_MINUTES": "minutos",
+        "GLOBAL_TIME_MINUTES": "minutos",
         "GLOBAL_REPORT": "Se você está suspeitando alguém de alguma ^5TRAPAÇA ^7use o comando ^5!report",
         "GLOBAL_VERBOSE": "Detalhe",
         "GLOBAL_WARNING": "AVISO",

Application/Localization/IW4MAdmin.ru-RU.json

@@ -114,11 +114,11 @@
         "COMMANDS_WARNCLEAR_DESC": "удалить все предупреждения у игрока",
         "COMMANDS_WARNCLEAR_SUCCESS": "Все предупреждения очищены у",
         "COMMANDS_WHO_DESC": "предоставить информацию о себе",
-        "GLOBAL_DAYS": "дней",
+        "GLOBAL_TIME_DAYS": "дней",
         "GLOBAL_ERROR": "Ошибка",
-        "GLOBAL_HOURS": "часов",
+        "GLOBAL_TIME_HOURS": "часов",
         "GLOBAL_INFO": "Информация",
-        "GLOBAL_MINUTES": "минут",
+        "GLOBAL_TIME_MINUTES": "минут",
         "GLOBAL_REPORT": "Если вы подозреваете кого-то в ^5ЧИТЕРСТВЕ^7, используйте команду ^5!report",
         "GLOBAL_VERBOSE": "Подробно",
         "GLOBAL_WARNING": "Предупреждение",

Application/Logger.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Threading;
 
 namespace IW4MAdmin.Application
 {
@@ -17,19 +18,45 @@ namespace IW4MAdmin.Application
             Assert
         }
 
-        string FileName;
+        readonly string FileName;
-        object ThreadLock;
+        readonly SemaphoreSlim OnLogWriting;
+        static readonly short MAX_LOG_FILES = 10;
 
         public Logger(string fn)
         {
-            FileName = fn;
+            FileName = Path.Join(Utilities.OperatingDirectory, "Log", $"{fn}.log");
-            ThreadLock = new object();
+            OnLogWriting = new SemaphoreSlim(1, 1);
-            if (File.Exists(fn))
+            RotateLogs();
-                File.Delete(fn);
+        }
+
+        /// <summary>
+        /// rotates logs when log is initialized
+        /// </summary>
+        private void RotateLogs()
+        {
+            string maxLog = FileName + MAX_LOG_FILES;
+
+            if (File.Exists(maxLog))
+            {
+                File.Delete(maxLog);
+            }
+
+            for (int i = MAX_LOG_FILES - 1; i >= 0; i--)
+            {
+                string logToMove = i == 0 ? FileName : FileName + i;
+                string movedLogName = FileName + (i + 1);
+
+                if (File.Exists(logToMove))
+                {
+                    File.Move(logToMove, movedLogName);
+                }
+            }
         }
 
         void Write(string msg, LogType type)
         {
+            OnLogWriting.Wait();
+
             string stringType = type.ToString();
 
             try
@@ -39,14 +66,13 @@ namespace IW4MAdmin.Application
 
             catch (Exception) { }
 
-            string LogLine = $"[{DateTime.Now.ToString("HH:mm:ss")}] - {stringType}: {msg}";
+            string LogLine = $"[{DateTime.Now.ToString("MM.dd.yyy HH:mm:ss.fff")}] - {stringType}: {msg}";
-            lock (ThreadLock)
+            try
             {
 #if DEBUG
-            // lets keep it simple and dispose of everything quickly as logging wont be that much (relatively)
+                // lets keep it simple and dispose of everything quickly as logging wont be that much (relatively)
-
+                Console.WriteLine(LogLine);
-            Console.WriteLine(LogLine);
+                File.AppendAllText(FileName, LogLine + Environment.NewLine);
-            File.AppendAllText(FileName, LogLine + Environment.NewLine);
 #else
                 if (type == LogType.Error || type == LogType.Verbose)
                     Console.WriteLine(LogLine);
@@ -54,6 +80,14 @@ namespace IW4MAdmin.Application
                 File.AppendAllText(FileName, $"{LogLine}{Environment.NewLine}");
 #endif
             }
+
+            catch (Exception ex)
+            {
+                Console.WriteLine("Well.. It looks like your machine can't event write to the log file. That's something else...");
+                Console.WriteLine(ex.GetExceptionInfo());
+            }
+
+            OnLogWriting.Release(1);
         }
 
         public void WriteVerbose(string msg)

Application/Main.cs

@@ -10,46 +10,46 @@ using System.Text;
 using System.Threading;
 using System.Collections.Generic;
 using SharedLibraryCore.Localization;
+using IW4MAdmin.Application.Migration;
 
 namespace IW4MAdmin.Application
 {
     public class Program
     {
         static public double Version { get; private set; }
-        static public ApplicationManager ServerManager = ApplicationManager.GetInstance();
+        static public ApplicationManager ServerManager;
-        public static string OperatingDirectory = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location) + Path.DirectorySeparatorChar;
         private static ManualResetEventSlim OnShutdownComplete = new ManualResetEventSlim();
 
         public static void Main(string[] args)
         {
-            AppDomain.CurrentDomain.SetData("DataDirectory", OperatingDirectory);
+            AppDomain.CurrentDomain.SetData("DataDirectory", Utilities.OperatingDirectory);
-            //System.Diagnostics.Process.GetCurrentProcess().PriorityClass = System.Diagnostics.ProcessPriorityClass.BelowNormal;
 
             Console.OutputEncoding = Encoding.UTF8;
             Console.ForegroundColor = ConsoleColor.Gray;
 
-            Version = Assembly.GetExecutingAssembly().GetName().Version.Major + Assembly.GetExecutingAssembly().GetName().Version.Minor / 10.0f;
+            Version = Utilities.GetVersionAsDouble();
-            Version = Math.Round(Version, 2);
 
             Console.WriteLine("=====================================================");
             Console.WriteLine(" IW4M ADMIN");
             Console.WriteLine(" by RaidMax ");
-            Console.WriteLine($" Version {Version.ToString("0.0")}");
+            Console.WriteLine($" Version {Utilities.GetVersionAsString()}");
             Console.WriteLine("=====================================================");
 
             Index loc = null;
 
             try
             {
-                CheckDirectories();
-
                 ServerManager = ApplicationManager.GetInstance();
-                Console.CancelKeyPress += new ConsoleCancelEventHandler(OnCancelKey);
                 Localization.Configure.Initialize(ServerManager.GetApplicationSettings().Configuration()?.CustomLocale);
                 loc = Utilities.CurrentLocalization.LocalizationIndex;
+                Console.CancelKeyPress += new ConsoleCancelEventHandler(OnCancelKey);
 
-                using (var db = new DatabaseContext(ServerManager.GetApplicationSettings().Configuration()?.ConnectionString))
+                CheckDirectories();
-                    new ContextSeed(db).Seed().Wait();
+                // do any needed migrations
+                // todo: move out
+                ConfigurationMigration.MoveConfigFolder10518(null);
+
+                ServerManager.Logger.WriteInfo($"Version is {Version}");
 
                 var api = API.Master.Endpoint.Get();
 
@@ -107,10 +107,10 @@ namespace IW4MAdmin.Application
 
                 ServerManager.Init().Wait();
 
-                var consoleTask = Task.Run(() =>
+                var consoleTask = Task.Run(async () =>
                 {
                     String userInput;
-                    Player Origin = ServerManager.GetClientService().Get(1).Result.AsPlayer();
+                    var Origin = Utilities.IW4MAdminClient(ServerManager.Servers[0]);
 
                     do
                     {
@@ -127,7 +127,6 @@ namespace IW4MAdmin.Application
 
                         if (userInput?.Length > 0)
                         {
-                            Origin.CurrentServer = ServerManager.Servers[0];
                             GameEvent E = new GameEvent()
                             {
                                 Type = GameEvent.EventType.Command,
@@ -137,7 +136,7 @@ namespace IW4MAdmin.Application
                             };
 
                             ServerManager.GetEventHandler().AddEvent(E);
-                            E.OnProcessed.Wait(5000);
+                            await E.WaitAsync(30 * 1000);
                         }
                         Console.Write('>');
 
@@ -152,7 +151,7 @@ namespace IW4MAdmin.Application
                 {
                     e = e.InnerException;
                 }
-                Console.WriteLine($"Exception: {e.Message}");
+                Console.WriteLine(e.Message);
                 Console.WriteLine(loc["MANAGER_EXIT"]);
                 Console.ReadKey();
                 return;
@@ -164,7 +163,7 @@ namespace IW4MAdmin.Application
             }
 
             OnShutdownComplete.Reset();
-            ServerManager.Start().Wait();
+            ServerManager.Start();
             ServerManager.Logger.WriteVerbose(loc["MANAGER_SHUTDOWN_SUCCESS"]);
             OnShutdownComplete.Set();
         }
@@ -172,15 +171,25 @@ namespace IW4MAdmin.Application
         private static void OnCancelKey(object sender, ConsoleCancelEventArgs e)
         {
             ServerManager.Stop();
-            OnShutdownComplete.Wait(5000);
+            OnShutdownComplete.Wait();
         }
 
         static void CheckDirectories()
         {
-            string curDirectory = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location) + Path.DirectorySeparatorChar;
+            if (!Directory.Exists(Path.Join(Utilities.OperatingDirectory, "Plugins")))
+            {
+                Directory.CreateDirectory(Path.Join(Utilities.OperatingDirectory, "Plugins"));
+            }
 
-            if (!Directory.Exists($"{curDirectory}Plugins"))
+            if (!Directory.Exists(Path.Join(Utilities.OperatingDirectory, "Database")))
-                Directory.CreateDirectory($"{curDirectory}Plugins");
+            {
+                Directory.CreateDirectory(Path.Join(Utilities.OperatingDirectory, "Database"));
+            }
+
+            if (!Directory.Exists(Path.Join(Utilities.OperatingDirectory, "Log")))
+            {
+                Directory.CreateDirectory(Path.Join(Utilities.OperatingDirectory, "Log"));
+            }
         }
     }
 }

Application/Manager.cs

@@ -1,25 +1,21 @@
-using System;
+using IW4MAdmin.Application.API.Master;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Database;
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Events;
+using SharedLibraryCore.Exceptions;
+using SharedLibraryCore.Helpers;
+using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.Services;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
+using System.Reflection;
-using System.IO;
-using System.Threading.Tasks;
-
-using SharedLibraryCore;
-using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.Commands;
-using SharedLibraryCore.Helpers;
-using SharedLibraryCore.Exceptions;
-using SharedLibraryCore.Objects;
-using SharedLibraryCore.Services;
-using IW4MAdmin.Application.API;
-using Microsoft.Extensions.Configuration;
-using WebfrontCore;
-using SharedLibraryCore.Configuration;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using System.Text;
-using IW4MAdmin.Application.API.Master;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace IW4MAdmin.Application
 {
@@ -27,27 +23,33 @@ namespace IW4MAdmin.Application
     {
         private List<Server> _servers;
         public List<Server> Servers => _servers.OrderByDescending(s => s.ClientNum).ToList();
-        public Dictionary<int, Player> PrivilegedClients { get; set; }
+        public Dictionary<int, EFClient> PrivilegedClients { get; set; }
-        public ILogger Logger { get; private set; }
+        public ILogger Logger => GetLogger(0);
         public bool Running { get; private set; }
-        public EventHandler<GameEvent> ServerEventOccurred { get; private set; }
+        public bool IsInitialized { get; private set; }
+        // define what the delagate function looks like
+        public delegate void OnServerEventEventHandler(object sender, GameEventArgs e);
+        // expose the event handler so we can execute the events
+        public OnServerEventEventHandler OnServerEvent { get; set; }
         public DateTime StartTime { get; private set; }
+        public string Version => Assembly.GetEntryAssembly().GetName().Version.ToString();
 
         static ApplicationManager Instance;
-        List<AsyncStatus> TaskStatuses;
+        readonly List<AsyncStatus> TaskStatuses;
         List<Command> Commands;
-        List<MessageToken> MessageTokens;
+        readonly List<MessageToken> MessageTokens;
         ClientService ClientSvc;
-        AliasService AliasSvc;
+        readonly AliasService AliasSvc;
-        PenaltyService PenaltySvc;
+        readonly PenaltyService PenaltySvc;
-        BaseConfigurationHandler<ApplicationConfiguration> ConfigHandler;
+        public BaseConfigurationHandler<ApplicationConfiguration> ConfigHandler;
-        EventApi Api;
         GameEventHandler Handler;
-        ManualResetEventSlim OnEvent;
+        ManualResetEventSlim OnQuit;
+        readonly IPageList PageList;
+        readonly SemaphoreSlim ProcessingEvent = new SemaphoreSlim(1, 1);
+        readonly Dictionary<long, ILogger> Loggers = new Dictionary<long, ILogger>();
 
         private ApplicationManager()
         {
-            Logger = new Logger($@"{Utilities.OperatingDirectory}IW4MAdmin.log");
             _servers = new List<Server>();
             Commands = new List<Command>();
             TaskStatuses = new List<AsyncStatus>();
@@ -55,12 +57,72 @@ namespace IW4MAdmin.Application
             ClientSvc = new ClientService();
             AliasSvc = new AliasService();
             PenaltySvc = new PenaltyService();
-            PrivilegedClients = new Dictionary<int, Player>();
-            Api = new EventApi();
-            ServerEventOccurred += Api.OnServerEvent;
             ConfigHandler = new BaseConfigurationHandler<ApplicationConfiguration>("IW4MAdminSettings");
             StartTime = DateTime.UtcNow;
-            OnEvent = new ManualResetEventSlim();
+            OnQuit = new ManualResetEventSlim();
+            PageList = new PageList();
+            OnServerEvent += OnGameEvent;
+            OnServerEvent += EventApi.OnGameEvent;
+        }
+
+        private async void OnGameEvent(object sender, GameEventArgs args)
+        {
+#if DEBUG == true
+            Logger.WriteDebug($"Entering event process for {args.Event.Id}");
+#endif
+
+            var newEvent = args.Event;
+
+            // the event has failed already
+            if (newEvent.Failed)
+            {
+                goto skip;
+            }
+
+            try
+            {
+                await newEvent.Owner.ExecuteEvent(newEvent);
+
+                // save the event info to the database
+                var changeHistorySvc = new ChangeHistoryService();
+                await changeHistorySvc.Add(args.Event);
+
+#if DEBUG
+                Logger.WriteDebug($"Processed event with id {newEvent.Id}");
+#endif
+            }
+
+            // this happens if a plugin requires login
+            catch (AuthorizationException ex)
+            {
+                newEvent.FailReason = GameEvent.EventFailReason.Permission;
+                newEvent.Origin.Tell($"{Utilities.CurrentLocalization.LocalizationIndex["COMMAND_NOTAUTHORIZED"]} - {ex.Message}");
+            }
+
+            catch (NetworkException ex)
+            {
+                newEvent.FailReason = GameEvent.EventFailReason.Exception;
+                Logger.WriteError(ex.Message);
+                Logger.WriteDebug(ex.GetExceptionInfo());
+            }
+
+            catch (ServerException ex)
+            {
+                newEvent.FailReason = GameEvent.EventFailReason.Exception;
+                Logger.WriteWarning(ex.Message);
+            }
+
+            catch (Exception ex)
+            {
+                newEvent.FailReason = GameEvent.EventFailReason.Exception;
+                Logger.WriteError($"{Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_EXCEPTION"]} {newEvent.Owner}");
+                Logger.WriteDebug(ex.GetExceptionInfo());
+            }
+
+        skip:
+
+            // tell anyone waiting for the output that we're done
+            newEvent.OnProcessed.Set();
         }
 
         public IList<Server> GetServers()
@@ -78,16 +140,39 @@ namespace IW4MAdmin.Application
             return Instance ?? (Instance = new ApplicationManager());
         }
 
-        public async Task UpdateStatus(object state)
+        public async Task UpdateServerStates()
         {
-            var taskList = new List<Task>();
+            // store the server hash code and task for it
+            var runningUpdateTasks = new Dictionary<long, Task>();
 
             while (Running)
             {
-                taskList.Clear();
+                // select the server ids that have completed the update task
-                foreach (var server in Servers)
+                var serverTasksToRemove = runningUpdateTasks
+                    .Where(ut => ut.Value.Status == TaskStatus.RanToCompletion ||
+                        ut.Value.Status == TaskStatus.Canceled ||
+                        ut.Value.Status == TaskStatus.Faulted)
+                    .Select(ut => ut.Key)
+                    .ToList();
+
+                // this is to prevent the log reader from starting before the initial
+                // query of players on the server
+                if (serverTasksToRemove.Count > 0)
                 {
-                    taskList.Add(Task.Run(async () =>
+                    IsInitialized = true;
+                }
+
+                // remove the update tasks as they have completd
+                foreach (long serverId in serverTasksToRemove)
+                {
+                    runningUpdateTasks.Remove(serverId);
+                }
+
+                // select the servers where the tasks have completed
+                var serverIds = Servers.Select(s => s.EndPoint).Except(runningUpdateTasks.Select(r => r.Key)).ToList();
+                foreach (var server in Servers.Where(s => serverIds.Contains(s.EndPoint)))
+                {
+                    runningUpdateTasks.Add(server.EndPoint, Task.Run(async () =>
                     {
                         try
                         {
@@ -97,49 +182,21 @@ namespace IW4MAdmin.Application
                         catch (Exception e)
                         {
                             Logger.WriteWarning($"Failed to update status for {server}");
-                            Logger.WriteDebug($"Exception: {e.Message}");
+                            Logger.WriteDebug(e.GetExceptionInfo());
-                            Logger.WriteDebug($"StackTrace: {e.StackTrace}");
                         }
                     }));
                 }
 #if DEBUG
-                Logger.WriteDebug($"{taskList.Count} servers queued for stats updates");
+                Logger.WriteDebug($"{runningUpdateTasks.Count} servers queued for stats updates");
                 ThreadPool.GetMaxThreads(out int workerThreads, out int n);
                 ThreadPool.GetAvailableThreads(out int availableThreads, out int m);
                 Logger.WriteDebug($"There are {workerThreads - availableThreads} active threading tasks");
 #endif
-
+                await Task.Delay(ConfigHandler.Configuration().RConPollRate);
-                await Task.WhenAll(taskList.ToArray());
-
-                GameEvent sensitiveEvent;
-                while ((sensitiveEvent = Handler.GetNextSensitiveEvent()) != null)
-                {
-                    try
-                    {
-                        await sensitiveEvent.Owner.ExecuteEvent(sensitiveEvent);
-#if DEBUG
-                        Logger.WriteDebug($"Processed Sensitive Event {sensitiveEvent.Type}");
-#endif
-                    }
-
-                    catch (NetworkException e)
-                    {
-                        Logger.WriteError(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_COMMUNICATION"]);
-                        Logger.WriteDebug(e.Message);
-                    }
-
-                    catch (Exception E)
-                    {
-                        Logger.WriteError($"{Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_EXCEPTION"]} {sensitiveEvent.Owner}");
-                        Logger.WriteDebug("Error Message: " + E.Message);
-                        Logger.WriteDebug("Error Trace: " + E.StackTrace);
-                    }
-
-                    sensitiveEvent.OnProcessed.Set();
-                }
-
-                await Task.Delay(2500);
             }
+
+            // trigger the event processing loop to end
+            SetHasEvent();
         }
 
         public async Task Init()
@@ -147,35 +204,12 @@ namespace IW4MAdmin.Application
             Running = true;
 
             #region DATABASE
-            var ipList = (await ClientSvc.Find(c => c.Level > Player.Permission.Trusted))
+            using (var db = new DatabaseContext(GetApplicationSettings().Configuration()?.ConnectionString, GetApplicationSettings().Configuration()?.DatabaseProvider))
-                .Select(c => new
-                {
-                    c.Password,
-                    c.PasswordSalt,
-                    c.ClientId,
-                    c.Level,
-                    c.Name
-                });
-
-            foreach (var a in ipList)
             {
-                try
+                await new ContextSeed(db).Seed();
-                {
-                    PrivilegedClients.Add(a.ClientId, new Player()
-                    {
-                        Name = a.Name,
-                        ClientId = a.ClientId,
-                        Level = a.Level,
-                        PasswordSalt = a.PasswordSalt,
-                        Password = a.Password
-                    });
-                }
-
-                catch (ArgumentException)
-                {
-                    continue;
-                }
             }
+
+            PrivilegedClients = (await ClientSvc.GetPrivilegedClients()).ToDictionary(_client => _client.ClientId);
             #endregion
 
             #region CONFIG
@@ -218,13 +252,15 @@ namespace IW4MAdmin.Application
 
                 if (string.IsNullOrEmpty(config.WebfrontBindUrl))
                 {
-                    config.WebfrontBindUrl = "http://127.0.0.1:1624";
+                    config.WebfrontBindUrl = "http://0.0.0.0:1624";
                     await ConfigHandler.Save();
                 }
             }
 
             else if (config.Servers.Count == 0)
+            {
                 throw new ServerException("A server configuration in IW4MAdminSettings.json is invalid");
+            }
 
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
             Utilities.EncodingType = Encoding.GetEncoding(!string.IsNullOrEmpty(config.CustomParserEncoding) ? config.CustomParserEncoding : "windows-1252");
@@ -240,18 +276,19 @@ namespace IW4MAdmin.Application
                     await Plugin.OnLoadAsync(this);
                 }
 
-                catch (Exception e)
+                catch (Exception ex)
                 {
                     Logger.WriteError($"{Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_PLUGIN"]} {Plugin.Name}");
-                    Logger.WriteDebug($"Exception: {e.Message}");
+                    Logger.WriteDebug(ex.GetExceptionInfo());
-                    Logger.WriteDebug($"Stack Trace: {e.StackTrace}");
                 }
             }
             #endregion
 
             #region COMMANDS
             if (ClientSvc.GetOwners().Result.Count == 0)
+            {
                 Commands.Add(new COwner());
+            }
 
             Commands.Add(new CQuit());
             Commands.Add(new CKick());
@@ -288,9 +325,13 @@ namespace IW4MAdmin.Application
             Commands.Add(new CKillServer());
             Commands.Add(new CSetPassword());
             Commands.Add(new CPing());
+            Commands.Add(new CSetGravatar());
+            Commands.Add(new CNextMap());
 
             foreach (Command C in SharedLibraryCore.Plugins.PluginImporter.ActiveCommands)
+            {
                 Commands.Add(C);
+            }
             #endregion
 
             #region INIT
@@ -310,14 +351,24 @@ namespace IW4MAdmin.Application
 
                     Logger.WriteVerbose($"{Utilities.CurrentLocalization.LocalizationIndex["MANAGER_MONITORING_TEXT"]} {ServerInstance.Hostname}");
                     // add the start event for this server
-                    Handler.AddEvent(new GameEvent(GameEvent.EventType.Start, "Server started", null, null, ServerInstance));
+
+                    var e = new GameEvent()
+                    {
+                        Type = GameEvent.EventType.Start,
+                        Data = $"{ServerInstance.GameName} started",
+                        Owner = ServerInstance
+                    };
+
+                    Handler.AddEvent(e);
                 }
 
                 catch (ServerException e)
                 {
                     Logger.WriteError($"{Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_UNFIXABLE"]} [{Conf.IPAddress}:{Conf.Port}]");
                     if (e.GetType() == typeof(DvarException))
+                    {
                         Logger.WriteDebug($"{Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_DVAR"]} {(e as DvarException).Data["dvar_name"]} ({Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_DVAR_HELP"]})");
+                    }
                     else if (e.GetType() == typeof(NetworkException))
                     {
                         Logger.WriteDebug(e.Message);
@@ -397,89 +448,48 @@ namespace IW4MAdmin.Application
             }
         }
 
-        public async Task Start()
+        public void Start()
         {
             // this needs to be run seperately from the main thread
-#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
+            var _ = Task.Run(() => SendHeartbeat(new HeartbeatState()));
-#if !DEBUG
+            _ = Task.Run(() => UpdateServerStates());
-            // start heartbeat
-            Task.Run(() => SendHeartbeat(new HeartbeatState()));
-#endif
-            Task.Run(() => UpdateStatus(null));
-#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-
-            var eventList = new List<Task>();
-
-            async Task processEvent(GameEvent newEvent)
-            {
-                try
-                {
-                    await newEvent.Owner.ExecuteEvent(newEvent);
-#if DEBUG
-                    Logger.WriteDebug("Processed Event");
-#endif
-                }
-
-                // this happens if a plugin requires login
-                catch (AuthorizationException e)
-                {
-                    await newEvent.Origin.Tell($"{Utilities.CurrentLocalization.LocalizationIndex["COMMAND_NOTAUTHORIZED"]} - {e.Message}");
-                }
-
-                catch (NetworkException e)
-                {
-                    Logger.WriteError(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_COMMUNICATION"]);
-                    Logger.WriteDebug(e.Message);
-                }
-
-                catch (Exception E)
-                {
-                    Logger.WriteError($"{Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_EXCEPTION"]} {newEvent.Owner}");
-                    Logger.WriteDebug("Error Message: " + E.Message);
-                    Logger.WriteDebug("Error Trace: " + E.StackTrace);
-                }
-                // tell anyone waiting for the output that we're done
-                newEvent.OnProcessed.Set();
-            };
-
-            GameEvent queuedEvent = null;
 
             while (Running)
             {
-                // wait for new event to be added
+                OnQuit.Wait();
-                OnEvent.Wait();
+                OnQuit.Reset();
-
-                // todo: sequencially or parallelize?
-                while ((queuedEvent = Handler.GetNextEvent()) != null)
-                {
-                    await processEvent(queuedEvent);
-                }
-
-                // this should allow parallel processing of events
-                // await Task.WhenAll(eventList);
-
-                // signal that all events have been processed
-                OnEvent.Reset();
             }
-#if !DEBUG
-            foreach (var S in _servers)
-                await S.Broadcast("^1" + Utilities.CurrentLocalization.LocalizationIndex["BROADCAST_OFFLINE"]);
-#endif
             _servers.Clear();
         }
 
-
         public void Stop()
         {
             Running = false;
-
-            // trigger the event processing loop to end
-            SetHasEvent();
         }
 
-        public ILogger GetLogger()
+        public ILogger GetLogger(long serverId)
         {
-            return Logger;
+            if (Loggers.ContainsKey(serverId))
+            {
+                return Loggers[serverId];
+            }
+
+            else
+            {
+                Logger newLogger;
+
+                if (serverId == 0)
+                {
+                    newLogger = new Logger("IW4MAdmin-Manager");
+                }
+                else
+                {
+                    newLogger = new Logger($"IW4MAdmin-Server-{serverId}");
+                }
+
+                Loggers.Add(serverId, newLogger);
+                return newLogger;
+            }
         }
 
         public IList<MessageToken> GetMessageTokens()
@@ -487,28 +497,59 @@ namespace IW4MAdmin.Application
             return MessageTokens;
         }
 
-        public IList<Player> GetActiveClients()
+        public IList<EFClient> GetActiveClients()
         {
-            var ActiveClients = new List<Player>();
+            return _servers.SelectMany(s => s.Clients).Where(p => p != null).ToList();
-
-            foreach (var server in _servers)
-                ActiveClients.AddRange(server.Players.Where(p => p != null));
-
-            return ActiveClients;
         }
 
-        public ClientService GetClientService() => ClientSvc;
+        public ClientService GetClientService()
-        public AliasService GetAliasService() => AliasSvc;
+        {
-        public PenaltyService GetPenaltyService() => PenaltySvc;
+            return ClientSvc;
-        public IConfigurationHandler<ApplicationConfiguration> GetApplicationSettings() => ConfigHandler;
+        }
-        public IDictionary<int, Player> GetPrivilegedClients() => PrivilegedClients;
+
-        public IEventApi GetEventApi() => Api;
+        public AliasService GetAliasService()
-        public bool ShutdownRequested() => !Running;
+        {
-        public IEventHandler GetEventHandler() => Handler;
+            return AliasSvc;
+        }
+
+        public PenaltyService GetPenaltyService()
+        {
+            return PenaltySvc;
+        }
+
+        public IConfigurationHandler<ApplicationConfiguration> GetApplicationSettings()
+        {
+            return ConfigHandler;
+        }
+
+        public IDictionary<int, EFClient> GetPrivilegedClients()
+        {
+            return PrivilegedClients;
+        }
+
+        public bool ShutdownRequested()
+        {
+            return !Running;
+        }
+
+        public IEventHandler GetEventHandler()
+        {
+            return Handler;
+        }
 
         public void SetHasEvent()
         {
-            OnEvent.Set();
+            OnQuit.Set();
+        }
+
+        public IList<Assembly> GetPluginAssemblies()
+        {
+            return SharedLibraryCore.Plugins.PluginImporter.PluginAssemblies;
+        }
+
+        public IPageList GetPageList()
+        {
+            return PageList;
         }
     }
 }

Application/Migration/ConfigurationMigration.cs

@@ -0,0 +1,60 @@
+using SharedLibraryCore;
+using SharedLibraryCore.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace IW4MAdmin.Application.Migration
+{
+    /// <summary>
+    /// helps facilitate the migration of configs from one version and or location
+    /// to another
+    /// </summary>
+    class ConfigurationMigration
+    {
+        /// <summary>
+        /// moves existing configs from the root folder into a configs folder
+        /// </summary>
+        public static void MoveConfigFolder10518(ILogger log)
+        {
+            string currentDirectory = Utilities.OperatingDirectory;
+
+            // we don't want to do this for migrations or tests where the 
+            // property isn't initialized or it's wrong
+            if (currentDirectory != null)
+            {
+                string configDirectory = Path.Join(currentDirectory, "Configuration");
+
+                if (!Directory.Exists(configDirectory))
+                {
+                    log?.WriteDebug($"Creating directory for configs {configDirectory}");
+                    Directory.CreateDirectory(configDirectory);
+                }
+
+                var configurationFiles = Directory.EnumerateFiles(currentDirectory, "*.json")
+                    .Select(f => f.Split(Path.DirectorySeparatorChar).Last())
+                    .Where(f => f.Count(c => c == '.') == 1);
+
+                foreach (var configFile in configurationFiles)
+                {
+                    log?.WriteDebug($"Moving config file {configFile}");
+                    string destinationPath = Path.Join("Configuration", configFile);
+                    if (!File.Exists(destinationPath))
+                    {
+                        File.Move(configFile, destinationPath);
+                    }
+                }
+
+                if (!File.Exists(Path.Join("Database", "Database.db")) &&
+                    File.Exists("Database.db"))
+                {
+                    log?.WriteDebug("Moving database file");
+                    File.Move("Database.db", Path.Join("Database", "Database.db"));
+                }
+            }
+        }
+    }
+}

Application/Misc/VPNCheck.cs

@@ -1,42 +0,0 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Application.Misc
-{
-    public class VPNCheck
-    {
-        public static async Task<bool> UsingVPN(string ip, string apiKey)
-        {
-#if DEBUG
-            return await Task.FromResult(false);
-
-#else
-            try
-            {
-                using (var RequestClient = new System.Net.Http.HttpClient())
-                {
-                    RequestClient.DefaultRequestHeaders.Add("X-Key", apiKey);
-                    string response = await RequestClient.GetStringAsync($"http://v2.api.iphub.info/ip/{ip}");
-                    var responseJson = JsonConvert.DeserializeObject<JObject>(response);
-                    int blockType = Convert.ToInt32(responseJson["block"]);
-                    /*if (responseJson.ContainsKey("isp"))
-                    {
-                        if (responseJson["isp"].ToString() == "TSF-IP-CORE")
-                            return true;
-                    }*/
-                    return blockType == 1;
-                }
-            }
-
-            catch (Exception)
-            {
-                return false;
-            }
-#endif
-        }
-    }
-}

Application/PageList.cs

@@ -0,0 +1,26 @@
+using SharedLibraryCore.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace IW4MAdmin.Application
+{
+    /// <summary>
+    /// implementatin of IPageList that supports basic
+    /// pages title and page location for webfront
+    /// </summary>
+    class PageList : IPageList
+    {
+        /// <summary>
+        /// Pages dictionary
+        /// Key = page name
+        /// Value = page location (url)
+        /// </summary>
+        public IDictionary<string, string> Pages { get; set; }
+
+        public PageList()
+        {
+            Pages = new Dictionary<string, string>();
+        }
+    }
+}

Application/Properties/PublishProfiles/Stable-Windows.pubxml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121. 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PublishProtocol>FileSystem</PublishProtocol>
-    <Configuration>Release</Configuration>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <PublishDir>C:\Projects\IW4M-Admin\Publish\Windows</PublishDir>
-  </PropertyGroup>
-</Project>

Application/RconParsers/IW3RConParser.cs

@@ -1,14 +1,13 @@
-using Application.RconParsers;
+using SharedLibraryCore.RCon;
-using SharedLibraryCore.RCon;
 using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace Application.RconParsers
+namespace IW4MAdmin.Application.RconParsers
 {
     class IW3RConParser : IW4RConParser
     {
-        private static CommandPrefix Prefixes = new CommandPrefix()
+        private static readonly CommandPrefix Prefixes = new CommandPrefix()
         {
             Tell = "tell {0} {1}",
             Say = "say {0}",

Application/RconParsers/IW4RConParser.cs

@@ -1,20 +1,19 @@
-using System;
+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;
-using System.Collections.Generic;
-using System.Text;
-using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.Objects;
-using SharedLibraryCore;
-using SharedLibraryCore.RCon;
-using SharedLibraryCore.Exceptions;
 
-namespace Application.RconParsers
+namespace IW4MAdmin.Application.RconParsers
 {
     class IW4RConParser : IRConParser
     {
-        private static CommandPrefix Prefixes = new CommandPrefix()
+        private static readonly CommandPrefix Prefixes = new CommandPrefix()
         {
             Tell = "tellraw {0} {1}",
             Say = "sayraw {0}",
@@ -23,11 +22,11 @@ namespace Application.RconParsers
             TempBan = "tempbanclient {0} \"{1}\""
         };
 
-        private static 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]+) *$";
+        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);
+            var response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND, command);
             return response.Skip(1).ToArray();
         }
 
@@ -61,7 +60,7 @@ namespace Application.RconParsers
             };
         }
 
-        public async Task<List<Player>> GetStatusAsync(Connection connection)
+        public async Task<List<EFClient>> GetStatusAsync(Connection connection)
         {
             string[] response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND, "status");
             return ClientsFromStatus(response);
@@ -72,14 +71,19 @@ namespace Application.RconParsers
             return (await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND, $"set {dvarName} {dvarValue}")).Length > 0;
         }
 
-        public virtual CommandPrefix GetCommandPrefixes() => Prefixes;
+        public virtual CommandPrefix GetCommandPrefixes()
-
-        private List<Player> ClientsFromStatus(string[] Status)
         {
-            List<Player> StatusPlayers = new List<Player>();
+            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)
@@ -104,25 +108,30 @@ namespace Application.RconParsers
 
                     long networkId = regex.Groups[4].Value.ConvertLong();
                     string name = regex.Groups[5].Value.StripColors().Trim();
-                    int ip = regex.Groups[7].Value.Split(':')[0].ConvertToIP();
+                    int? ip = regex.Groups[7].Value.Split(':')[0].ConvertToIP();
 
-                    Player P = new Player()
+                    var client = new EFClient()
                     {
-                        Name = name,
+                        CurrentAlias = new EFAlias()
+                        {
+                            Name = name
+                        },
                         NetworkId = networkId,
                         ClientNumber = clientNumber,
                         IPAddress = ip,
                         Ping = ping,
                         Score = score,
-                        IsBot = ip == 0
+                        IsBot = ip == null,
+                        State = EFClient.ClientState.Connecting
                     };
 
-                    if (P.IsBot)
+                    // they've not fully connected yet
+                    if (!client.IsBot && ping == 999)
                     {
-                        P.IPAddress = P.ClientNumber + 1;
+                        continue;
                     }
 
-                    StatusPlayers.Add(P);
+                    StatusPlayers.Add(client);
                 }
             }
 

Application/RconParsers/IW5MRConParser.cs

@@ -2,21 +2,20 @@
 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 System.Text;
+using SharedLibraryCore.Database.Models;
-using System.Linq;
-using System.Net.Http;
 
-namespace Application.RconParsers
+namespace IW4MAdmin.Application.RconParsers
 {
     public class IW5MRConParser : IRConParser
     {
-        private static CommandPrefix Prefixes = new CommandPrefix()
+        private static readonly CommandPrefix Prefixes = new CommandPrefix()
         {
             Tell = "tell {0} {1}",
             Say = "say {0}",
@@ -107,7 +106,7 @@ namespace Application.RconParsers
             };
         }
 
-        public async Task<List<Player>> GetStatusAsync(Connection connection)
+        public async Task<List<EFClient>> GetStatusAsync(Connection connection)
         {
             string[] response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND, "status");
             return ClientsFromStatus(response);
@@ -120,9 +119,9 @@ namespace Application.RconParsers
             return true;
         }
 
-        private List<Player> ClientsFromStatus(string[] status)
+        private List<EFClient> ClientsFromStatus(string[] status)
         {
-            List<Player> StatusPlayers = new List<Player>();
+            List<EFClient> StatusPlayers = new List<EFClient>();
 
             foreach (string statusLine in status)
             {
@@ -143,11 +142,11 @@ namespace Application.RconParsers
                     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();
+                    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 Player()
+                    var p = new EFClient()
                     {
                         Name = name,
                         NetworkId = networkId,
@@ -155,7 +154,8 @@ namespace Application.RconParsers
                         IPAddress = ipAddress,
                         Ping = Ping,
                         Score = score,
-                        IsBot = false
+                        IsBot = false,
+                        State = EFClient.ClientState.Connecting
                     };
 
                     StatusPlayers.Add(p);

Application/RconParsers/T6MRConParser.cs

@@ -9,56 +9,19 @@ using SharedLibraryCore.Objects;
 using SharedLibraryCore.RCon;
 using SharedLibraryCore.Exceptions;
 using System.Text;
-using System.Linq;
+using SharedLibraryCore.Database.Models;
-using System.Net.Http;
 
-namespace Application.RconParsers
+namespace IW4MAdmin.Application.RconParsers
 {
     public class T6MRConParser : IRConParser
     {
-        class T6MResponse
+        private static readonly CommandPrefix Prefixes = new CommandPrefix()
-        {
-            public class SInfo
-            {
-                public short Com_maxclients { get; set; }
-                public string Game { get; set; }
-                public string Gametype { get; set; }
-                public string Mapname { get; set; }
-                public short NumBots { get; set; }
-                public short NumClients { get; set; }
-                public short Round { get; set; }
-                public string Sv_hostname { get; set; }
-            }
-
-            public class PInfo
-            {
-                public short Assists { get; set; }
-                public string Clan { get; set; }
-                public short Deaths { get; set; }
-                public short Downs { get; set; }
-                public short Headshots { get; set; }
-                public short Id { get; set; }
-                public bool IsBot { get; set; }
-                public short Kills { get; set; }
-                public string Name { get; set; }
-                public short Ping { get; set; }
-                public short Revives { get; set; }
-                public int Score { get; set; }
-                public long Xuid { get; set; }
-                public string Ip { get; set; }
-            }
-
-            public SInfo Info { get; set; }
-            public PInfo[] Players { get; set; }
-        }
-
-        private static CommandPrefix Prefixes = new CommandPrefix()
         {
             Tell = "tell {0} {1}",
             Say = "say {0}",
-            Kick = "clientKick {0}",
+            Kick = "clientkick_for_reason {0} \"{1}\"",
-            Ban = "clientKick {0}",
+            Ban = "clientkick_for_reason {0} \"{1}\"",
-            TempBan = "clientKick {0}"
+            TempBan = "clientkick_for_reason {0} \"{1}\""
         };
 
         public CommandPrefix GetCommandPrefixes() => Prefixes;
@@ -73,7 +36,6 @@ namespace Application.RconParsers
         {
             string[] LineSplit = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND, $"get {dvarName}");
 
-
             if (LineSplit.Length < 2)
             {
                 var e = new DvarException($"DVAR \"{dvarName}\" does not exist");
@@ -99,12 +61,10 @@ namespace Application.RconParsers
             };
         }
 
-        public async Task<List<Player>> GetStatusAsync(Connection connection)
+        public async Task<List<EFClient>> GetStatusAsync(Connection connection)
         {
             string[] response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND, "status");
             return ClientsFromStatus(response);
-
-            //return ClientsFromResponse(connection);
         }
 
         public async Task<bool> SetDvarAsync(Connection connection, string dvarName, object dvarValue)
@@ -114,44 +74,9 @@ namespace Application.RconParsers
             return true;
         }
 
-        private async Task<List<Player>> ClientsFromResponse(Connection conn)
+        private List<EFClient> ClientsFromStatus(string[] status)
         {
-            using (var client = new HttpClient())
+            List<EFClient> StatusPlayers = new List<EFClient>();
-            {
-                client.BaseAddress = new Uri($"http://{conn.Endpoint.Address}:{conn.Endpoint.Port}/");
-
-                try
-                {
-                    var parameters = new FormUrlEncodedContent(new[]
-                    {
-                        new KeyValuePair<string, string>("rcon_password", conn.RConPassword)
-                    });
-
-                    var serverResponse = await client.PostAsync("/info", parameters);
-                    var serverResponseObject = Newtonsoft.Json.JsonConvert.DeserializeObject<T6MResponse>(await serverResponse.Content.ReadAsStringAsync());
-
-                    return serverResponseObject.Players.Select(p => new Player()
-                    {
-                        Name = p.Name,
-                        NetworkId = p.Xuid,
-                        ClientNumber = p.Id,
-                        IPAddress = p.Ip.Split(':')[0].ConvertToIP(),
-                        Ping = p.Ping,
-                        Score = p.Score,
-                        IsBot = p.IsBot,
-                    }).ToList();
-                }
-
-                catch (HttpRequestException e)
-                {
-                    throw new NetworkException(e.Message);
-                }
-            }
-        }
-
-        private List<Player> ClientsFromStatus(string[] status)
-        {
-            List<Player> StatusPlayers = new List<Player>();
 
             foreach (string statusLine in status)
             {
@@ -172,20 +97,18 @@ namespace Application.RconParsers
 #if DEBUG
                     Ping = 1;
 #endif
-                    int ipAddress = regex.Value.Split(':')[0].ConvertToIP();
+                    int? ipAddress = regex.Value.Split(':')[0].ConvertToIP();
                     regex = Regex.Match(responseLine, @"[0-9]{1,2}\s+[0-9]+\s+");
-                    int score = 0;
+                    var p = new EFClient()
-                    // todo: fix this when T6M score is valid ;)
-                    //int score = Int32.Parse(playerInfo[1]);
-                    var p = new Player()
                     {
                         Name = name,
                         NetworkId = networkId,
                         ClientNumber = clientId,
                         IPAddress = ipAddress,
                         Ping = Ping,
-                        Score = score,
+                        Score = 0,
-                        IsBot = networkId == 0
+                        State = EFClient.ClientState.Connecting,
+                        IsBot = ipAddress == null
                     };
 
                     if (p.IsBot)

Application/SharedGUIDKick.js

@@ -0,0 +1,31 @@
+var plugin = {
+    author: 'RaidMax',
+    version: 1.1,
+    name: 'Shared GUID Kicker Plugin',
+
+    onEventAsync: function (gameEvent, server) {
+        // make sure we only check for IW4(x)
+        if (server.GameName !== 2) {
+            return false;
+
+
+        }
+
+        // connect or join event
+        if (gameEvent.Type === 3) {
+             // this GUID seems to have been packed in a IW4 torrent and results in an unreasonable amount of people using the same GUID
+            if (gameEvent.Origin.NetworkId === -805366929435212061) {
+                gameEvent.Origin.Kick('Your GUID is generic. Delete players/guids.dat and rejoin', _IW4MAdminClient);
+            }
+        }
+    },
+
+    onLoadAsync: function (manager) {
+    },
+
+    onUnloadAsync: function () {
+    },
+
+    onTickAsync: function (server) {
+    }
+};

Application/VPNDetection.js

@@ -0,0 +1,62 @@
+var plugin = {
+    author: 'RaidMax',
+    version: 1.0,
+    name: 'VPN Detection Plugin',
+
+    manager: null,
+    logger: null,
+    vpnExceptionIds: [],
+
+    checkForVpn: function (origin) {
+        var exempt = false;
+        // prevent players that are exempt from being kicked
+        this.vpnExceptionIds.forEach(function (id) {
+            if (id === origin.ClientId) {
+                exempt = true;
+                return false;
+            }
+        });
+
+        if (exempt) {
+            return;
+        }
+
+        var usingVPN = false;
+
+        try {
+            var cl = new System.Net.Http.HttpClient();
+            var re = cl.GetAsync('https://api.xdefcon.com/proxy/check/?ip=' + origin.IPAddressString).Result;
+            var co = re.Content;
+            var parsedJSON = JSON.parse(co.ReadAsStringAsync().Result);
+            co.Dispose();
+            re.Dispose();
+            cl.Dispose();
+            usingVPN = parsedJSON.success && parsedJSON.proxy;
+        } catch (e) {
+            this.logger.WriteError(e.message);
+        }
+
+        if (usingVPN) {
+            this.logger.WriteInfo(origin + ' is using a VPN (' + origin.IPAddressString + ')');
+            origin.Kick(_localization.LocalizationIndex["SERVER_KICK_VPNS_NOTALLOWED"], _IW4MAdminClient);
+        }
+    },
+
+    onEventAsync: function (gameEvent, server) {
+        // connect event
+        if (gameEvent.Type === 3) {
+            this.checkForVpn(gameEvent.Origin);
+        }
+    },
+
+    onLoadAsync: function (manager) {
+        this.manager = manager;
+        this.logger = manager.GetLogger(0);
+    },
+
+    onUnloadAsync: function () {
+    },
+
+    onTickAsync: function (server) {
+    }
+};

DiscordWebhook/DiscordWebhook.py

@@ -0,0 +1,214 @@
+import requests
+import time
+import json
+import collections
+import os
+
+# the following classes model the discord webhook api parameters
+class WebhookAuthor():
+    def __init__(self, name=None, url=None, icon_url=None):
+        if name:
+            self.name = name
+        if url:
+            self.url = url
+        if icon_url:
+            self.icon_url = icon_url
+
+class WebhookField():
+    def __init__(self, name=None, value=None, inline=False):
+        if name:
+            self.name = name
+        if value:
+            self.value = value
+        if inline:
+            self.inline = inline
+
+class WebhookEmbed():
+    def __init__(self):
+        self.author = ''
+        self.title = ''
+        self.url = ''
+        self.description = ''
+        self.color = 0
+        self.fields = []
+        self.thumbnail = {}
+
+class WebhookParams():
+    def __init__(self, username=None, avatar_url=None, content=None):
+        self.username = ''
+        self.avatar_url = ''
+        self.content = ''
+        self.embeds = []
+
+    # quick way to convert all the objects to a nice json object
+    def to_json(self):
+        return json.dumps(self, default=lambda o: o.__dict__, sort_keys=True)
+
+# gets the relative link to a user's profile
+def get_client_profile(profile_id):
+    return u'{}/Client/ProfileAsync/{}'.format(base_url, profile_id)
+
+def get_client_profile_markdown(client_name, profile_id):
+    return u'[{}]({})'.format(client_name, get_client_profile(profile_id))
+
+#todo: exception handling for opening the file
+if os.getenv("DEBUG"):
+    config_file_name = 'config.dev.json'
+else:
+    config_file_name = 'config.json'
+
+with open(config_file_name) as json_config_file:
+    json_config = json.load(json_config_file)
+
+# this should be an URL to an IP or FQN to an IW4MAdmin instance
+# ie http://127.0.0.1 or http://IW4MAdmin.com
+base_url = json_config['IW4MAdminUrl']
+end_point = '/api/event'
+request_url = base_url + end_point
+# this should be the full discord webhook url
+# ie https://discordapp.com/api/webhooks/<id>/<token>
+discord_webhook_notification_url = json_config['DiscordWebhookNotificationUrl']
+discord_webhook_information_url = json_config['DiscordWebhookInformationUrl']
+# this should be the numerical id of the discord group
+# 12345678912345678
+notify_role_ids = json_config['NotifyRoleIds']
+
+def get_new_events():
+    events = []
+    response = requests.get(request_url)
+    data = response.json()
+    should_notify = False
+    
+    for event in data:
+        # commonly used event info items
+        event_type = event['eventType']['name']
+        server_name = event['ownerEntity']['name']
+
+        if event['originEntity']:
+            origin_client_name = event['originEntity']['name']
+            origin_client_id = int(event['originEntity']['id'])
+
+        if event['targetEntity']:
+            target_client_name = event['targetEntity']['name'] or ''
+            target_client_id = int(event['targetEntity']['id']) or 0
+
+        webhook_item = WebhookParams()
+        webhook_item_embed = WebhookEmbed()
+
+        #todo: the following don't need to be generated every time, as it says the same
+        webhook_item.username = 'IW4MAdmin'
+        webhook_item.avatar_url = 'https://raidmax.org/IW4MAdmin/img/iw4adminicon-3.png'
+        webhook_item_embed.color = 31436
+        webhook_item_embed.url = base_url
+        webhook_item_embed.thumbnail = { 'url' : 'https://raidmax.org/IW4MAdmin/img/iw4adminicon-3.png' }
+        webhook_item.embeds.append(webhook_item_embed)
+
+        # the server should be visible on all event types
+        server_field = WebhookField('Server', server_name)
+        webhook_item_embed.fields.append(server_field)
+
+        role_ids_string = ''
+        for id in notify_role_ids:
+            role_ids_string += '\r\n<@&{}>\r\n'.format(id)
+    
+        if event_type == 'Report':
+            report_reason = event['extraInfo']
+
+            report_reason_field = WebhookField('Reason', report_reason)
+            reported_by_field = WebhookField('By', get_client_profile_markdown(origin_client_name, origin_client_id))
+            reported_field = WebhookField('Reported Player',get_client_profile_markdown(target_client_name, target_client_id))
+
+            # add each fields to the embed
+            webhook_item_embed.title = 'Player Reported'
+            webhook_item_embed.fields.append(reported_field)
+            webhook_item_embed.fields.append(reported_by_field)
+            webhook_item_embed.fields.append(report_reason_field)
+
+            should_notify = True
+
+        elif event_type == 'Ban':
+            ban_reason = event['extraInfo']
+            ban_reason_field = WebhookField('Reason', ban_reason)
+            banned_by_field = WebhookField('By',  get_client_profile_markdown(origin_client_name, origin_client_id))
+            banned_field = WebhookField('Banned Player', get_client_profile_markdown(target_client_name, target_client_id))
+
+            # add each fields to the embed
+            webhook_item_embed.title = 'Player Banned'
+            webhook_item_embed.fields.append(banned_field)
+            webhook_item_embed.fields.append(banned_by_field)
+            webhook_item_embed.fields.append(ban_reason_field)
+
+            should_notify = True
+
+        elif event_type == 'Connect':
+            connected_field = WebhookField('Connected Player', get_client_profile_markdown(origin_client_name, origin_client_id))
+            webhook_item_embed.title = 'Player Connected'
+            webhook_item_embed.fields.append(connected_field)
+
+        elif event_type == 'Disconnect':
+            disconnected_field = WebhookField('Disconnected Player', get_client_profile_markdown(origin_client_name, origin_client_id))
+            webhook_item_embed.title = 'Player Disconnected'
+            webhook_item_embed.fields.append(disconnected_field)
+
+        elif event_type == 'Say':
+            say_client_field = WebhookField('Player', get_client_profile_markdown(origin_client_name, origin_client_id))
+            message_field = WebhookField('Message', event['extraInfo'])
+
+            webhook_item_embed.title = 'Message From Player'
+            webhook_item_embed.fields.append(say_client_field)
+            webhook_item_embed.fields.append(message_field)
+
+        #if event_type == 'ScriptKill' or event_type == 'Kill':
+        #    kill_str = '{} killed {}'.format(get_client_profile_markdown(origin_client_name, origin_client_id),
+        #                                                           get_client_profile_markdown(target_client_name, target_client_id))
+        #    killed_field = WebhookField('Kill Information', kill_str)
+        #    webhook_item_embed.title = 'Player Killed'
+        #    webhook_item_embed.fields.append(killed_field)
+
+        #todo: handle other events
+        else:
+            continue
+
+         #make sure there's at least one group to notify
+        if len(notify_role_ids) > 0:
+            # unfortunately only the content can be used to to notify members in groups
+            #embed content shows the role but doesn't notify
+            webhook_item.content = role_ids_string
+
+        events.append({'item' : webhook_item, 'notify' : should_notify})
+
+    return events
+
+# sends the data to the webhook location
+def execute_webhook(data):
+    for event in data:
+        event_json = event['item'].to_json()
+        url = None
+
+        if event['notify']:
+            url = discord_webhook_notification_url
+        else:
+            if len(discord_webhook_information_url)  > 0:
+                url = discord_webhook_information_url
+
+        if url :
+            response = requests.post(url,
+                data=event_json, 
+                headers={'Content-type' : 'application/json'})
+
+# grabs new events and executes the webhook fo each valid event
+def run():
+    failed_count = 1
+    print('starting polling for events')
+    while True:
+        try:
+            new_events = get_new_events()
+            execute_webhook(new_events)
+        except Exception as e:
+            print('failed to get new events ({})'.format(failed_count))
+            print(e)
+            failed_count += 1
+        time.sleep(5)
+
+if __name__ == "__main__":
+    run()

DiscordWebhook/DiscordWebhook.pyproj

@@ -0,0 +1,99 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>15a81d6e-7502-46ce-8530-0647a380b5f4</ProjectGuid>
+    <ProjectHome>.</ProjectHome>
+    <StartupFile>DiscordWebhook.py</StartupFile>
+    <SearchPath>
+    </SearchPath>
+    <WorkingDirectory>.</WorkingDirectory>
+    <OutputPath>.</OutputPath>
+    <Name>DiscordWebhook</Name>
+    <SuppressCollectPythonCloudServiceFiles>true</SuppressCollectPythonCloudServiceFiles>
+    <RootNamespace>DiscordWebhook</RootNamespace>
+    <InterpreterId>MSBuild|env|$(MSBuildProjectFullPath)</InterpreterId>
+    <IsWindowsApplication>False</IsWindowsApplication>
+    <LaunchProvider>Standard Python launcher</LaunchProvider>
+    <EnableNativeCodeDebugging>False</EnableNativeCodeDebugging>
+    <Environment>DEBUG=True</Environment>
+    <PublishUrl>C:\Projects\IW4M-Admin\Publish\WindowsPrerelease\DiscordWebhook</PublishUrl>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugSymbols>true</DebugSymbols>
+    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DebugSymbols>true</DebugSymbols>
+    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Prerelease' ">
+    <DebugSymbols>true</DebugSymbols>
+    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
+    <OutputPath>bin\Prerelease\</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="DiscordWebhook.py" />
+  </ItemGroup>
+  <ItemGroup>
+    <Interpreter Include="env\">
+      <Id>env</Id>
+      <Version>3.6</Version>
+      <Description>env (Python 3.6 (64-bit))</Description>
+      <InterpreterPath>Scripts\python.exe</InterpreterPath>
+      <WindowsInterpreterPath>Scripts\pythonw.exe</WindowsInterpreterPath>
+      <PathEnvironmentVariable>PYTHONPATH</PathEnvironmentVariable>
+      <Architecture>X64</Architecture>
+    </Interpreter>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="config.json">
+      <Publish>True</Publish>
+    </Content>
+    <Content Include="requirements.txt">
+      <Publish>True</Publish>
+    </Content>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.Web.targets" />
+  <!-- Uncomment the CoreCompile target to enable the Build command in
+       Visual Studio and specify your pre- and post-build commands in
+       the BeforeBuild and AfterBuild targets below. -->
+  <!--<Target Name="CoreCompile" />-->
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <AutoAssignPort>True</AutoAssignPort>
+          <UseCustomServer>True</UseCustomServer>
+          <CustomServerUrl>http://localhost</CustomServerUrl>
+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+        </WebProjectProperties>
+      </FlavorProperties>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}" User="">
+        <WebProjectProperties>
+          <StartPageUrl>
+          </StartPageUrl>
+          <StartAction>CurrentPage</StartAction>
+          <AspNetDebugging>True</AspNetDebugging>
+          <SilverlightDebugging>False</SilverlightDebugging>
+          <NativeDebugging>False</NativeDebugging>
+          <SQLDebugging>False</SQLDebugging>
+          <ExternalProgram>
+          </ExternalProgram>
+          <StartExternalURL>
+          </StartExternalURL>
+          <StartCmdLineArguments>
+          </StartCmdLineArguments>
+          <StartWorkingDirectory>
+          </StartWorkingDirectory>
+          <EnableENC>False</EnableENC>
+          <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>

DiscordWebhook/config.json

@@ -0,0 +1,6 @@
+{
+  "IW4MAdminUrl": "",
+  "DiscordWebhookNotificationUrl": "",
+  "DiscordWebhookInformationUrl": "",
+  "NotifyRoleIds": []
+}

DiscordWebhook/requirements.txt

@@ -0,0 +1,7 @@
+certifi>=2018.4.16
+chardet>=3.0.4
+idna>=2.7
+pip>=18.0
+requests>=2.19.1
+setuptools>=39.0.1
+urllib3>=1.23

GameLogServer/GameLogServer.pyproj

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>42efda12-10d3-4c40-a210-9483520116bc</ProjectGuid>
+    <ProjectHome>.</ProjectHome>
+    <ProjectTypeGuids>{789894c7-04a9-4a11-a6b5-3f4435165112};{1b580a1a-fdb3-4b32-83e1-6407eb2722e6};{349c5851-65df-11da-9384-00065b846f21};{888888a0-9f3d-457c-b088-3a5042f75d52}</ProjectTypeGuids>
+    <StartupFile>runserver.py</StartupFile>
+    <SearchPath>
+    </SearchPath>
+    <WorkingDirectory>.</WorkingDirectory>
+    <LaunchProvider>Web launcher</LaunchProvider>
+    <WebBrowserUrl>http://localhost</WebBrowserUrl>
+    <OutputPath>.</OutputPath>
+    <SuppressCollectPythonCloudServiceFiles>true</SuppressCollectPythonCloudServiceFiles>
+    <Name>GameLogServer</Name>
+    <RootNamespace>GameLogServer</RootNamespace>
+    <InterpreterId>MSBuild|env|$(MSBuildProjectFullPath)</InterpreterId>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugSymbols>true</DebugSymbols>
+    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DebugSymbols>true</DebugSymbols>
+    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Prerelease' ">
+    <DebugSymbols>true</DebugSymbols>
+    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
+    <OutputPath>bin\Prerelease\</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="GameLogServer\log_reader.py">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="GameLogServer\restart_resource.py" />
+    <Compile Include="GameLogServer\server.py">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="runserver.py" />
+    <Compile Include="GameLogServer\__init__.py" />
+    <Compile Include="GameLogServer\log_resource.py" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="GameLogServer\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="requirements.txt" />
+    <None Include="Stable.pubxml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Interpreter Include="env\">
+      <Id>env</Id>
+      <Version>3.6</Version>
+      <Description>env (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 
+       AfterBuild targets below. -->
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <AutoAssignPort>True</AutoAssignPort>
+          <UseCustomServer>True</UseCustomServer>
+          <CustomServerUrl>http://localhost</CustomServerUrl>
+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+        </WebProjectProperties>
+      </FlavorProperties>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}" User="">
+        <WebProjectProperties>
+          <StartPageUrl>
+          </StartPageUrl>
+          <StartAction>CurrentPage</StartAction>
+          <AspNetDebugging>True</AspNetDebugging>
+          <SilverlightDebugging>False</SilverlightDebugging>
+          <NativeDebugging>False</NativeDebugging>
+          <SQLDebugging>False</SQLDebugging>
+          <ExternalProgram>
+          </ExternalProgram>
+          <StartExternalURL>
+          </StartExternalURL>
+          <StartCmdLineArguments>
+          </StartCmdLineArguments>
+          <StartWorkingDirectory>
+          </StartWorkingDirectory>
+          <EnableENC>False</EnableENC>
+          <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>

GameLogServer/GameLogServer/__init__.py

@@ -0,0 +1,9 @@
+"""
+The flask application package.
+"""
+
+from flask import Flask
+from flask_restful import Api
+
+app = Flask(__name__)
+api = Api(app)

GameLogServer/GameLogServer/log_reader.py

@@ -0,0 +1,76 @@
+import re
+import os
+import time
+
+class LogReader(object):
+    def __init__(self):
+        self.log_file_sizes = {}
+        # (if the file changes more than this, ignore ) - 0.125 MB
+        self.max_file_size_change = 125000
+        # (if the time between checks is greater, ignore ) - 5 minutes
+        self.max_file_time_change = 60
+
+    def read_file(self, path):
+        # prevent traversing directories
+        if re.search('r^.+\.\.\\.+$', path):
+            return False
+        # must be a valid log path and log file
+        if not re.search(r'^.+[\\|\/](userraw|mods|main)[\\|\/].+.log$', path):
+            return False
+        # set the initialze size to the current file size
+        file_size = 0
+
+        if path not in self.log_file_sizes:
+            self.log_file_sizes[path] = { 
+                'length' : self.file_length(path),
+                'read': time.time()
+            }
+            return True
+
+        # grab the previous values
+        last_length = self.log_file_sizes[path]['length']
+        last_read = self.log_file_sizes[path]['read']
+
+        # the file is being tracked already
+        new_file_size = self.file_length(path)
+          
+        # the log size was  unable to be read (probably the wrong path)
+        if new_file_size < 0:
+            return False
+
+        now = time.time()
+    
+        file_size_difference = new_file_size - last_length
+        time_difference = now - last_read
+
+        # update the new size and actually read the data
+        self.log_file_sizes[path] = {
+            'length': new_file_size,
+            'read': now
+        }
+
+        # if it's been too long since we read and the amount changed is too great, discard it
+        # todo: do we really want old events? maybe make this an "or"
+        if file_size_difference > self.max_file_size_change or time_difference > self.max_file_time_change:
+            return True
+
+        new_log_info = self.get_file_lines(path, file_size_difference)
+        return new_log_info
+
+    def get_file_lines(self, path, length):
+        try:
+            file_handle = open(path, 'rb')
+            file_handle.seek(-length, 2)
+            file_data = file_handle.read(length)
+            file_handle.close()
+            return file_data.decode('utf-8')
+        except:
+            return False
+        
+    def file_length(self, path):
+        try:
+            return os.stat(path).st_size
+        except:
+            return -1
+
+reader = LogReader()

GameLogServer/GameLogServer/log_resource.py

@@ -0,0 +1,19 @@
+from flask_restful import Resource
+from GameLogServer.log_reader import reader
+from base64 import urlsafe_b64decode
+
+class LogResource(Resource):
+    def get(self, path):
+        path = urlsafe_b64decode(path).decode('utf-8')
+        log_info = reader.read_file(path)
+
+        if log_info is False:
+            print('could not read log file ' + path)
+
+        empty_read = (log_info == False) or (log_info == True)
+
+        return {
+            'success' : log_info is not False,
+            'length':  -1 if empty_read else len(log_info),
+            'data': log_info
+        }

GameLogServer/GameLogServer/restart_resource.py

@@ -0,0 +1,29 @@
+from flask_restful import Resource
+from flask import request
+import requests
+import os
+import subprocess
+import re
+
+def get_pid_of_server_windows(port):
+    process = subprocess.Popen('netstat -aon', shell=True, stdout=subprocess.PIPE)
+    output = process.communicate()[0]
+    matches = re.search(' *(UDP) +([0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}):'+ str(port) + ' +[^\w]*([0-9]+)', output.decode('utf-8'))
+    if matches is not None:
+        return matches.group(3)
+    else:
+        return 0
+
+class RestartResource(Resource):
+    def get(self):
+        try:
+            response = requests.get('http://' + request.remote_addr + ':1624/api/restartapproved')
+            if response.status_code == 200:
+                pid = get_pid_of_server_windows(response.json()['port'])
+                subprocess.check_output("Taskkill /PID %s /F" % pid)
+            else:
+                return {}, 400
+        except Exception as e:
+            print(e)
+            return {}, 500
+        return {}, 200

GameLogServer/GameLogServer/server.py

@@ -0,0 +1,11 @@
+from flask import Flask
+from flask_restful import Api
+from .log_resource import LogResource
+from .restart_resource import RestartResource
+
+app = Flask(__name__)
+
+def init():
+    api = Api(app)
+    api.add_resource(LogResource, '/log/<string:path>')
+    api.add_resource(RestartResource, '/restart')

GameLogServer/requirements.txt

@@ -0,0 +1,26 @@
+aniso8601==3.0.2
+APScheduler==3.5.3
+certifi==2018.10.15
+chardet==3.0.4
+click==6.7
+Flask==1.0.2
+Flask-JWT==0.3.2
+Flask-JWT-Extended==3.8.1
+Flask-RESTful==0.3.6
+idna==2.7
+itsdangerous==0.24
+Jinja2==2.10
+MarkupSafe==1.0
+marshmallow==3.0.0b8
+pip==9.0.3
+psutil==5.4.8
+pygal==2.4.0
+PyJWT==1.4.2
+pytz==2018.7
+requests==2.20.0
+setuptools==40.5.0
+six==1.11.0
+timeago==1.0.8
+tzlocal==1.5.1
+urllib3==1.24
+Werkzeug==0.14.1

GameLogServer/runserver.py

@@ -0,0 +1,15 @@
+"""
+This script runs the GameLogServer application using a development server.
+"""
+
+from os import environ
+from GameLogServer.server import app, init
+
+if __name__ == '__main__':
+    HOST = environ.get('SERVER_HOST', '0.0.0.0')
+    try:
+        PORT = int(environ.get('SERVER_PORT', '1625'))
+    except ValueError:
+        PORT = 5555
+    init()
+    app.run(HOST, PORT, debug=False)

IW4MAdmin.sln

@@ -1,4 +1,3 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26730.16
@@ -10,6 +9,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		_commands.gsc = _commands.gsc
 		_customcallbacks.gsc = _customcallbacks.gsc
 		README.md = README.md
+		RunPublishPre.cmd = RunPublishPre.cmd
+		RunPublishRelease.cmd = RunPublishRelease.cmd
 		version.txt = version.txt
 	EndProjectSection
 EndProject
@@ -31,7 +32,17 @@ Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "Master", "Master\Master.pyp
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Plugins\Tests\Tests.csproj", "{B72DEBFB-9D48-4076-8FF5-1FD72A830845}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IW4ScriptCommands", "Plugins\IW4ScriptCommands\IW4ScriptCommands.csproj", "{6C706CE5-A206-4E46-8712-F8C48D526091}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IW4ScriptCommands", "Plugins\IW4ScriptCommands\IW4ScriptCommands.csproj", "{6C706CE5-A206-4E46-8712-F8C48D526091}"
+EndProject
+Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "DiscordWebhook", "DiscordWebhook\DiscordWebhook.pyproj", "{15A81D6E-7502-46CE-8530-0647A380B5F4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ScriptPlugins", "ScriptPlugins", "{3F9ACC27-26DB-49FA-BCD2-50C54A49C9FA}"
+	ProjectSection(SolutionItems) = preProject
+		Plugins\ScriptPlugins\SharedGUIDKick.js = Plugins\ScriptPlugins\SharedGUIDKick.js
+		Plugins\ScriptPlugins\VPNDetection.js = Plugins\ScriptPlugins\VPNDetection.js
+	EndProjectSection
+EndProject
+Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "GameLogServer", "GameLogServer\GameLogServer.pyproj", "{42EFDA12-10D3-4C40-A210-9483520116BC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -287,6 +298,42 @@ Global
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|x64.Build.0 = Release|Any CPU
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|x86.ActiveCfg = Release|Any CPU
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|x86.Build.0 = Release|Any CPU
+		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Prerelease|Any CPU.ActiveCfg = Release|Any CPU
+		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Prerelease|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Prerelease|x64.ActiveCfg = Release|Any CPU
+		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Prerelease|x86.ActiveCfg = Release|Any CPU
+		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Release|x64.ActiveCfg = Release|Any CPU
+		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Release|x86.ActiveCfg = Release|Any CPU
+		{42EFDA12-10D3-4C40-A210-9483520116BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{42EFDA12-10D3-4C40-A210-9483520116BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42EFDA12-10D3-4C40-A210-9483520116BC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{42EFDA12-10D3-4C40-A210-9483520116BC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{42EFDA12-10D3-4C40-A210-9483520116BC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{42EFDA12-10D3-4C40-A210-9483520116BC}.Debug|x64.Build.0 = Debug|Any CPU
+		{42EFDA12-10D3-4C40-A210-9483520116BC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{42EFDA12-10D3-4C40-A210-9483520116BC}.Debug|x86.Build.0 = Debug|Any CPU
+		{42EFDA12-10D3-4C40-A210-9483520116BC}.Prerelease|Any CPU.ActiveCfg = Release|Any CPU
+		{42EFDA12-10D3-4C40-A210-9483520116BC}.Prerelease|Any CPU.Build.0 = Release|Any CPU
+		{42EFDA12-10D3-4C40-A210-9483520116BC}.Prerelease|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{42EFDA12-10D3-4C40-A210-9483520116BC}.Prerelease|Mixed Platforms.Build.0 = Release|Any CPU
+		{42EFDA12-10D3-4C40-A210-9483520116BC}.Prerelease|x64.ActiveCfg = Release|Any CPU
+		{42EFDA12-10D3-4C40-A210-9483520116BC}.Prerelease|x64.Build.0 = Release|Any CPU
+		{42EFDA12-10D3-4C40-A210-9483520116BC}.Prerelease|x86.ActiveCfg = Release|Any CPU
+		{42EFDA12-10D3-4C40-A210-9483520116BC}.Prerelease|x86.Build.0 = Release|Any CPU
+		{42EFDA12-10D3-4C40-A210-9483520116BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{42EFDA12-10D3-4C40-A210-9483520116BC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{42EFDA12-10D3-4C40-A210-9483520116BC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{42EFDA12-10D3-4C40-A210-9483520116BC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{42EFDA12-10D3-4C40-A210-9483520116BC}.Release|x64.ActiveCfg = Release|Any CPU
+		{42EFDA12-10D3-4C40-A210-9483520116BC}.Release|x64.Build.0 = Release|Any CPU
+		{42EFDA12-10D3-4C40-A210-9483520116BC}.Release|x86.ActiveCfg = Release|Any CPU
+		{42EFDA12-10D3-4C40-A210-9483520116BC}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -298,6 +345,7 @@ Global
 		{D9F2ED28-6FA5-40CA-9912-E7A849147AB1} = {26E8B310-269E-46D4-A612-24601F16065F}
 		{B72DEBFB-9D48-4076-8FF5-1FD72A830845} = {26E8B310-269E-46D4-A612-24601F16065F}
 		{6C706CE5-A206-4E46-8712-F8C48D526091} = {26E8B310-269E-46D4-A612-24601F16065F}
+		{3F9ACC27-26DB-49FA-BCD2-50C54A49C9FA} = {26E8B310-269E-46D4-A612-24601F16065F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {84F8F8E0-1F73-41E0-BD8D-BB6676E2EE87}

Master/Master.pyproj

@@ -17,7 +17,7 @@
     <SuppressCollectPythonCloudServiceFiles>true</SuppressCollectPythonCloudServiceFiles>
     <Name>Master</Name>
     <RootNamespace>Master</RootNamespace>
-    <InterpreterId>MSBuild|dev_env|$(MSBuildProjectFullPath)</InterpreterId>
+    <InterpreterId>MSBuild|env_master|$(MSBuildProjectFullPath)</InterpreterId>
     <IsWindowsApplication>False</IsWindowsApplication>
     <PythonRunWebServerCommand>
     </PythonRunWebServerCommand>
@@ -73,6 +73,9 @@
     <Compile Include="master\resources\null.py">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Master\resources\server.py">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="master\resources\version.py">
       <SubType>Code</SubType>
     </Compile>
@@ -108,17 +111,18 @@
     <Folder Include="master\templates\" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="FolderProfile.pubxml" />
     <Content Include="master\config\master.json" />
+    <Content Include="master\templates\serverlist.html" />
+    <None Include="Release.pubxml" />
     <Content Include="requirements.txt" />
     <Content Include="master\templates\index.html" />
     <Content Include="master\templates\layout.html" />
   </ItemGroup>
   <ItemGroup>
-    <Interpreter Include="dev_env\">
+    <Interpreter Include="env_master\">
-      <Id>dev_env</Id>
+      <Id>env_master</Id>
       <Version>3.6</Version>
-      <Description>dev_env (Python 3.6 (64-bit))</Description>
+      <Description>env_master (Python 3.6 (64-bit))</Description>
       <InterpreterPath>Scripts\python.exe</InterpreterPath>
       <WindowsInterpreterPath>Scripts\pythonw.exe</WindowsInterpreterPath>
       <PathEnvironmentVariable>PYTHONPATH</PathEnvironmentVariable>

Master/master/context/base.py

@@ -15,9 +15,9 @@ class Base():
         self.scheduler.start()
         self.scheduler.add_job(
             func=self._remove_staleinstances,
-            trigger=IntervalTrigger(seconds=120),
+            trigger=IntervalTrigger(seconds=60),
             id='stale_instance_remover',
-            name='Remove stale instances if no heartbeat in 120 seconds',
+            name='Remove stale instances if no heartbeat in 60 seconds',
             replace_existing=True
         )
         self.scheduler.add_job(
@@ -41,7 +41,7 @@ class Base():
 
     def _remove_staleinstances(self):
         for key, value in list(self.instance_list.items()):
-            if int(time.time()) - value.last_heartbeat > 120:
+            if int(time.time()) - value.last_heartbeat > 60:
                 print('[_remove_staleinstances] removing stale instance {id}'.format(id=key))
                 del self.instance_list[key]
                 del self.token_list[key]

Master/master/models/servermodel.py

@@ -1,14 +1,16 @@
 
 class ServerModel(object):
-    def __init__(self, id, port, game, hostname, clientnum, maxclientnum, map, gametype):
+    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
         self.maxclientnum = maxclientnum
         self.map = map
         self.gametype = gametype
+        self.ip = ip
 
     def __repr__(self):
         return '<ServerModel(id={id})>'.format(id=self.id)

Master/master/resources/authenticate.py

@@ -8,10 +8,11 @@ import datetime
 class Authenticate(Resource):
     def post(self):
         instance_id = request.json['id']
-        if ctx.get_token(instance_id) is not False:
+        #todo: see why this is failing
-            return { 'message' : 'that id already has a token'}, 401
+        #if ctx.get_token(instance_id) is not False:
-        else:
+        #    return { 'message' : 'that id already has a token'}, 401
-            expires = datetime.timedelta(days=1)
+        #else:
-            token = create_access_token(instance_id, expires_delta=expires)
+        expires = datetime.timedelta(days=30)
-            ctx.add_token(instance_id, token)
+        token = create_access_token(instance_id, expires_delta=expires)
-            return { 'access_token' : token }, 200
+        ctx.add_token(instance_id, token)
+        return { 'access_token' : token }, 200

Master/master/resources/instance.py

@@ -4,6 +4,7 @@ from flask_jwt_extended import jwt_required
 from marshmallow import ValidationError
 from master.schema.instanceschema import InstanceSchema
 from master import ctx
+import json
 
 class Instance(Resource):
     def get(self, id=None):
@@ -21,6 +22,11 @@ class Instance(Resource):
     @jwt_required
     def put(self, id):
         try:
+            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
@@ -30,6 +36,11 @@ class Instance(Resource):
     @jwt_required
     def post(self):
         try:
+            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/resources/server.py

@@ -0,0 +1,6 @@
+from flask_restful import Resource
+
+class Server(Resource):
+    """description of class"""
+
+

Master/master/routes.py

@@ -6,10 +6,12 @@ from master.resources.authenticate import Authenticate
 from master.resources.version import Version
 from master.resources.history_graph import HistoryGraph
 from master.resources.localization import Localization
+from master.resources.server import Server
 
 api.add_resource(Null, '/null')
 api.add_resource(Instance, '/instance/', '/instance/<string:id>')
 api.add_resource(Version, '/version')
 api.add_resource(Authenticate, '/authenticate')
 api.add_resource(HistoryGraph, '/history/', '/history/<int:history_count>')
-api.add_resource(Localization, '/localization/', '/localization/<string:language_tag>')
+api.add_resource(Localization, '/localization/', '/localization/<string:language_tag>')
+api.add_resource(Server, '/server')

Master/master/schema/serverschema.py

@@ -4,19 +4,26 @@ from master.models.servermodel import ServerModel
 class ServerSchema(Schema):
     id = fields.Int(
         required=True,
-        validate=validate.Range(1, 2147483647, 'invalid id')
+        validate=validate.Range(1, 25525525525565535, 'invalid id')
+    )
+    ip = fields.Str(
+        required=True
     )
     port = fields.Int(
         required=True,
-        validate=validate.Range(1, 665535, 'invalid port')
+        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, 8, 'invalid game name')
+        validate=validate.Length(1, 5, 'invalid game name')
     )
     hostname = fields.String(
         required=True,
-        validate=validate.Length(1, 48, 'invalid hostname')
+        validate=validate.Length(1, 64, 'invalid hostname')
     )
     clientnum = fields.Int(
         required=True,

Master/master/templates/layout.html

@@ -39,6 +39,7 @@
     <script src="https://code.jquery.com/jquery-3.3.1.min.js"
             integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8="
             crossorigin="anonymous"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
     {% block scripts %}{% endblock %}
 </body>
 </html>

Master/master/templates/serverlist.html

@@ -0,0 +1,113 @@
+{% extends "layout.html" %}
+
+{% block content %}
+<!-- todo: move this! -->
+<style>
+    .server-row {
+        cursor: pointer;
+    }
+
+    .modal-content, .nav-item {
+        background-color: #212529;
+        color: #fff;
+    }
+
+    .modal-header, .modal-footer {
+        border-color: #32383e !important;
+    }
+
+    .modal-dark button.close, a.nav-link {
+        color: #fff;
+    }
+</style>
+
+<div class="modal modal-dark" id="serverModalCenter" tabindex="-1" role="dialog" aria-labelledby="serverModalCenterTitle" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="serverModalTitle">Modal title</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class="h5" id="server_socket"></div>
+            </div>
+            <div class="modal-footer">
+                <button id="connect_button" type="button" class="btn btn-dark">Connect</button>
+                <button type="button" class="btn btn-dark" data-dismiss="modal">Close</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-12">
+        <nav>
+            <div class="nav nav-tabs" id="server_game_tabs" role="tablist">
+                {% for game in games %}
+                <a class="nav-item nav-link {{'active' if loop.first else ''}}" id="{{game}}_servers_tab" data-toggle="tab" href="#{{game}}_servers" role="tab" aria-controls="{{game}}_servers" aria-selected="{{'true' if loop.first else 'false' }}">{{game}}</a>
+                {% endfor %}
+            </div>
+        </nav>
+        <div class="tab-content" id="server_game_tabs_content">
+            {% for game, servers in games.items() %}
+
+            <div class="tab-pane {{'show active' if loop.first else ''}}" id="{{game}}_servers" role="tabpanel" aria-labelledby="{{game}}_servers_tab">
+
+                <table class="table table-dark table-striped table-hover table-responsive-lg">
+                    <thead>
+                        <tr>
+                            <th>Server Name</th>
+                            <th>Map Name</th>
+                            <th>Players</th>
+                            <th>Mode</th>
+                            <th class="text-center">Connect</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+
+                        {% for server in servers %}
+
+                        <tr class="server-row" data-toggle="modal" data-target="#serverModalCenter"
+                            data-ip="{{server.ip}}" data-port="{{server.port}}">
+                            <td data-hostname="{{server.hostname}}" class="server-hostname">{{server.hostname}}</td>
+                            <td data-map="{{server.map}} " class="server-map">{{server.map}}</td>
+                            <td data-clientnum="{{server.clientnum}}" data-maxclientnum="{{server.maxclientnum}}"
+                                class="server-clientnum">
+                                {{server.clientnum}}/{{server.maxclientnum}}
+                            </td>
+                            <td data-gametype="{{server.gametype}}" class="server-gametype">{{server.gametype}}</td>
+                            <td class="text-center"><span class="oi oi-play-circle"></span></td>
+                        </tr>
+
+                        {% endfor %}
+
+                    </tbody>
+                </table>
+            </div>
+
+            {% endfor %}
+        </div>
+        <div class="w-100 small text-right  text-muted">
+            <span>Developed by RaidMax</span><br />
+            <span>PRERELEASE</span>
+        </div>
+    </div>
+</div>
+    {% endblock %}
+
+    {% block scripts %}
+<script>
+    $(document).ready(() => {
+        $('.server-row').off('click');
+        $('.server-row').on('click', function (e) {
+            $('#serverModalTitle').text($(this).find('.server-hostname').text());
+            $('#server_socket').text(`/connect ${$(this).data('ip')}:${$(this).data('port')}`);
+        });
+
+        $('#connect_button').off('click');
+        $('#connect_button').on('click', (e) => alert('soon...'));
+    });
+</script>
+    {% endblock %}

Master/master/views.py

@@ -4,8 +4,9 @@ Routes and views for the flask application.
 
 from datetime import datetime
 from flask import render_template
-from master import app
+from master import app, ctx
 from master.resources.history_graph import HistoryGraph
+from collections import defaultdict
 
 @app.route('/')
 def home():
@@ -19,3 +20,16 @@ def home():
         client_count = _history_graph[0]['client_count'],
         server_count = _history_graph[0]['server_count']
     )
+
+@app.route('/servers')
+def servers():
+    servers = defaultdict(list)
+    if len(ctx.instance_list.values()) > 0:
+        ungrouped_servers = [server for instance  in  ctx.instance_list.values() for server in instance.servers]
+        for server in ungrouped_servers:
+            servers[server.game].append(server)
+    return render_template(
+        'serverlist.html',
+        title = 'Server List',
+        games = servers
+    )

Master/requirements.txt

@@ -1,16 +1,26 @@
-aniso8601==3.0.0
+aniso8601==3.0.2
+APScheduler==3.5.3
+certifi==2018.10.15
+chardet==3.0.4
 click==6.7
-Flask==0.12.2
+Flask==1.0.2
 Flask-JWT==0.3.2
 Flask-JWT-Extended==3.8.1
 Flask-RESTful==0.3.6
+idna==2.7
 itsdangerous==0.24
 Jinja2==2.10
 MarkupSafe==1.0
 marshmallow==3.0.0b8
-pip==9.0.1
+pip==9.0.3
+psutil==5.4.8
+pygal==2.4.0
 PyJWT==1.4.2
-pytz==2018.4
+pytz==2018.7
-setuptools==39.0.1
+requests==2.20.0
+setuptools==40.5.0
 six==1.11.0
+timeago==1.0.8
+tzlocal==1.5.1
+urllib3==1.24
 Werkzeug==0.14.1

Plugins/IW4ScriptCommands/CommandInfo.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace IW4ScriptCommands
+{
+    class CommandInfo
+    {
+        public string Command { get; set; }
+        public int ClientNumber { get; set; }
+        public List<string> CommandArguments { get; set; } = new List<string>();
+        public override string ToString() => $"{Command};{ClientNumber},{string.Join(',', CommandArguments)}";
+    }
+}

Plugins/IW4ScriptCommands/Commands/Balance.cs

@@ -1,19 +1,200 @@
 using SharedLibraryCore;
+using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Objects;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 
 namespace IW4ScriptCommands.Commands
 {
-    class Balance : Command
+    class Balance
     {
-        public Balance() : base("balance", "balance teams", "bal", Player.Permission.Trusted, false, null)
+        private class TeamAssignment
         {
+            public IW4MAdmin.Plugins.Stats.IW4Info.Team CurrentTeam { get; set; }
+            public int Num { get; set; }
+            public IW4MAdmin.Plugins.Stats.Models.EFClientStatistics Stats { get; set; }
         }
 
-        public override async Task ExecuteAsync(GameEvent E)
+        public static string GetTeamAssignments(EFClient client, bool isDisconnect, Server server, string teamsString = "")
         {
-            await E.Owner.ExecuteCommandAsync("sv_iw4madmin_command balance");
+            var scriptClientTeams = teamsString.Split(';', StringSplitOptions.RemoveEmptyEntries)
-            await E.Origin.Tell("Balance command sent");
+                .Select(c => c.Split(','))
+                .Select(c => new TeamAssignment()
+                {
+                    CurrentTeam = (IW4MAdmin.Plugins.Stats.IW4Info.Team)Enum.Parse(typeof(IW4MAdmin.Plugins.Stats.IW4Info.Team), c[1]),
+                    Num = server.GetClientsAsList().FirstOrDefault(p => p.ClientNumber == Int32.Parse(c[0]))?.ClientNumber ?? -1,
+                    Stats = IW4MAdmin.Plugins.Stats.Plugin.Manager.GetClientStats(server.Clients.FirstOrDefault(p => p.ClientNumber == Int32.Parse(c[0])).ClientId, server.EndPoint)
+                })
+                .ToList();
+
+            // at least one team is full so we can't balance
+            if (scriptClientTeams.Count(ct => ct.CurrentTeam == IW4MAdmin.Plugins.Stats.IW4Info.Team.Axis) >= Math.Floor(server.MaxClients / 2.0)
+                || scriptClientTeams.Count(ct => ct.CurrentTeam == IW4MAdmin.Plugins.Stats.IW4Info.Team.Allies) >= Math.Floor(server.MaxClients / 2.0))
+            {
+                // E.Origin?.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_BALANCE_FAIL"]);
+                return string.Empty;
+            }
+
+            List<string> teamAssignments = new List<string>();
+
+            var _c = server.GetClientsAsList();
+            if (isDisconnect && client != null)
+            {
+                _c = _c.Where(c => c.ClientNumber != client.ClientNumber).ToList();
+            }
+
+            var activeClients = _c.Select(c => new TeamAssignment()
+            {
+                Num = c.ClientNumber,
+                Stats = IW4MAdmin.Plugins.Stats.Plugin.Manager.GetClientStats(c.ClientId, server.EndPoint),
+                CurrentTeam = IW4MAdmin.Plugins.Stats.Plugin.Manager.GetClientStats(c.ClientId, server.EndPoint).Team
+            })
+            .Where(c => scriptClientTeams.FirstOrDefault(sc => sc.Num == c.Num)?.CurrentTeam != IW4MAdmin.Plugins.Stats.IW4Info.Team.Spectator)
+            .Where(c => c.CurrentTeam != scriptClientTeams.FirstOrDefault(p => p.Num == c.Num)?.CurrentTeam)
+            .OrderByDescending(c => c.Stats.Performance)
+            .ToList();
+
+            var alliesTeam = scriptClientTeams
+                .Where(c => c.CurrentTeam == IW4MAdmin.Plugins.Stats.IW4Info.Team.Allies)
+                .Where(c => activeClients.Count(t => t.Num == c.Num) == 0)
+                .ToList();
+
+            var axisTeam = scriptClientTeams
+                .Where(c => c.CurrentTeam == IW4MAdmin.Plugins.Stats.IW4Info.Team.Axis)
+                .Where(c => activeClients.Count(t => t.Num == c.Num) == 0)
+                .ToList();
+
+            while (activeClients.Count() > 0)
+            {
+                int teamSizeDifference = alliesTeam.Count - axisTeam.Count;
+                double performanceDisparity = alliesTeam.Count > 0 ? alliesTeam.Average(t => t.Stats.Performance) : 0 -
+                    axisTeam.Count > 0 ? axisTeam.Average(t => t.Stats.Performance) : 0;
+
+                if (teamSizeDifference == 0)
+                {
+                    if (performanceDisparity == 0)
+                    {
+                        alliesTeam.Add(activeClients.First());
+                        activeClients.RemoveAt(0);
+                    }
+                    else
+                    {
+                        if (performanceDisparity > 0)
+                        {
+                            axisTeam.Add(activeClients.First());
+                            activeClients.RemoveAt(0);
+                        }
+                        else
+                        {
+                            alliesTeam.Add(activeClients.First());
+                            activeClients.RemoveAt(0);
+                        }
+                    }
+                }
+                else if (teamSizeDifference > 0)
+                {
+                    if (performanceDisparity > 0)
+                    {
+                        axisTeam.Add(activeClients.First());
+                        activeClients.RemoveAt(0);
+                    }
+
+                    else
+                    {
+                        axisTeam.Add(activeClients.Last());
+                        activeClients.RemoveAt(activeClients.Count - 1);
+                    }
+                }
+                else
+                {
+                    if (performanceDisparity > 0)
+                    {
+                        alliesTeam.Add(activeClients.First());
+                        activeClients.RemoveAt(0);
+                    }
+
+                    else
+                    {
+                        alliesTeam.Add(activeClients.Last());
+                        activeClients.RemoveAt(activeClients.Count - 1);
+                    }
+                }
+            }
+
+            alliesTeam = alliesTeam.OrderByDescending(t => t.Stats.Performance)
+                .ToList();
+
+            axisTeam = axisTeam.OrderByDescending(t => t.Stats.Performance)
+                .ToList();
+
+            while (Math.Abs(alliesTeam.Count - axisTeam.Count) > 1)
+            {
+                int teamSizeDifference = alliesTeam.Count - axisTeam.Count;
+                double performanceDisparity = alliesTeam.Count > 0 ? alliesTeam.Average(t => t.Stats.Performance) : 0 -
+                    axisTeam.Count > 0 ? axisTeam.Average(t => t.Stats.Performance) : 0;
+
+                if (teamSizeDifference > 0)
+                {
+                    if (performanceDisparity > 0)
+                    {
+                        axisTeam.Add(alliesTeam.First());
+                        alliesTeam.RemoveAt(0);
+                    }
+
+                    else
+                    {
+                        axisTeam.Add(alliesTeam.Last());
+                        alliesTeam.RemoveAt(axisTeam.Count - 1);
+                    }
+                }
+
+                else
+                {
+                    if (performanceDisparity > 0)
+                    {
+                        alliesTeam.Add(axisTeam.Last());
+                        axisTeam.RemoveAt(axisTeam.Count - 1);
+                    }
+
+                    else
+                    {
+                        alliesTeam.Add(axisTeam.First());
+                        axisTeam.RemoveAt(0);
+                    }
+                }
+            }
+
+            foreach (var assignment in alliesTeam)
+            {
+                teamAssignments.Add($"{assignment.Num},2");
+                assignment.Stats.Team = IW4MAdmin.Plugins.Stats.IW4Info.Team.Allies;
+            }
+
+            foreach (var assignment in axisTeam)
+            {
+                teamAssignments.Add($"{assignment.Num},3");
+                assignment.Stats.Team = IW4MAdmin.Plugins.Stats.IW4Info.Team.Axis;
+            }
+
+            //if (alliesTeam.Count(ac => scriptClientTeams.First(sc => sc.Num == ac.Num).CurrentTeam != ac.CurrentTeam) == 0 &&
+            //    axisTeam.Count(ac => scriptClientTeams.First(sc => sc.Num == ac.Num).CurrentTeam != ac.CurrentTeam) == 0)
+            //{
+            //    //E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_BALANCE_FAIL_BALANCED"]);
+            //    return string.Empty;
+            //}
+
+            //if (E.Origin?.Level > Player.Permission.Administrator)
+            //{
+            //    E.Origin.Tell($"Allies Elo: {(alliesTeam.Count > 0 ? alliesTeam.Average(t => t.Stats.Performance) : 0)}");
+            //    E.Origin.Tell($"Axis Elo: {(axisTeam.Count > 0 ? axisTeam.Average(t => t.Stats.Performance) : 0)}");
+            //}
+
+            //E.Origin.Tell("Balance command sent");
+            string args = string.Join(",", teamAssignments);
+            return args;
         }
     }
 }

Plugins/IW4ScriptCommands/GscApiController.cs

@@ -0,0 +1,54 @@
+using IW4ScriptCommands.Commands;
+using Microsoft.AspNetCore.Mvc;
+using SharedLibraryCore;
+using SharedLibraryCore.Objects;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WebfrontCore.Controllers.API
+{
+    [Route("api/gsc/[action]")]
+    public class GscApiController : ApiController
+    {
+        [HttpGet("{networkId}")]
+        public IActionResult ClientInfo(string networkId)
+        {
+            var clientInfo = Manager.GetActiveClients()
+                .FirstOrDefault(c => c.NetworkId == networkId.ConvertLong());
+
+            if (clientInfo != null)
+            {
+                var sb = new StringBuilder();
+                sb.AppendLine($"admin={clientInfo.IsPrivileged()}");
+                sb.AppendLine($"level={(int)clientInfo.Level}");
+                sb.AppendLine($"levelstring={clientInfo.Level.ToLocalizedLevelName()}");
+                sb.AppendLine($"connections={clientInfo.Connections}");
+                sb.AppendLine($"authenticated={clientInfo.GetAdditionalProperty<bool>("IsLoggedIn") == true}");
+
+                return Content(sb.ToString());
+            }
+
+            return Content("");
+        }
+
+        [HttpGet("{networkId}")]
+        public IActionResult GetTeamAssignments(string networkId, int serverId, string teams = "", bool isDisconnect = false)
+        {
+            return Unauthorized();
+
+            var client = Manager.GetActiveClients()
+                .FirstOrDefault(c => c.NetworkId == networkId.ConvertLong());
+
+            var server = Manager.GetServers().First(c => c.EndPoint == serverId);
+
+            teams = teams ?? string.Empty;
+
+            string assignments = Balance.GetTeamAssignments(client,  isDisconnect, server, teams);
+
+            return Content(assignments);
+        }
+    }
+}

Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj

@@ -1,10 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <RuntimeFrameworkVersion>2.1.5</RuntimeFrameworkVersion>
     <ApplicationIcon />
     <StartupObject />
+    <Configurations>Debug;Release;Prerelease</Configurations>
   </PropertyGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
@@ -13,10 +15,11 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\SharedLibraryCore\SharedLibraryCore.csproj" />
+    <ProjectReference Include="..\Stats\Stats.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.NETCore.App" Version="2.0.7" />
+    <PackageReference Update="Microsoft.NETCore.App" Version="2.1.5" />
   </ItemGroup>
 
 </Project>

Plugins/IW4ScriptCommands/Plugin.cs

@@ -15,7 +15,30 @@ namespace IW4ScriptCommands
 
         public string Author => "RaidMax";
 
-        public Task OnEventAsync(GameEvent E, Server S) => Task.CompletedTask;
+        public Task OnEventAsync(GameEvent E, Server S)
+        {
+            if (E.Type == GameEvent.EventType.Start)
+            {
+                return S.SetDvarAsync("sv_iw4madmin_serverid", S.EndPoint);
+            }
+
+            if (E.Type == GameEvent.EventType.Warn)
+            {
+                return S.SetDvarAsync("sv_iw4madmin_command", new CommandInfo()
+                {
+                    ClientNumber = E.Target.ClientNumber,
+                    Command = "alert",
+                    CommandArguments = new List<string>()
+                    {
+                        "Warning",
+                        "ui_mp_nukebomb_timer",
+                        E.Data
+                    }
+                }.ToString());
+            }
+
+            return Task.CompletedTask;
+        }
 
         public Task OnLoadAsync(IManager manager) => Task.CompletedTask;
 

Plugins/Login/Commands/CLogin.cs

@@ -1,4 +1,5 @@
 using SharedLibraryCore;
+using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Objects;
 using System;
 using System.Collections.Generic;
@@ -8,14 +9,15 @@ namespace IW4MAdmin.Plugins.Login.Commands
 {
     public class CLogin : Command
     {
-        public CLogin() : base("login", Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_LOGIN_COMMANDS_LOGIN_DESC"], "li", Player.Permission.Trusted, false, new CommandArgument[]
+        public CLogin() : base("login", Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_LOGIN_COMMANDS_LOGIN_DESC"], "li", EFClient.Permission.Trusted, false, new CommandArgument[]
         {
             new CommandArgument()
             {
                 Name = Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_ARGS_PASSWORD"],
                 Required = true
             }
-        }){ }
+        })
+        { }
 
         public override async Task ExecuteAsync(GameEvent E)
         {
@@ -25,12 +27,12 @@ namespace IW4MAdmin.Plugins.Login.Commands
             if (hashedPassword[0] == client.Password)
             {
                 Plugin.AuthorizedClients[E.Origin.ClientId] = true;
-                await E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_LOGIN_COMMANDS_LOGIN_SUCCESS"]);
+                E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_LOGIN_COMMANDS_LOGIN_SUCCESS"]);
             }
 
             else
             {
-                await E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_LOGIN_COMMANDS_LOGIN_FAIL"]);
+                E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_LOGIN_COMMANDS_LOGIN_FAIL"]);
             }
         }
     }

Plugins/Login/Login.csproj

@@ -1,8 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <RuntimeFrameworkVersion>2.1.5</RuntimeFrameworkVersion>
     <ApplicationIcon />
     <StartupObject />
     <PackageId>RaidMax.IW4MAdmin.Plugins.Login</PackageId>
@@ -21,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.NETCore.App" Version="2.0.7" />
+    <PackageReference Update="Microsoft.NETCore.App" Version="2.1.5" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/Login/Plugin.cs

@@ -3,6 +3,7 @@ using System.Reflection;
 using System.Threading.Tasks;
 using SharedLibraryCore;
 using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Exceptions;
 using SharedLibraryCore.Interfaces;
 using SharedLibraryCore.Objects;
@@ -28,6 +29,7 @@ namespace IW4MAdmin.Plugins.Login
             if (E.Type == GameEvent.EventType.Connect)
             {
                 AuthorizedClients.TryAdd(E.Origin.ClientId, false);
+                E.Origin.SetAdditionalProperty("IsLoggedIn", false);
             }
 
             if (E.Type == GameEvent.EventType.Disconnect)
@@ -37,11 +39,11 @@ namespace IW4MAdmin.Plugins.Login
 
             if (E.Type == GameEvent.EventType.Command)
             {
-                if (E.Origin.Level < Player.Permission.Moderator ||
+                if (E.Origin.Level < EFClient.Permission.Moderator ||
-                    E.Origin.Level == Player.Permission.Console)
+                    E.Origin.Level == EFClient.Permission.Console)
                     return Task.CompletedTask;
 
-                E.Owner.Manager.GetPrivilegedClients().TryGetValue(E.Origin.ClientId, out Player client);
+                E.Owner.Manager.GetPrivilegedClients().TryGetValue(E.Origin.ClientId, out EFClient client);
 
                 if (((Command)E.Extra).Name == new SharedLibraryCore.Commands.CSetPassword().Name &&
                     client?.Password == null)
@@ -51,7 +53,14 @@ namespace IW4MAdmin.Plugins.Login
                     return Task.CompletedTask;
 
                 if (!AuthorizedClients[E.Origin.ClientId])
+                {
                     throw new AuthorizationException(Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_LOGIN_AUTH"]);
+                }
+
+                else
+                {
+                    E.Origin.SetAdditionalProperty("IsLoggedIn", true);
+                }
             }
 
             return Task.CompletedTask;

Plugins/ProfanityDeterment/Configuration.cs

@@ -16,9 +16,9 @@ namespace IW4MAdmin.Plugins.ProfanityDeterment
         {
             OffensiveWords = new List<string>()
             {
-                "nigger",
+                @"\s*n+.*i+.*g+.*e+.*r+\s*",
-                "nigga",
+                @"\s*n+.*i+.*g+.*a+\s*",
-                "fuck"
+                @"\s*f+u+.*c+.*k+.*\s*"
             };
 
             var loc = Utilities.CurrentLocalization.LocalizationIndex;

Plugins/ProfanityDeterment/Plugin.cs

@@ -1,9 +1,11 @@
 using System.Collections.Concurrent;
 using System.Linq;
 using System.Reflection;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using SharedLibraryCore;
 using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Interfaces;
 using SharedLibraryCore.Objects;
 
@@ -21,10 +23,10 @@ namespace IW4MAdmin.Plugins.ProfanityDeterment
         ConcurrentDictionary<int, Tracking> ProfanityCounts;
         IManager Manager;
 
-        public async Task OnEventAsync(GameEvent E, Server S)
+        public Task OnEventAsync(GameEvent E, Server S)
         {
             if (!Settings.Configuration().EnableProfanityDeterment)
-                return;
+                return Task.CompletedTask;
 
             if (E.Type == GameEvent.EventType.Connect)
             {
@@ -36,11 +38,21 @@ namespace IW4MAdmin.Plugins.ProfanityDeterment
                 var objectionalWords = Settings.Configuration().OffensiveWords;
                 bool containsObjectionalWord = objectionalWords.FirstOrDefault(w => E.Origin.Name.ToLower().Contains(w)) != null;
 
+                // we want to run regex against it just incase
+                if (!containsObjectionalWord)
+                {
+                    foreach (string word in objectionalWords)
+                    {
+                        containsObjectionalWord |= Regex.IsMatch(E.Origin.Name.ToLower(), word, RegexOptions.IgnoreCase);
+                    }
+                }
+
                 if (containsObjectionalWord)
                 {
-                    await E.Origin.Kick(Settings.Configuration().ProfanityKickMessage, new Player()
+                    E.Origin.Kick(Settings.Configuration().ProfanityKickMessage, new EFClient()
                     {
-                        ClientId = 1
+                        ClientId = 1,
+                        CurrentServer = E.Owner
                     });
                 };
             }
@@ -56,30 +68,36 @@ namespace IW4MAdmin.Plugins.ProfanityDeterment
             if (E.Type == GameEvent.EventType.Say)
             {
                 var objectionalWords = Settings.Configuration().OffensiveWords;
-                bool containsObjectionalWord = objectionalWords.FirstOrDefault(w => E.Data.ToLower().Contains(w)) != null;
+                bool containsObjectionalWord = false;
+
+                foreach (string word in objectionalWords)
+                {
+                    containsObjectionalWord |= Regex.IsMatch(E.Data.ToLower(), word, RegexOptions.IgnoreCase);
+
+                    // break out early because there's at least one objectional word
+                    if (containsObjectionalWord)
+                    {
+                        break;
+                    }
+                }
 
                 if (containsObjectionalWord)
                 {
                     var clientProfanity = ProfanityCounts[E.Origin.ClientId];
                     if (clientProfanity.Infringements >= Settings.Configuration().KickAfterInfringementCount)
                     {
-                        await clientProfanity.Client.Kick(Settings.Configuration().ProfanityKickMessage, new Player()
+                        clientProfanity.Client.Kick(Settings.Configuration().ProfanityKickMessage, Utilities.IW4MAdminClient(E.Owner));
-                        {
-                            ClientId = 1
-                        });
                     }
 
                     else if (clientProfanity.Infringements < Settings.Configuration().KickAfterInfringementCount)
                     {
                         clientProfanity.Infringements++;
 
-                        await clientProfanity.Client.Warn(Settings.Configuration().ProfanityWarningMessage, new Player()
+                        clientProfanity.Client.Warn(Settings.Configuration().ProfanityWarningMessage, Utilities.IW4MAdminClient(E.Owner));
-                        {
-                            ClientId = 1
-                        });
                     }
                 }
             }
+            return Task.CompletedTask;
         }
 
         public async Task OnLoadAsync(IManager manager)

Plugins/ProfanityDeterment/ProfanityDeterment.csproj

@@ -1,8 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <RuntimeFrameworkVersion>2.1.5</RuntimeFrameworkVersion>
     <ApplicationIcon />
     <StartupObject />
     <PackageId>RaidMax.IW4MAdmin.Plugins.ProfanityDeterment</PackageId>
@@ -19,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.NETCore.App" Version="2.0.7" />
+    <PackageReference Update="Microsoft.NETCore.App" Version="2.1.5" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/ProfanityDeterment/Tracking.cs

@@ -1,16 +1,17 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Objects;
 
 namespace IW4MAdmin.Plugins.ProfanityDeterment
 {
     class Tracking
     {
-        public Player Client { get; private set; }
+        public EFClient Client { get; private set; }
         public int Infringements { get; set; }
 
-        public Tracking(Player client)
+        public Tracking(EFClient client)
         {
             Client = client;
             Infringements = 0;

Plugins/ScriptPlugins/SharedGUIDKick.js

@@ -0,0 +1,29 @@
+var plugin = {
+    author: 'RaidMax',
+    version: 1.1,
+    name: 'Shared GUID Kicker Plugin',
+
+    onEventAsync: function (gameEvent, server) {
+        // make sure we only check for IW4(x)
+        if (server.GameName !== 2) {
+            return false;
+        }
+
+        // connect or join event
+        if (gameEvent.Type === 3) {
+             // this GUID seems to have been packed in a IW4 torrent and results in an unreasonable amount of people using the same GUID
+            if (gameEvent.Origin.NetworkId === -805366929435212061) {
+                gameEvent.Origin.Kick('Your GUID is generic. Delete players/guids.dat and rejoin', _IW4MAdminClient);
+            }
+        }
+    },
+
+    onLoadAsync: function (manager) {
+    },
+
+    onUnloadAsync: function () {
+    },
+
+    onTickAsync: function (server) {
+    }
+};

Plugins/ScriptPlugins/VPNDetection.js

@@ -0,0 +1,62 @@
+var plugin = {
+    author: 'RaidMax',
+    version: 1.0,
+    name: 'VPN Detection Plugin',
+
+    manager: null,
+    logger: null,
+    vpnExceptionIds: [],
+
+    checkForVpn: function (origin) {
+        var exempt = false;
+        // prevent players that are exempt from being kicked
+        this.vpnExceptionIds.forEach(function (id) {
+            if (id === origin.ClientId) {
+                exempt = true;
+                return false;
+            }
+        });
+
+        if (exempt) {
+            return;
+        }
+
+        var usingVPN = false;
+
+        try {
+            var cl = new System.Net.Http.HttpClient();
+            var re = cl.GetAsync('https://api.xdefcon.com/proxy/check/?ip=' + origin.IPAddressString).Result;
+            var co = re.Content;
+            var parsedJSON = JSON.parse(co.ReadAsStringAsync().Result);
+            co.Dispose();
+            re.Dispose();
+            cl.Dispose();
+            usingVPN = parsedJSON.success && parsedJSON.proxy;
+        } catch (e) {
+            this.logger.WriteError(e.message);
+        }
+
+        if (usingVPN) {
+            this.logger.WriteInfo(origin + ' is using a VPN (' + origin.IPAddressString + ')');
+            origin.Kick(_localization.LocalizationIndex["SERVER_KICK_VPNS_NOTALLOWED"], _IW4MAdminClient);
+        }
+    },
+
+    onEventAsync: function (gameEvent, server) {
+        // connect event
+        if (gameEvent.Type === 3) {
+            this.checkForVpn(gameEvent.Origin);
+        }
+    },
+
+    onLoadAsync: function (manager) {
+        this.manager = manager;
+        this.logger = manager.GetLogger(0);
+    },
+
+    onUnloadAsync: function () {
+    },
+
+    onTickAsync: function (server) {
+    }
+};

Plugins/Stats/Cheat/Detection.cs

@@ -1,7 +1,7 @@
-using SharedLibraryCore.Helpers;
+using IW4MAdmin.Plugins.Stats.Models;
+using SharedLibraryCore.Helpers;
 using SharedLibraryCore.Interfaces;
 using SharedLibraryCore.Objects;
-using IW4MAdmin.Plugins.Stats.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -19,78 +19,88 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
             Strain
         };
 
+        public ChangeTracking<EFACSnapshot> Tracker { get; private set; }
+        public const int QUEUE_COUNT = 10;
+
+        public List<EFClientKill> QueuedHits { get; set; }
         int Kills;
         int HitCount;
         Dictionary<IW4Info.HitLocation, int> HitLocationCount;
-        ChangeTracking Tracker;
         double AngleDifferenceAverage;
         EFClientStatistics ClientStats;
-        DateTime LastHit;
         long LastOffset;
+        IW4Info.WeaponName LastWeapon;
         ILogger Log;
         Strain Strain;
+        readonly DateTime ConnectionTime = DateTime.UtcNow;
 
         public Detection(ILogger log, EFClientStatistics clientStats)
         {
             Log = log;
             HitLocationCount = new Dictionary<IW4Info.HitLocation, int>();
             foreach (var loc in Enum.GetValues(typeof(IW4Info.HitLocation)))
+            {
                 HitLocationCount.Add((IW4Info.HitLocation)loc, 0);
+            }
+
             ClientStats = clientStats;
             Strain = new Strain();
-            Tracker = new ChangeTracking();
+            Tracker = new ChangeTracking<EFACSnapshot>();
+            QueuedHits = new List<EFClientKill>();
         }
 
         /// <summary>
         /// Analyze kill and see if performed by a cheater
         /// </summary>
-        /// <param name="kill">kill performed by the player</param>
+        /// <param name="hit">kill performed by the player</param>
         /// <returns>true if detection reached thresholds, false otherwise</returns>
-        public DetectionPenaltyResult ProcessKill(EFClientKill kill, bool isDamage)
+        public DetectionPenaltyResult ProcessHit(EFClientKill hit, bool isDamage)
         {
-            if ((kill.DeathType != IW4Info.MeansOfDeath.MOD_PISTOL_BULLET &&
+            if ((hit.DeathType != IW4Info.MeansOfDeath.MOD_PISTOL_BULLET &&
-                kill.DeathType != IW4Info.MeansOfDeath.MOD_RIFLE_BULLET &&
+                hit.DeathType != IW4Info.MeansOfDeath.MOD_RIFLE_BULLET &&
-                kill.DeathType != IW4Info.MeansOfDeath.MOD_HEAD_SHOT) ||
+                hit.DeathType != IW4Info.MeansOfDeath.MOD_HEAD_SHOT) ||
-                kill.HitLoc == IW4Info.HitLocation.none)
+                hit.HitLoc == IW4Info.HitLocation.none || hit.TimeOffset - LastOffset < 0 ||
+                // hack: prevents false positives
+                (LastWeapon != hit.Weapon && (hit.TimeOffset - LastOffset) == 50))
+            {
                 return new DetectionPenaltyResult()
                 {
                     ClientPenalty = Penalty.PenaltyType.Any,
                 };
+            }
 
             DetectionPenaltyResult result = null;
+            LastWeapon = hit.Weapon;
 
-            if (LastHit == DateTime.MinValue)
+            HitLocationCount[hit.HitLoc]++;
-                LastHit = DateTime.UtcNow;
+            HitCount++;
 
-            HitLocationCount[kill.HitLoc]++;
             if (!isDamage)
             {
                 Kills++;
             }
 
-            HitCount++;
-
             #region VIEWANGLES   
-            if (kill.AnglesList.Count >= 2)
+            if (hit.AnglesList.Count >= 2)
             {
-                double realAgainstPredict = Vector3.ViewAngleDistance(kill.AnglesList[0], kill.AnglesList[1], kill.ViewAngles);
+                double realAgainstPredict = Vector3.ViewAngleDistance(hit.AnglesList[0], hit.AnglesList[1], hit.ViewAngles);
 
                 // LIFETIME
                 var hitLoc = ClientStats.HitLocations
-                    .First(hl => hl.Location == kill.HitLoc);
+                    .First(hl => hl.Location == hit.HitLoc);
 
                 float previousAverage = hitLoc.HitOffsetAverage;
                 double newAverage = (previousAverage * (hitLoc.HitCount - 1) + realAgainstPredict) / hitLoc.HitCount;
                 hitLoc.HitOffsetAverage = (float)newAverage;
 
-                if (hitLoc.HitOffsetAverage > Thresholds.MaxOffset &&
+                if (hitLoc.HitOffsetAverage > Thresholds.MaxOffset(hitLoc.HitCount) &&
                     hitLoc.HitCount > 100)
                 {
-                    Log.WriteDebug("*** Reached Max Lifetime Average for Angle Difference ***");
+                    //Log.WriteDebug("*** Reached Max Lifetime Average for Angle Difference ***");
-                    Log.WriteDebug($"Lifetime Average = {newAverage}");
+                    //Log.WriteDebug($"Lifetime Average = {newAverage}");
-                    Log.WriteDebug($"Bone = {hitLoc.Location}");
+                    //Log.WriteDebug($"Bone = {hitLoc.Location}");
-                    Log.WriteDebug($"HitCount = {hitLoc.HitCount}");
+                    //Log.WriteDebug($"HitCount = {hitLoc.HitCount}");
-                    Log.WriteDebug($"ID = {kill.AttackerId}");
+                    //Log.WriteDebug($"ID = {hit.AttackerId}");
 
                     result = new DetectionPenaltyResult()
                     {
@@ -105,13 +115,13 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
                 double sessAverage = (AngleDifferenceAverage * (HitCount - 1) + realAgainstPredict) / HitCount;
                 AngleDifferenceAverage = sessAverage;
 
-                if (sessAverage > Thresholds.MaxOffset &&
+                if (sessAverage > Thresholds.MaxOffset(HitCount) &&
                     HitCount > 30)
                 {
-                    Log.WriteDebug("*** Reached Max Session Average for Angle Difference ***");
+                    //Log.WriteDebug("*** Reached Max Session Average for Angle Difference ***");
-                    Log.WriteDebug($"Session Average = {sessAverage}");
+                    //Log.WriteDebug($"Session Average = {sessAverage}");
-                    Log.WriteDebug($"HitCount = {HitCount}");
+                    //Log.WriteDebug($"HitCount = {HitCount}");
-                    Log.WriteDebug($"ID = {kill.AttackerId}");
+                    //Log.WriteDebug($"ID = {hit.AttackerId}");
 
                     result = new DetectionPenaltyResult()
                     {
@@ -128,9 +138,11 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
 #endif
             }
 
-            double currentStrain = Strain.GetStrain(isDamage, kill.Damage, kill.Distance / 0.0254, kill.ViewAngles, Math.Max(50, kill.TimeOffset - LastOffset));
+            double currentStrain = Strain.GetStrain(isDamage, hit.Damage, hit.Distance / 0.0254, hit.ViewAngles, Math.Max(50, hit.TimeOffset - LastOffset));
-            //double currentWeightedStrain = (currentStrain * ClientStats.SPM) / 170.0;
+#if DEBUG == true
-            LastOffset = kill.TimeOffset;
+            Log.WriteDebug($"Current Strain: {currentStrain}");
+#endif
+            LastOffset = hit.TimeOffset;
 
             if (currentStrain > ClientStats.MaxStrain)
             {
@@ -150,7 +162,8 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
             }
 
             // ban
-            if (currentStrain > Thresholds.MaxStrainBan)
+            if (currentStrain > Thresholds.MaxStrainBan &&
+                HitCount >= 5)
             {
                 result = new DetectionPenaltyResult()
                 {
@@ -160,11 +173,6 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
                     Type = DetectionType.Strain
                 };
             }
-
-#if DEBUG
-            Log.WriteDebug($"Current Strain: {currentStrain}");
-#endif
-
             #endregion
 
             #region SESSION_RATIOS
@@ -174,7 +182,7 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
                 // determine what the max headshot percentage can be for current number of kills
                 double lerpAmount = Math.Min(1.0, (HitCount - Thresholds.LowSampleMinKills) / (double)(/*Thresholds.HighSampleMinKills*/ 60 - Thresholds.LowSampleMinKills));
                 double maxHeadshotLerpValueForFlag = Thresholds.Lerp(Thresholds.HeadshotRatioThresholdLowSample(2.0), Thresholds.HeadshotRatioThresholdHighSample(2.0), lerpAmount) + marginOfError;
-                double maxHeadshotLerpValueForBan = Thresholds.Lerp(Thresholds.HeadshotRatioThresholdLowSample(3.0), Thresholds.HeadshotRatioThresholdHighSample(3.0), lerpAmount) + marginOfError;
+                double maxHeadshotLerpValueForBan = Thresholds.Lerp(Thresholds.HeadshotRatioThresholdLowSample(3.5), Thresholds.HeadshotRatioThresholdHighSample(3.5), lerpAmount) + marginOfError;
                 //  determine what the max bone percentage can be for current number of kills
                 double maxBoneRatioLerpValueForFlag = Thresholds.Lerp(Thresholds.BoneRatioThresholdLowSample(2.25), Thresholds.BoneRatioThresholdHighSample(2.25), lerpAmount) + marginOfError;
                 double maxBoneRatioLerpValueForBan = Thresholds.Lerp(Thresholds.BoneRatioThresholdLowSample(3.25), Thresholds.BoneRatioThresholdHighSample(3.25), lerpAmount) + marginOfError;
@@ -191,16 +199,19 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
                 if (currentHeadshotRatio > maxHeadshotLerpValueForFlag)
                 {
                     // ban on headshot
-                    if (currentHeadshotRatio > maxHeadshotLerpValueForFlag)
+                    if (currentHeadshotRatio > maxHeadshotLerpValueForBan)
                     {
                         Log.WriteDebug("**Maximum Headshot Ratio Reached For Ban**");
-                        Log.WriteDebug($"ClientId: {kill.AttackerId}");
+                        Log.WriteDebug($"ClientId: {hit.AttackerId}");
                         Log.WriteDebug($"**HitCount: {HitCount}");
                         Log.WriteDebug($"**Ratio {currentHeadshotRatio}");
                         Log.WriteDebug($"**MaxRatio {maxHeadshotLerpValueForFlag}");
                         var sb = new StringBuilder();
                         foreach (var kvp in HitLocationCount)
+                        {
                             sb.Append($"HitLocation: {kvp.Key} -> {kvp.Value}\r\n");
+                        }
+
                         Log.WriteDebug(sb.ToString());
 
                         result = new DetectionPenaltyResult()
@@ -215,13 +226,16 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
                     else
                     {
                         Log.WriteDebug("**Maximum Headshot Ratio Reached For Flag**");
-                        Log.WriteDebug($"ClientId: {kill.AttackerId}");
+                        Log.WriteDebug($"ClientId: {hit.AttackerId}");
                         Log.WriteDebug($"**HitCount: {HitCount}");
                         Log.WriteDebug($"**Ratio {currentHeadshotRatio}");
                         Log.WriteDebug($"**MaxRatio {maxHeadshotLerpValueForFlag}");
                         var sb = new StringBuilder();
                         foreach (var kvp in HitLocationCount)
+                        {
                             sb.Append($"HitLocation: {kvp.Key} -> {kvp.Value}\r\n");
+                        }
+
                         Log.WriteDebug(sb.ToString());
 
                         result = new DetectionPenaltyResult()
@@ -244,13 +258,16 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
                     if (currentMaxBoneRatio > maxBoneRatioLerpValueForBan)
                     {
                         Log.WriteDebug("**Maximum Bone Ratio Reached For Ban**");
-                        Log.WriteDebug($"ClientId: {kill.AttackerId}");
+                        Log.WriteDebug($"ClientId: {hit.AttackerId}");
                         Log.WriteDebug($"**HitCount: {HitCount}");
                         Log.WriteDebug($"**Ratio {currentMaxBoneRatio}");
                         Log.WriteDebug($"**MaxRatio {maxBoneRatioLerpValueForBan}");
                         var sb = new StringBuilder();
                         foreach (var kvp in HitLocationCount)
+                        {
                             sb.Append($"HitLocation: {kvp.Key} -> {kvp.Value}\r\n");
+                        }
+
                         Log.WriteDebug(sb.ToString());
 
                         result = new DetectionPenaltyResult()
@@ -265,13 +282,16 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
                     else
                     {
                         Log.WriteDebug("**Maximum Bone Ratio Reached For Flag**");
-                        Log.WriteDebug($"ClientId: {kill.AttackerId}");
+                        Log.WriteDebug($"ClientId: {hit.AttackerId}");
                         Log.WriteDebug($"**HitCount: {HitCount}");
                         Log.WriteDebug($"**Ratio {currentMaxBoneRatio}");
                         Log.WriteDebug($"**MaxRatio {maxBoneRatioLerpValueForFlag}");
                         var sb = new StringBuilder();
                         foreach (var kvp in HitLocationCount)
+                        {
                             sb.Append($"HitLocation: {kvp.Key} -> {kvp.Value}\r\n");
+                        }
+
                         Log.WriteDebug(sb.ToString());
 
                         result = new DetectionPenaltyResult()
@@ -305,15 +325,15 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
 
                     if (currentChestAbdomenRatio > chestAbdomenLerpValueForBan && chestHits >= Thresholds.MediumSampleMinKills + 30)
                     {
-                        Log.WriteDebug("**Maximum Chest/Abdomen Ratio Reached For Ban**");
+                        //Log.WriteDebug("**Maximum Chest/Abdomen Ratio Reached For Ban**");
-                        Log.WriteDebug($"ClientId: {kill.AttackerId}");
+                        //Log.WriteDebug($"ClientId: {hit.AttackerId}");
-                        Log.WriteDebug($"**Chest Hits: {chestHits}");
+                        //Log.WriteDebug($"**Chest Hits: {chestHits}");
-                        Log.WriteDebug($"**Ratio {currentChestAbdomenRatio}");
+                        //Log.WriteDebug($"**Ratio {currentChestAbdomenRatio}");
-                        Log.WriteDebug($"**MaxRatio {chestAbdomenLerpValueForBan}");
+                        //Log.WriteDebug($"**MaxRatio {chestAbdomenLerpValueForBan}");
-                        var sb = new StringBuilder();
+                        //var sb = new StringBuilder();
-                        foreach (var kvp in HitLocationCount)
+                        //foreach (var kvp in HitLocationCount)
-                            sb.Append($"HitLocation: {kvp.Key} -> {kvp.Value}\r\n");
+                        //    sb.Append($"HitLocation: {kvp.Key} -> {kvp.Value}\r\n");
-                        Log.WriteDebug(sb.ToString());
+                        //Log.WriteDebug(sb.ToString());
 
                         result = new DetectionPenaltyResult()
                         {
@@ -326,16 +346,15 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
                     }
                     else
                     {
-                        Log.WriteDebug("**Maximum Chest/Abdomen Ratio Reached For Flag**");
+                        //Log.WriteDebug("**Maximum Chest/Abdomen Ratio Reached For Flag**");
-                        Log.WriteDebug($"ClientId: {kill.AttackerId}");
+                        //Log.WriteDebug($"ClientId: {hit.AttackerId}");
-                        Log.WriteDebug($"**Chest Hits: {chestHits}");
+                        //Log.WriteDebug($"**Chest Hits: {chestHits}");
-                        Log.WriteDebug($"**Ratio {currentChestAbdomenRatio}");
+                        //Log.WriteDebug($"**Ratio {currentChestAbdomenRatio}");
-                        Log.WriteDebug($"**MaxRatio {chestAbdomenRatioLerpValueForFlag}");
+                        //Log.WriteDebug($"**MaxRatio {chestAbdomenRatioLerpValueForFlag}");
-                        var sb = new StringBuilder();
+                        //var sb = new StringBuilder();
-                        foreach (var kvp in HitLocationCount)
+                        //foreach (var kvp in HitLocationCount)
-                            sb.Append($"HitLocation: {kvp.Key} -> {kvp.Value}\r\n");
+                        //    sb.Append($"HitLocation: {kvp.Key} -> {kvp.Value}\r\n");
-                        Log.WriteDebug(sb.ToString());
+                        //Log.WriteDebug(sb.ToString());
-                        // Log.WriteDebug($"ThresholdReached: {AboveThresholdCount}");
 
                         result = new DetectionPenaltyResult()
                         {
@@ -351,16 +370,34 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
             #endregion
             #endregion
 
-            Tracker.OnChange(new DetectionTracking(ClientStats, kill, Strain));
+            Tracker.OnChange(new EFACSnapshot()
-
-            if (result != null)
             {
-                foreach (string change in Tracker.GetChanges())
+                When = hit.When,
-                {
+                ClientId = ClientStats.ClientId,
-                    Log.WriteDebug(change);
+                SessionAngleOffset = AngleDifferenceAverage,
-                    Log.WriteDebug("--------------SNAPSHOT END-----------");
+                CurrentSessionLength = (int)(DateTime.UtcNow - ConnectionTime).TotalSeconds,
-                }
+                CurrentStrain = currentStrain,
-            }
+                CurrentViewAngle = hit.ViewAngles,
+                Hits = HitCount,
+                Kills = Kills,
+                Deaths = ClientStats.SessionDeaths,
+                HitDestinationId = hit.DeathOrigin.Vector3Id,
+                HitDestination = hit.DeathOrigin,
+                HitOriginId = hit.KillOrigin.Vector3Id,
+                HitOrigin = hit.KillOrigin,
+                EloRating = ClientStats.EloRating,
+                HitLocation = hit.HitLoc,
+                LastStrainAngle = Strain.LastAngle,
+                PredictedViewAngles = hit.AnglesList,
+                // this is in "meters"
+                Distance = hit.Distance,
+                SessionScore = ClientStats.SessionScore,
+                HitType = hit.DeathType,
+                SessionSPM = ClientStats.SessionSPM,
+                StrainAngleBetween = Strain.LastDistance,
+                TimeSinceLastEvent = (int)Strain.LastDeltaTime,
+                WeaponId = hit.Weapon
+            });
 
             return result ?? new DetectionPenaltyResult()
             {
@@ -388,15 +425,15 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
 
                     if (currentChestAbdomenRatio > chestAbdomenLerpValueForBan)
                     {
-                        Log.WriteDebug("**Maximum Lifetime Chest/Abdomen Ratio Reached For Ban**");
+                        //Log.WriteDebug("**Maximum Lifetime Chest/Abdomen Ratio Reached For Ban**");
-                        Log.WriteDebug($"ClientId: {stats.ClientId}");
+                        //Log.WriteDebug($"ClientId: {stats.ClientId}");
-                        Log.WriteDebug($"**Total Chest Hits: {totalChestHits}");
+                        //Log.WriteDebug($"**Total Chest Hits: {totalChestHits}");
-                        Log.WriteDebug($"**Ratio {currentChestAbdomenRatio}");
+                        //Log.WriteDebug($"**Ratio {currentChestAbdomenRatio}");
-                        Log.WriteDebug($"**MaxRatio {chestAbdomenLerpValueForBan}");
+                        //Log.WriteDebug($"**MaxRatio {chestAbdomenLerpValueForBan}");
-                        var sb = new StringBuilder();
+                        //var sb = new StringBuilder();
-                        foreach (var location in stats.HitLocations)
+                        //foreach (var location in stats.HitLocations)
-                            sb.Append($"HitLocation: {location.Location} -> {location.HitCount}\r\n");
+                        //    sb.Append($"HitLocation: {location.Location} -> {location.HitCount}\r\n");
-                        Log.WriteDebug(sb.ToString());
+                        //Log.WriteDebug(sb.ToString());
 
                         return new DetectionPenaltyResult()
                         {
@@ -409,15 +446,15 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
                     }
                     else
                     {
-                        Log.WriteDebug("**Maximum Lifetime Chest/Abdomen Ratio Reached For Flag**");
+                        //Log.WriteDebug("**Maximum Lifetime Chest/Abdomen Ratio Reached For Flag**");
-                        Log.WriteDebug($"ClientId: {stats.ClientId}");
+                        //Log.WriteDebug($"ClientId: {stats.ClientId}");
-                        Log.WriteDebug($"**Total Chest Hits: {totalChestHits}");
+                        //Log.WriteDebug($"**Total Chest Hits: {totalChestHits}");
-                        Log.WriteDebug($"**Ratio {currentChestAbdomenRatio}");
+                        //Log.WriteDebug($"**Ratio {currentChestAbdomenRatio}");
-                        Log.WriteDebug($"**MaxRatio {chestAbdomenRatioLerpValueForFlag}");
+                        //Log.WriteDebug($"**MaxRatio {chestAbdomenRatioLerpValueForFlag}");
-                        var sb = new StringBuilder();
+                        //var sb = new StringBuilder();
-                        foreach (var location in stats.HitLocations)
+                        //foreach (var location in stats.HitLocations)
-                            sb.Append($"HitLocation: {location.Location} -> {location.HitCount}\r\n");
+                        //    sb.Append($"HitLocation: {location.Location} -> {location.HitCount}\r\n");
-                        Log.WriteDebug(sb.ToString());
+                        //Log.WriteDebug(sb.ToString());
 
                         return new DetectionPenaltyResult()
                         {

Plugins/Stats/Cheat/DetectionPenaltyResult.cs

@@ -1,9 +1,4 @@
 using SharedLibraryCore.Objects;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace IW4MAdmin.Plugins.Stats.Cheat
 {

Plugins/Stats/Cheat/DetectionTracking.cs

@@ -1,57 +0,0 @@
-using IW4MAdmin.Plugins.Stats.Cheat;
-using IW4MAdmin.Plugins.Stats.Models;
-using SharedLibraryCore.Interfaces;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace IW4MAdmin.Plugins.Stats.Cheat
-{
-    class DetectionTracking : ITrackable
-    {
-        EFClientStatistics Stats;
-        EFClientKill Hit;
-        Strain Strain;
-
-        public DetectionTracking(EFClientStatistics stats, EFClientKill hit, Strain strain)
-        {
-            Stats = stats;
-            Hit = hit;
-            Strain = strain;
-        }
-
-        public string GetTrackableValue()
-        {
-            var sb = new StringBuilder();
-            sb.AppendLine($"SPM = {Stats.SPM}");
-            sb.AppendLine($"KDR = {Stats.KDR}");
-            sb.AppendLine($"Kills = {Stats.Kills}");
-            sb.AppendLine($"Session Score = {Stats.SessionScore}");
-            sb.AppendLine($"Elo = {Stats.EloRating}");
-            sb.AppendLine($"Max Sess Strain = {Stats.MaxSessionStrain}");
-            sb.AppendLine($"MaxStrain = {Stats.MaxStrain}");
-            sb.AppendLine($"Avg Offset = {Stats.AverageHitOffset}");
-            sb.AppendLine($"TimePlayed, {Stats.TimePlayed}");
-            sb.AppendLine($"HitDamage = {Hit.Damage}");
-            sb.AppendLine($"HitOrigin = {Hit.KillOrigin}");
-            sb.AppendLine($"DeathOrigin = {Hit.DeathOrigin}");
-            sb.AppendLine($"ViewAngles = {Hit.ViewAngles}");
-            sb.AppendLine($"WeaponId = {Hit.Weapon.ToString()}");
-            sb.AppendLine($"Timeoffset = {Hit.TimeOffset}");
-            sb.AppendLine($"HitLocation = {Hit.HitLoc.ToString()}");
-            sb.AppendLine($"Distance = {Hit.Distance / 0.0254}");
-            sb.AppendLine($"HitType = {Hit.DeathType.ToString()}");
-            int i = 0;
-            foreach (var predictedAngle in Hit.AnglesList)
-            {
-                sb.AppendLine($"Predicted Angle [{i}] {predictedAngle}");
-                i++;
-            }
-            sb.AppendLine(Strain.GetTrackableValue());
-            sb.AppendLine($"VictimId = {Hit.VictimId}");
-            sb.AppendLine($"AttackerId = {Hit.AttackerId}");
-            return sb.ToString();
-
-        }
-    }
-}

Plugins/Stats/Cheat/Strain.cs

@@ -6,15 +6,13 @@ using System.Text;
 
 namespace IW4MAdmin.Plugins.Stats.Cheat
 {
-    class Strain : ITrackable
+    class Strain
     {
-        private const  double StrainDecayBase = 0.9;
+        private const double StrainDecayBase = 0.9;
         private double CurrentStrain;
-        private Vector3 LastAngle;
+        public double LastDistance { get; private set; }
-        private double LastDeltaTime;
+        public Vector3 LastAngle { get; private set; }
-        private double LastDistance;
+        public double LastDeltaTime { get; private set; }
-
-        public int TimesReachedMaxStrain { get; private set; }
 
         public double GetStrain(bool isDamage, int damage, double killDistance, Vector3 newAngle, double deltaTime)
         {
@@ -25,14 +23,15 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
 
             double decayFactor = GetDecay(deltaTime);
             CurrentStrain *= decayFactor;
-
-#if DEBUG
-            Console.WriteLine($"Decay Factor = {decayFactor} ");
-#endif
-
             double[] distance = Helpers.Extensions.AngleStuff(newAngle, LastAngle);
             LastDistance = distance[0] + distance[1];
 
+#if DEBUG == true
+            Console.WriteLine($"Angle Between = {LastDistance}");
+            Console.WriteLine($"Distance From Target = {killDistance}");
+            Console.WriteLine($"Time Offset = {deltaTime}");
+            Console.WriteLine($"Decay Factor = {decayFactor} ");
+#endif
             // this happens on first kill
             if ((distance[0] == 0 && distance[1] == 0) ||
                 deltaTime == 0 ||
@@ -41,23 +40,15 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
                 return CurrentStrain;
             }
 
-            double newStrain = Math.Pow(distance[0] + distance[1], 0.99) / deltaTime;
+            double newStrain = Math.Pow(LastDistance, 0.99) / deltaTime;
             newStrain *= killDistance / 1000.0;
 
             CurrentStrain += newStrain;
 
-            if (CurrentStrain > Thresholds.MaxStrainBan)
-                TimesReachedMaxStrain++;
-
             LastAngle = newAngle;
             return CurrentStrain;
         }
 
-        public string GetTrackableValue()
-        {
-            return $"Strain =  {CurrentStrain}\r\n, Angle = {LastAngle}\r\n, Delta Time = {LastDeltaTime}\r\n, Angle Between = {LastDistance}";
-        }
-
         private double GetDecay(double deltaTime) => Math.Pow(StrainDecayBase, Math.Pow(2.0, deltaTime / 250.0) / 1000.0);
     }
 }

Plugins/Stats/Cheat/Thresholds.cs

@@ -27,8 +27,9 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
         public const int HighSampleMinKills = 100;
         public const double KillTimeThreshold = 0.2;
 
-        public const double MaxStrainBan = 0.4;
+        public const double MaxStrainBan = 0.9;
-        public const double MaxOffset = 1.2;
+
+        public static double MaxOffset(int sampleSize) => Math.Exp(Math.Max(-3.07 + (-3.07 / Math.Sqrt(sampleSize)), -3.07 - (-3.07 / Math.Sqrt(sampleSize))) + 4 * (0.869));
         public const double MaxStrainFlag = 0.36;
 
         public static double GetMarginOfError(int numKills) => 1.6455 / Math.Sqrt(numKills);

Plugins/Stats/Commands/MostPlayed.cs

@@ -8,6 +8,8 @@ using SharedLibraryCore.Objects;
 using IW4MAdmin.Plugins.Stats.Models;
 using SharedLibraryCore.Database;
 using System.Collections.Generic;
+using SharedLibraryCore.Database.Models;
+using IW4MAdmin.Plugins.Stats.Helpers;
 
 namespace IW4MAdmin.Plugins.Stats.Commands
 {
@@ -15,7 +17,8 @@ namespace IW4MAdmin.Plugins.Stats.Commands
     {
         public static async Task<List<string>> GetMostPlayed(Server s)
         {
-            int serverId = s.GetHashCode();
+            long serverId = await StatManager.GetIdForServer(s);
+
             List<string> mostPlayed = new List<string>()
             {
                 $"^5--{Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_STATS_COMMANDS_MOSTPLAYED_TEXT"]}--"
@@ -34,7 +37,7 @@ namespace IW4MAdmin.Plugins.Stats.Commands
                                join alias in db.Aliases
                                on client.CurrentAliasId equals alias.AliasId
                                where stats.ServerId == serverId
-                               where client.Level != Player.Permission.Banned
+                               where client.Level != EFClient.Permission.Banned
                                where client.LastConnection >= thirtyDaysAgo
                                orderby stats.Kills descending
                                select new
@@ -55,7 +58,7 @@ namespace IW4MAdmin.Plugins.Stats.Commands
             return mostPlayed;
         }
 
-        public MostPlayed() : base("mostplayed", Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_STATS_COMMANDS_MOSTPLAYED_DESC"], "mp", Player.Permission.User, false) { }
+        public MostPlayed() : base("mostplayed", Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_STATS_COMMANDS_MOSTPLAYED_DESC"], "mp", EFClient.Permission.User, false) { }
 
         public override async Task ExecuteAsync(GameEvent E)
         {
@@ -63,12 +66,16 @@ namespace IW4MAdmin.Plugins.Stats.Commands
             if (!E.Message.IsBroadcastCommand())
             {
                 foreach (var stat in topStats)
-                    await E.Origin.Tell(stat);
+                {
+                    E.Origin.Tell(stat);
+                }
             }
             else
             {
                 foreach (var stat in topStats)
-                    await E.Owner.Broadcast(stat);
+                {
+                    E.Owner.Broadcast(stat);
+                }
             }
         }
     }

Plugins/Stats/Commands/ResetStats.cs

@@ -1,45 +1,52 @@
-using SharedLibraryCore;
+using IW4MAdmin.Plugins.Stats.Models;
-using SharedLibraryCore.Objects;
+using Microsoft.EntityFrameworkCore;
-using IW4MAdmin.Plugins.Stats.Models;
+using SharedLibraryCore;
-using System;
+using SharedLibraryCore.Database;
-using System.Collections.Generic;
+using SharedLibraryCore.Database.Models;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace IW4MAdmin.Plugins.Stats.Commands
 {
     public class ResetStats : Command
     {
-        public ResetStats() : base("resetstats", Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_STATS_COMMANDS_RESET_DESC"], "rs", Player.Permission.User, false) { }
+        public ResetStats() : base("resetstats", Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_STATS_COMMANDS_RESET_DESC"], "rs", EFClient.Permission.User, false) { }
 
         public override async Task ExecuteAsync(GameEvent E)
         {
             if (E.Origin.ClientNumber >= 0)
             {
-                var svc = new SharedLibraryCore.Services.GenericRepository<EFClientStatistics>();
-                int serverId = E.Owner.GetHashCode();
-                var stats = svc.Find(s => s.ClientId == E.Origin.ClientId && s.ServerId == serverId).First();
 
-                stats.Deaths = 0;
+                long serverId = await Helpers.StatManager.GetIdForServer(E.Owner);
-                stats.Kills = 0;
-                stats.SPM = 0.0;
-                stats.Skill = 0.0;
-                stats.TimePlayed = 0;
-                // todo: make this more dynamic
-                stats.EloRating = 200.0;
 
-                // reset the cached version
+                EFClientStatistics clientStats;
-                Plugin.Manager.ResetStats(E.Origin.ClientId, E.Owner.GetHashCode());
+                using (var ctx = new DatabaseContext(disableTracking: true))
+                {
+                    clientStats = await ctx.Set<EFClientStatistics>()
+                        .Where(s => s.ClientId == E.Origin.ClientId)
+                        .Where(s => s.ServerId == serverId)
+                        .FirstAsync();
 
-                // fixme: this doesn't work properly when another context exists
+                    clientStats.Deaths = 0;
-                await svc.SaveChangesAsync();
+                    clientStats.Kills = 0;
-                await E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_STATS_COMMANDS_RESET_SUCCESS"]);
+                    clientStats.SPM = 0.0;
+                    clientStats.Skill = 0.0;
+                    clientStats.TimePlayed = 0;
+                    // todo: make this more dynamic
+                    clientStats.EloRating = 200.0;
+
+                    // reset the cached version
+                    Plugin.Manager.ResetStats(E.Origin.ClientId, serverId);
+
+                    // fixme: this doesn't work properly when another context exists
+                    await ctx.SaveChangesAsync();
+                }
+                E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_STATS_COMMANDS_RESET_SUCCESS"]);
             }
 
             else
             {
-                await E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_STATS_COMMANDS_RESET_FAIL"]);
+                E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_STATS_COMMANDS_RESET_FAIL"]);
             }
         }
     }

Plugins/Stats/Commands/TopStats.cs

@@ -9,26 +9,24 @@ using SharedLibraryCore.Services;
 using IW4MAdmin.Plugins.Stats.Models;
 using SharedLibraryCore.Database;
 using System.Collections.Generic;
+using SharedLibraryCore.Database.Models;
+using IW4MAdmin.Plugins.Stats.Helpers;
 
 namespace IW4MAdmin.Plugins.Stats.Commands
 {
     class TopStats : Command
     {
-
         public static async Task<List<string>> GetTopStats(Server s)
         {
-            int serverId = s.GetHashCode();
+            long serverId = await StatManager.GetIdForServer(s); 
             List<string> topStatsText = new List<string>()
             {
                 $"^5--{Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_STATS_COMMANDS_TOP_TEXT"]}--"
             };
 
-            using (var db = new DatabaseContext())
+            using (var db = new DatabaseContext(true))
             {
-                db.ChangeTracker.AutoDetectChangesEnabled = false;
+                var fifteenDaysAgo = DateTime.UtcNow.AddDays(-15);
-                db.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking;
-
-                var thirtyDaysAgo = DateTime.UtcNow.AddMonths(-1);
 
                 var iqStats = (from stats in db.Set<EFClientStatistics>()
                                join client in db.Clients
@@ -36,9 +34,9 @@ namespace IW4MAdmin.Plugins.Stats.Commands
                                join alias in db.Aliases
                                on client.CurrentAliasId equals alias.AliasId
                                where stats.ServerId == serverId
-                               where stats.TimePlayed >= 3600
+                               where stats.TimePlayed >= Plugin.Config.Configuration().TopPlayersMinPlayTime
-                               where client.Level != Player.Permission.Banned
+                               where client.Level != EFClient.Permission.Banned
-                               where client.LastConnection >= thirtyDaysAgo
+                               where client.LastConnection >= fifteenDaysAgo
                                orderby stats.Performance descending
                                select new
                                {
@@ -48,6 +46,10 @@ namespace IW4MAdmin.Plugins.Stats.Commands
                                })
                               .Take(5);
 
+#if DEBUG == true
+                var statsSql = iqStats.ToSql();
+#endif
+
                 var statsList = (await iqStats.ToListAsync())
                     .Select(stats => $"^3{stats.Name}^7 - ^5{stats.KDR} ^7{Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_STATS_TEXT_KDR"]} | ^5{stats.Performance} ^7{Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_STATS_COMMANDS_PERFORMANCE"]}");
 
@@ -66,7 +68,7 @@ namespace IW4MAdmin.Plugins.Stats.Commands
             return topStatsText;
         }
 
-        public TopStats() : base("topstats", Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_STATS_COMMANDS_TOP_DESC"], "ts", Player.Permission.User, false) { }
+        public TopStats() : base("topstats", Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_STATS_COMMANDS_TOP_DESC"], "ts", EFClient.Permission.User, false) { }
 
         public override async Task ExecuteAsync(GameEvent E)
         {
@@ -74,12 +76,17 @@ namespace IW4MAdmin.Plugins.Stats.Commands
             if (!E.Message.IsBroadcastCommand())
             {
                 foreach (var stat in topStats)
-                    await E.Origin.Tell(stat);
+                {
+                    E.Origin.Tell(stat);
+
+                }
             }
             else
             {
                 foreach (var stat in topStats)
-                    await E.Owner.Broadcast(stat);
+                {
+                    E.Owner.Broadcast(stat);
+                }
             }
         }
     }

Plugins/Stats/Commands/ViewStats.cs

@@ -7,12 +7,16 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using SharedLibraryCore.Database;
+using Microsoft.EntityFrameworkCore;
+using IW4MAdmin.Plugins.Stats.Helpers;
+using SharedLibraryCore.Database.Models;
 
 namespace IW4MAdmin.Plugins.Stats.Commands
 {
     public class CViewStats : Command
     {
-        public CViewStats() : base("stats", Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_STATS_COMMANDS_VIEW_DESC"], "xlrstats", Player.Permission.User, false, new CommandArgument[]
+        public CViewStats() : base("stats", Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_STATS_COMMANDS_VIEW_DESC"], "xlrstats", EFClient.Permission.User, false, new CommandArgument[]
             {
                 new CommandArgument()
                 {
@@ -26,54 +30,57 @@ namespace IW4MAdmin.Plugins.Stats.Commands
         {
             var loc = Utilities.CurrentLocalization.LocalizationIndex;
 
-            /*if (E.Target?.ClientNumber < 0)
-            {
-                await E.Origin.Tell(loc["PLUGINS_STATS_COMMANDS_VIEW_FAIL_INGAME"]);
-                return;
-            }
-
-            if (E.Origin.ClientNumber < 0 && E.Target == null)
-            {
-                await E.Origin.Tell(loc["PLUGINS_STATS_COMMANDS_VIEW_FAIL_INGAME_SELF"]);
-                return;
-            }*/
-
             String statLine;
             EFClientStatistics pStats;
 
             if (E.Data.Length > 0 && E.Target == null)
             {
-                await E.Origin.Tell(loc["PLUGINS_STATS_COMMANDS_VIEW_FAIL"]);
+                E.Target = E.Owner.GetClientByName(E.Data).FirstOrDefault();
-                return;
+
+                if (E.Target == null)
+                {
+                    E.Origin.Tell(loc["PLUGINS_STATS_COMMANDS_VIEW_FAIL"]);
+                }
             }
 
-            var clientStats = new GenericRepository<EFClientStatistics>();
+            long serverId = await StatManager.GetIdForServer(E.Owner);
-            int serverId = E.Owner.GetHashCode();
 
-            if (E.Target != null)
+            using (var ctx = new DatabaseContext(disableTracking: true))
             {
-                pStats = clientStats.Find(c => c.ServerId == serverId && c.ClientId == E.Target.ClientId).First();
+                if (E.Target != null)
-                statLine = $"^5{pStats.Kills} ^7{loc["PLUGINS_STATS_TEXT_KILLS"]} | ^5{pStats.Deaths} ^7{loc["PLUGINS_STATS_TEXT_DEATHS"]} | ^5{pStats.KDR} ^7KDR | ^5{pStats.Performance} ^7{loc["PLUGINS_STATS_COMMANDS_PERFORMANCE"].ToUpper()}";
+                {
-            }
+                    int performanceRanking = await StatManager.GetClientOverallRanking(E.Target.ClientId);
+                    string performanceRankingString = performanceRanking == 0 ? loc["WEBFRONT_STATS_INDEX_UNRANKED"] : $"{loc["WEBFRONT_STATS_INDEX_RANKED"]} #{performanceRanking}";
 
-            else
+                    pStats = (await ctx.Set<EFClientStatistics>().FirstAsync(c => c.ServerId == serverId && c.ClientId == E.Target.ClientId));
-            {
+                    statLine = $"^5{pStats.Kills} ^7{loc["PLUGINS_STATS_TEXT_KILLS"]} | ^5{pStats.Deaths} ^7{loc["PLUGINS_STATS_TEXT_DEATHS"]} | ^5{pStats.KDR} ^7KDR | ^5{pStats.Performance} ^7{loc["PLUGINS_STATS_COMMANDS_PERFORMANCE"].ToUpper()} | {performanceRankingString}";
-                pStats = pStats = clientStats.Find(c => c.ServerId == serverId && c.ClientId == E.Origin.ClientId).First();
+                }
-                statLine = $"^5{pStats.Kills} ^7{loc["PLUGINS_STATS_TEXT_KILLS"]} | ^5{pStats.Deaths} ^7{loc["PLUGINS_STATS_TEXT_DEATHS"]} | ^5{pStats.KDR} ^7KDR | ^5{pStats.Performance} ^7{loc["PLUGINS_STATS_COMMANDS_PERFORMANCE"].ToUpper()}";
+
+                else
+                {
+                    int performanceRanking = await StatManager.GetClientOverallRanking(E.Origin.ClientId);
+                    string performanceRankingString = performanceRanking == 0 ? loc["WEBFRONT_STATS_INDEX_UNRANKED"] : $"{loc["WEBFRONT_STATS_INDEX_RANKED"]} #{performanceRanking}";
+
+                    pStats = (await ctx.Set<EFClientStatistics>().FirstAsync((c => c.ServerId == serverId && c.ClientId == E.Origin.ClientId)));
+                    statLine = $"^5{pStats.Kills} ^7{loc["PLUGINS_STATS_TEXT_KILLS"]} | ^5{pStats.Deaths} ^7{loc["PLUGINS_STATS_TEXT_DEATHS"]} | ^5{pStats.KDR} ^7KDR | ^5{pStats.Performance} ^7{loc["PLUGINS_STATS_COMMANDS_PERFORMANCE"].ToUpper()} | {performanceRankingString}";
+                }
             }
 
             if (E.Message.IsBroadcastCommand())
             {
                 string name = E.Target == null ? E.Origin.Name : E.Target.Name;
-                await E.Owner.Broadcast($"{loc["PLUGINS_STATS_COMMANDS_VIEW_SUCCESS"]} ^5{name}^7");
+                E.Owner.Broadcast($"{loc["PLUGINS_STATS_COMMANDS_VIEW_SUCCESS"]} ^5{name}^7");
-                await E.Owner.Broadcast(statLine);
+                E.Owner.Broadcast(statLine);
             }
 
             else
             {
                 if (E.Target != null)
-                    await E.Origin.Tell($"{loc["PLUGINS_STATS_COMMANDS_VIEW_SUCCESS"]} ^5{E.Target.Name}^7");
+                {
-                await E.Origin.Tell(statLine);
+                    E.Origin.Tell($"{loc["PLUGINS_STATS_COMMANDS_VIEW_SUCCESS"]} ^5{E.Target.Name}^7");
+                }
+
+                E.Origin.Tell(statLine);
             }
         }
     }

Plugins/Stats/Config/StatsConfiguration.cs

@@ -4,11 +4,13 @@ using System.Collections.Generic;
 
 namespace IW4MAdmin.Plugins.Stats.Config
 {
-    class StatsConfiguration : IBaseConfiguration
+    public class StatsConfiguration : IBaseConfiguration
     {
         public bool EnableAntiCheat { get; set; }
         public List<StreakMessageConfiguration> KillstreakMessages { get; set; }
         public List<StreakMessageConfiguration> DeathstreakMessages { get; set; }
+        public int TopPlayersMinPlayTime { get; set; }
+        public bool StoreClientKills { get; set; }
         public string Name() => "Stats";
         public IBaseConfiguration Generate()
         {
@@ -47,6 +49,9 @@ namespace IW4MAdmin.Plugins.Stats.Config
                  },
             };
 
+            TopPlayersMinPlayTime = 3600 * 3;
+            StoreClientKills = false;
+
             return this;
         }
     }

Plugins/Stats/Helpers/Extensions.cs

@@ -25,7 +25,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
 
         public static double[] AngleStuff(Vector3 a, Vector3 b)
         {
-            double deltaX = 180.0 -Math.Abs(Math.Abs(a.X - b.X) - 180.0);
+            double deltaX = 180.0 - Math.Abs(Math.Abs(a.X - b.X) - 180.0);
             double deltaY = 180.0 - Math.Abs(Math.Abs(a.Y - b.Y) - 180.0);
 
             return new[] { deltaX, deltaY };

Plugins/Stats/Helpers/ServerStats.cs

@@ -23,7 +23,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
 
         public int TeamCount(IW4Info.Team teamName)
         {
-            if (PlayerStats.Count(p => p.Value.Team == IW4Info.Team.Spectator) / (double)PlayerStats.Count <= 0.25)
+            if (PlayerStats.Count(p => p.Value.Team == IW4Info.Team.None) / (double)PlayerStats.Count <= 0.25)
             {
                 return IsTeamBased ? Math.Max(PlayerStats.Count(p => p.Value.Team == teamName), 1) : Math.Max(PlayerStats.Count - 1, 1);
             }

Plugins/Stats/Helpers/ThreadSafeStatsService.cs

@@ -1,40 +0,0 @@
-using SharedLibraryCore.Services;
-using IW4MAdmin.Plugins.Stats.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace IW4MAdmin.Plugins.Stats.Helpers
-{
-    public class ThreadSafeStatsService
-    {
-        public GenericRepository<EFClientStatistics> ClientStatSvc
-        {
-            get
-            {
-                return new GenericRepository<EFClientStatistics>();
-            }
-        }
-        public GenericRepository<EFServer> ServerSvc { get; private set; }
-        public GenericRepository<EFClientKill> KillStatsSvc { get; private set; }
-        public GenericRepository<EFServerStatistics> ServerStatsSvc { get; private set; }
-        public GenericRepository<EFClientMessage> MessageSvc
-        {
-            get
-            {
-                return new GenericRepository<EFClientMessage>();
-            }
-        }
-
-        public ThreadSafeStatsService()
-        {
-            //ClientStatSvc = new GenericRepository<EFClientStatistics>();
-            ServerSvc = new GenericRepository<EFServer>();
-            KillStatsSvc = new GenericRepository<EFClientKill>();
-            ServerStatsSvc = new GenericRepository<EFServerStatistics>();
-            //MessageSvc = new GenericRepository<EFClientMessage>();
-        }
-    }
-}

Plugins/Stats/IW4Info.cs

@@ -10,9 +10,10 @@ namespace IW4MAdmin.Plugins.Stats
     {
         public enum Team
         {
+            None,
             Spectator,
-            Axis,
+            Allies,
-            Allies
+            Axis
         }
 
         public enum MeansOfDeath
@@ -64,6 +65,7 @@ namespace IW4MAdmin.Plugins.Stats
             right_foot,
             left_foot,
             gun,
+            shield
         }
 
         public enum WeaponName
@@ -1368,7 +1370,9 @@ namespace IW4MAdmin.Plugins.Stats
             dragunov_mp,
             cobra_player_minigun_mp,
             destructible_car,
-            sentry_minigun_mp
+            sentry_minigun_mp,
+            cobra_20mm_mp,
+            shield
         }
 
         public enum MapName

Plugins/Stats/Models/EFACSnapshot.cs

@@ -0,0 +1,51 @@
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Helpers;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace IW4MAdmin.Plugins.Stats.Models
+{
+    /// <summary>
+    /// This class houses the information for anticheat snapshots (used for validating a ban)
+    /// </summary>
+    public class EFACSnapshot : SharedEntity
+    {
+        [Key]
+        public int SnapshotId { get; set; }
+        public int ClientId { get; set; }
+        [ForeignKey("ClientId")]
+        public EFClient Client { get; set; }
+
+        public DateTime When { get; set; }
+        public int CurrentSessionLength { get; set; }
+        public int TimeSinceLastEvent { get; set; }
+        public double EloRating { get; set; }
+        public int SessionScore { get; set; }
+        public double SessionSPM { get; set; }
+        public int Hits { get; set; }
+        public int Kills { get; set; }
+        public int Deaths { get; set; }
+        public double CurrentStrain { get; set; }
+        public double StrainAngleBetween { get; set; }
+        public double SessionAngleOffset { get; set; }
+        public int LastStrainAngleId { get; set; }
+        [ForeignKey("LastStrainAngleId")]
+        public Vector3 LastStrainAngle { get; set; }
+        public int HitOriginId { get; set; }
+        [ForeignKey("HitOriginId")]
+        public Vector3 HitOrigin { get; set; }
+        public int HitDestinationId { get; set; }
+        [ForeignKey("HitDestinationId")]
+        public Vector3 HitDestination { get; set; }
+        public double Distance { get; set; }
+        public int CurrentViewAngleId { get; set; }
+        [ForeignKey("CurrentViewAngleId")]
+        public Vector3 CurrentViewAngle { get; set; }
+        public IW4Info.WeaponName WeaponId { get; set; }
+        public IW4Info.HitLocation HitLocation { get; set; }
+        public IW4Info.MeansOfDeath HitType { get; set; }
+        public virtual ICollection<Vector3> PredictedViewAngles { get; set; }
+    }
+}

Plugins/Stats/Models/EFClientKill.cs

@@ -18,7 +18,7 @@ namespace IW4MAdmin.Plugins.Stats.Models
         public int AttackerId { get; set; }
         [ForeignKey("AttackerId")]
         public virtual EFClient Attacker { get; set; }
-        public int ServerId { get; set; }
+        public long ServerId { get; set; }
         [ForeignKey("ServerId")]
         public virtual EFServer Server { get; set; }
         public IW4Info.HitLocation HitLoc { get; set; }
@@ -29,6 +29,9 @@ namespace IW4MAdmin.Plugins.Stats.Models
         public Vector3 DeathOrigin { get; set; }
         public Vector3 ViewAngles { get; set; }
         public DateTime When { get; set; }
+        public double Fraction { get; set; }
+        public bool IsKill { get; set; }
+        public double VisibilityPercentage { get; set; }
         // http://wiki.modsrepository.com/index.php?title=Call_of_Duty_5:_Gameplay_standards for conversion to meters
         [NotMapped]
         public double Distance => Vector3.Distance(KillOrigin, DeathOrigin) * 0.0254;

Plugins/Stats/Models/EFClientMessage.cs

@@ -13,7 +13,7 @@ namespace IW4MAdmin.Plugins.Stats.Models
     {
         [Key]
         public long MessageId { get; set; }
-        public int ServerId { get; set; }
+        public long ServerId { get; set; }
         [ForeignKey("ServerId")]
         public virtual EFServer Server { get; set; }
         public int ClientId { get; set; }

Plugins/Stats/Models/EFClientRatingHistory.cs

@@ -0,0 +1,20 @@
+using IW4MAdmin.Plugins.Stats.Models;
+using SharedLibraryCore.Database.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Text;
+
+namespace IW4MAdmin.Plugins.Stats.Models
+{
+    public class EFClientRatingHistory : SharedEntity
+    {
+        [Key]
+        public int RatingHistoryId { get; set; }
+        public int ClientId { get; set; }
+        [ForeignKey("ClientId")]
+        public virtual EFClient Client { get; set; }
+        public virtual ICollection<EFRating> Ratings { get; set; }
+    }
+}

Plugins/Stats/Models/EFClientStatistics.cs

@@ -15,7 +15,7 @@ namespace IW4MAdmin.Plugins.Stats.Models
         public int ClientId { get; set; }
         [ForeignKey("ClientId")]
         public virtual EFClient Client { get; set; }
-        public int ServerId { get; set; }
+        public long ServerId { get; set; }
         [ForeignKey("ServerId")]
         public virtual EFServer Server { get; set; }
         [Required]
@@ -25,6 +25,7 @@ namespace IW4MAdmin.Plugins.Stats.Models
         public double EloRating { get; set; }
         public virtual ICollection<EFHitLocationCount> HitLocations { get; set; }
         public double RollingWeightedKDR { get; set; }
+        public double VisionAverage { get; set; }
         [NotMapped]
         public double Performance
         {
@@ -71,6 +72,7 @@ namespace IW4MAdmin.Plugins.Stats.Models
             DeathStreak = 0;
             LastScore = 0;
             SessionScores.Add(0);
+            Team = IW4Info.Team.None;
         }
         [NotMapped]
         public int SessionScore
@@ -96,5 +98,9 @@ namespace IW4MAdmin.Plugins.Stats.Models
         private List<int> SessionScores = new List<int>() { 0 };
         [NotMapped]
         public IW4Info.Team Team { get; set; }
+        [NotMapped]
+        public DateTime LastStatHistoryUpdate { get; set; } = DateTime.UtcNow;
+        [NotMapped]
+        public double SessionSPM { get; set; }
     }
 }

Plugins/Stats/Models/EFHitLocationCount.cs

@@ -20,9 +20,8 @@ namespace IW4MAdmin.Plugins.Stats.Models
         public int ClientId { get; set; }
         [ForeignKey("ClientId"), Column(Order = 0 )]
         public EFClient Client { get; set; }
-        public int ServerId { get; set; }
+        public long ServerId { get; set; }
         [ForeignKey("ServerId"), Column(Order = 1)]
         public EFServer Server { get; set; }
-
     }
 }

Plugins/Stats/Models/EFRating.cs

@@ -0,0 +1,31 @@
+using SharedLibraryCore.Database.Models;
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace IW4MAdmin.Plugins.Stats.Models
+{
+    public class EFRating : SharedEntity
+    {
+        [Key]
+        public int RatingId { get; set; }
+        public int RatingHistoryId { get; set; }
+        [ForeignKey("RatingHistoryId")]
+        public virtual EFClientRatingHistory RatingHistory { get; set; }
+        // if null, indicates that the rating is an average rating
+        public long? ServerId { get; set; }
+       // [ForeignKey("ServerId")] can't make this nullable if this annotation is set
+        public virtual EFServer Server { get; set; }
+        [Required]
+        public double Performance { get; set; }
+        [Required]
+        public int Ranking { get; set; }
+        [Required]
+        // indicates if the rating is the latest
+        public bool Newest { get; set; }
+        [Required]
+        public int ActivityAmount { get; set; }
+        [Required]
+        public DateTime When { get; set; } = DateTime.UtcNow;
+    }
+}