Update IW5 gametype names. (#240)

.gitignore

@@ -224,6 +224,7 @@ bootstrap-custom.min.css
 bootstrap-custom.css
 **/Master/static
 **/Master/dev_env
+/WebfrontCore/Views/Plugins/*
 /WebfrontCore/wwwroot/**/dds
 /WebfrontCore/wwwroot/images/radar/*
 

Application/Alerts/AlertExtensions.cs

@@ -1,55 +0,0 @@
-using System;
-using SharedLibraryCore;
-using SharedLibraryCore.Alerts;
-using SharedLibraryCore.Database.Models;
-
-namespace IW4MAdmin.Application.Alerts;
-
-public static class AlertExtensions
-{
-    public static Alert.AlertState BuildAlert(this EFClient client, Alert.AlertCategory? type = null)
-    {
-        return new Alert.AlertState
-        {
-            RecipientId = client.ClientId,
-            Category = type ?? Alert.AlertCategory.Information
-        };
-    }
-
-    public static Alert.AlertState WithCategory(this Alert.AlertState state, Alert.AlertCategory category)
-    {
-        state.Category = category;
-        return state;
-    }
-
-    public static Alert.AlertState OfType(this Alert.AlertState state, string type)
-    {
-        state.Type = type;
-        return state;
-    }
-
-    public static Alert.AlertState WithMessage(this Alert.AlertState state, string message)
-    {
-        state.Message = message;
-        return state;
-    }
-
-    public static Alert.AlertState ExpiresIn(this Alert.AlertState state, TimeSpan expiration)
-    {
-        state.ExpiresAt = DateTime.Now.Add(expiration);
-        return state;
-    }
-    
-    public static Alert.AlertState FromSource(this Alert.AlertState state, string source)
-    {
-        state.Source = source;
-        return state;
-    }
-
-    public static Alert.AlertState FromClient(this Alert.AlertState state, EFClient client)
-    {
-        state.Source = client.Name.StripColors();
-        state.SourceId = client.ClientId;
-        return state;
-    }
-}

Application/Alerts/AlertManager.cs

@@ -1,137 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using SharedLibraryCore.Alerts;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Interfaces;
-
-namespace IW4MAdmin.Application.Alerts;
-
-public class AlertManager : IAlertManager
-{
-    private readonly ApplicationConfiguration _appConfig;
-    private readonly ConcurrentDictionary<int, List<Alert.AlertState>> _states = new();
-    private readonly List<Func<Task<IEnumerable<Alert.AlertState>>>> _staticSources = new();
-
-    public AlertManager(ApplicationConfiguration appConfig)
-    {
-        _appConfig = appConfig;
-        _states.TryAdd(0, new List<Alert.AlertState>());
-    }
-
-    public EventHandler<Alert.AlertState> OnAlertConsumed { get; set; }
-
-    public async Task Initialize()
-    {
-        foreach (var source in _staticSources)
-        {
-            var alerts = await source();
-            foreach (var alert in alerts)
-            {
-                AddAlert(alert);
-            }
-        }
-    }
-
-    public IEnumerable<Alert.AlertState> RetrieveAlerts(EFClient client)
-    {
-        lock (_states)
-        {
-            var alerts = Enumerable.Empty<Alert.AlertState>();
-            if (client.Level > Data.Models.Client.EFClient.Permission.Trusted)
-            {
-                alerts = alerts.Concat(_states[0].Where(alert =>
-                    alert.MinimumPermission is null || alert.MinimumPermission <= client.Level));
-            }
-
-            if (_states.ContainsKey(client.ClientId))
-            {
-                alerts = alerts.Concat(_states[client.ClientId].AsReadOnly());
-            }
-
-            return alerts.OrderByDescending(alert => alert.OccuredAt);
-        }
-    }
-
-    public void MarkAlertAsRead(Guid alertId)
-    {
-        lock (_states)
-        {
-            foreach (var items in _states.Values)
-            {
-                var matchingEvent = items.FirstOrDefault(item => item.AlertId == alertId);
-
-                if (matchingEvent is null)
-                {
-                    continue;
-                }
-
-                items.Remove(matchingEvent);
-                OnAlertConsumed?.Invoke(this, matchingEvent);
-            }
-        }
-    }
-
-    public void MarkAllAlertsAsRead(int recipientId)
-    {
-        lock (_states)
-        {
-            foreach (var items in _states.Values)
-            {
-                items.RemoveAll(item =>
-                {
-                    if (item.RecipientId != null && item.RecipientId != recipientId)
-                    {
-                        return false;
-                    }
-
-                    OnAlertConsumed?.Invoke(this, item);
-                    return true;
-                });
-            }
-        }
-    }
-
-    public void AddAlert(Alert.AlertState alert)
-    {
-        lock (_states)
-        {
-            if (alert.RecipientId is null)
-            {
-                _states[0].Add(alert);
-                return;
-            }
-
-            if (!_states.ContainsKey(alert.RecipientId.Value))
-            {
-                _states[alert.RecipientId.Value] = new List<Alert.AlertState>();
-            }
-
-            if (_appConfig.MinimumAlertPermissions.ContainsKey(alert.Type))
-            {
-                alert.MinimumPermission = _appConfig.MinimumAlertPermissions[alert.Type];
-            }
-
-            _states[alert.RecipientId.Value].Add(alert);
-
-            PruneOldAlerts();
-        }
-    }
-
-    public void RegisterStaticAlertSource(Func<Task<IEnumerable<Alert.AlertState>>> alertSource)
-    {
-        _staticSources.Add(alertSource);
-    }
-
-
-    private void PruneOldAlerts()
-    {
-        foreach (var value in _states.Values)
-        {
-            value.RemoveAll(item => item.ExpiresAt < DateTime.UtcNow);
-        }
-    }
-}

Application/Application.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
     <PackageId>RaidMax.IW4MAdmin.Application</PackageId>
     <Version>2020.0.0.0</Version>
@@ -24,15 +24,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Jint" Version="3.0.0-beta-2038" />
+    <PackageReference Include="Jint" Version="3.0.0-beta-1632" />
-    <PackageReference Include="MaxMind.GeoIP2" Version="5.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.10">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.10" />
-    <PackageReference Include="RestEase" Version="1.5.5" />
+    <PackageReference Include="RestEase" Version="1.5.1" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -64,9 +63,6 @@
     <None Update="Configuration\LoggingConfiguration.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Resources\GeoLite2-Country.mmdb">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
   </ItemGroup>
 
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">

Application/ApplicationManager.cs

@@ -57,11 +57,11 @@ namespace IW4MAdmin.Application
         private readonly List<MessageToken> MessageTokens;
         private readonly ClientService ClientSvc;
         readonly PenaltyService PenaltySvc;
-        private readonly IAlertManager _alertManager;
         public IConfigurationHandler<ApplicationConfiguration> ConfigHandler;
         readonly IPageList PageList;
+        private readonly IMetaService _metaService;
         private readonly TimeSpan _throttleTimeout = new TimeSpan(0, 1, 0);
-        private CancellationTokenSource _tokenSource;
+        private readonly CancellationTokenSource _tokenSource;
         private readonly Dictionary<string, Task<IList>> _operationLookup = new Dictionary<string, Task<IList>>();
         private readonly ITranslationLookup _translationLookup;
         private readonly IConfigurationHandler<CommandConfiguration> _commandConfiguration;
@@ -81,23 +81,23 @@ namespace IW4MAdmin.Application
             ITranslationLookup translationLookup, IConfigurationHandler<CommandConfiguration> commandConfiguration,
             IConfigurationHandler<ApplicationConfiguration> appConfigHandler, IGameServerInstanceFactory serverInstanceFactory,
             IEnumerable<IPlugin> plugins, IParserRegexFactory parserRegexFactory, IEnumerable<IRegisterEvent> customParserEvents,
-            IEventHandler eventHandler, IScriptCommandFactory scriptCommandFactory, IDatabaseContextFactory contextFactory,
+            IEventHandler eventHandler, IScriptCommandFactory scriptCommandFactory, IDatabaseContextFactory contextFactory, IMetaService metaService,
             IMetaRegistration metaRegistration, IScriptPluginServiceResolver scriptPluginServiceResolver, ClientService clientService, IServiceProvider serviceProvider,
-            ChangeHistoryService changeHistoryService, ApplicationConfiguration appConfig, PenaltyService penaltyService, IAlertManager alertManager)
+            ChangeHistoryService changeHistoryService, ApplicationConfiguration appConfig, PenaltyService penaltyService)
         {
             MiddlewareActionHandler = actionHandler;
             _servers = new ConcurrentBag<Server>();
             MessageTokens = new List<MessageToken>();
             ClientSvc = clientService;
             PenaltySvc = penaltyService;
-            _alertManager = alertManager;
             ConfigHandler = appConfigHandler;
             StartTime = DateTime.UtcNow;
             PageList = new PageList();
-            AdditionalEventParsers = new List<IEventParser> { new BaseEventParser(parserRegexFactory, logger, _appConfig) };
+            AdditionalEventParsers = new List<IEventParser>() { new BaseEventParser(parserRegexFactory, logger, _appConfig) };
-            AdditionalRConParsers = new List<IRConParser> { new BaseRConParser(serviceProvider.GetRequiredService<ILogger<BaseRConParser>>(), parserRegexFactory) };
+            AdditionalRConParsers = new List<IRConParser>() { new BaseRConParser(serviceProvider.GetRequiredService<ILogger<BaseRConParser>>(), parserRegexFactory) };
             TokenAuthenticator = new TokenAuthentication();
             _logger = logger;
+            _metaService = metaService;
             _tokenSource = new CancellationTokenSource();
             _commands = commands.ToList();
             _translationLookup = translationLookup;
@@ -236,6 +236,13 @@ namespace IW4MAdmin.Application
                     .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)
+                {
+                    IsInitialized = true;
+                }
+
                 // remove the update tasks as they have completed
                 foreach (var serverId in serverTasksToRemove.Where(serverId => runningUpdateTasks.ContainsKey(serverId)))
                 {
@@ -348,10 +355,10 @@ namespace IW4MAdmin.Application
             // copy over default config if it doesn't exist
             if (!_appConfig.Servers?.Any() ?? true)
             {
-                var defaultHandler = new BaseConfigurationHandler<DefaultSettings>("DefaultSettings");
+                var defaultConfig = new BaseConfigurationHandler<DefaultSettings>("DefaultSettings").Configuration();
-                await defaultHandler.BuildAsync();
+                //ConfigHandler.Set((ApplicationConfiguration)new ApplicationConfiguration().Generate());
-                var defaultConfig = defaultHandler.Configuration();
+                //var newConfig = ConfigHandler.Configuration();
-        
+
                 _appConfig.AutoMessages = defaultConfig.AutoMessages;
                 _appConfig.GlobalRules = defaultConfig.GlobalRules;
                 _appConfig.DisallowedClientNames = defaultConfig.DisallowedClientNames;
@@ -412,7 +419,7 @@ namespace IW4MAdmin.Application
 
                 if (!validationResult.IsValid)
                 {
-                    throw new ConfigurationException("Could not validate configuration")
+                    throw new ConfigurationException("MANAGER_CONFIGURATION_ERROR")
                     {
                         Errors = validationResult.Errors.Select(_error => _error.ErrorMessage).ToArray(),
                         ConfigurationFileName = ConfigHandler.FileName
@@ -510,7 +517,6 @@ namespace IW4MAdmin.Application
             #endregion
 
             _metaRegistration.Register();
-            await _alertManager.Initialize();
 
             #region CUSTOM_EVENTS
             foreach (var customEvent in _customParserEvents.SelectMany(_events => _events.Events))
@@ -524,7 +530,6 @@ namespace IW4MAdmin.Application
 
             Console.WriteLine(_translationLookup["MANAGER_COMMUNICATION_INFO"]);
             await InitializeServers();
-            IsInitialized = true;
         }
 
         private async Task InitializeServers()
@@ -546,7 +551,7 @@ namespace IW4MAdmin.Application
 
                         _servers.Add(ServerInstance);
                         Console.WriteLine(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_MONITORING_TEXT"].FormatExt(ServerInstance.Hostname.StripColors()));
-                        _logger.LogInformation("Finishing initialization and now monitoring [{Server}]", ServerInstance.Hostname);
+                        _logger.LogInformation("Finishing initialization and now monitoring [{server}]", ServerInstance.Hostname, ServerInstance.ToString());
                     }
 
                     // add the start event for this server
@@ -590,30 +595,16 @@ namespace IW4MAdmin.Application
 
         public async Task Start() => await UpdateServerStates();
 
-        public async Task Stop()
+        public void Stop()
         {
-            foreach (var plugin in Plugins)
-            {
-                try
-                {
-                    await plugin.OnUnloadAsync().WithTimeout(Utilities.DefaultCommandTimeout);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Could not cleanly unload plugin {PluginName}", plugin.Name);
-                }
-            }   
-            
             _tokenSource.Cancel();
-            
             IsRunning = false;
         }
 
         public void Restart()
         {
             IsRestartRequested = true;
-            Stop().GetAwaiter().GetResult();
+            Stop();
-            _tokenSource = new CancellationTokenSource();
         }
 
         [Obsolete]
@@ -633,9 +624,9 @@ namespace IW4MAdmin.Application
             return _servers.SelectMany(s => s.Clients).ToList().Where(p => p != null).ToList();
         }
 
-        public EFClient FindActiveClient(EFClient client) => client.ClientNumber < 0 ?
+        public EFClient FindActiveClient(EFClient client) =>client.ClientNumber < 0 ?
                 GetActiveClients()
-                    .FirstOrDefault(c => c.NetworkId == client.NetworkId && c.GameName == client.GameName) ?? client :
+                    .FirstOrDefault(c => c.NetworkId == client.NetworkId) ?? client :
                 client;
 
         public ClientService GetClientService()
@@ -701,6 +692,5 @@ namespace IW4MAdmin.Application
         }
 
         public void RemoveCommandByName(string commandName) => _commands.RemoveAll(_command => _command.Name == commandName);
-        public IAlertManager AlertManager => _alertManager;
     }
 }

Application/BuildScripts/PostBuild.bat

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

Application/BuildScripts/PostPublish.bat

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

Application/Commands/ClientTags/AddClientTagCommand.cs

@@ -1,64 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Data.Models;
-using Data.Models.Client;
-using Microsoft.Extensions.Logging;
-using SharedLibraryCore;
-using SharedLibraryCore.Commands;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
-
-namespace IW4MAdmin.Application.Commands.ClientTags
-{
-    public class AddClientTagCommand : Command
-    {
-        private readonly IMetaServiceV2 _metaService;
-
-        public AddClientTagCommand(ILogger<AddClientTagCommand> commandLogger, CommandConfiguration config,
-            ITranslationLookup layout, IMetaServiceV2 metaService) :
-            base(config, layout)
-        {
-            Name = "addclienttag";
-            Description = layout["COMMANDS_ADD_CLIENT_TAG_DESC"];
-            Alias = "act";
-            Permission = EFClient.Permission.Owner;
-            RequiresTarget = false;
-            Arguments = new[]
-            {
-                new CommandArgument
-                {
-                    Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
-                    Required = true
-                }
-            };
-
-            _metaService = metaService;
-            logger = commandLogger;
-        }
-
-        public override async Task ExecuteAsync(GameEvent gameEvent)
-        {
-            var existingTags = await _metaService.GetPersistentMetaValue<List<TagMeta>>(EFMeta.ClientTagNameV2) ??
-                               new List<TagMeta>();
-
-            var tagName = gameEvent.Data.Trim();
-
-            if (existingTags.Any(tag => tag.TagName == tagName))
-            {
-                logger.LogWarning("Tag with name {TagName} already exists", tagName);
-                return;
-            }
-
-            existingTags.Add(new TagMeta
-            {
-                Id = (existingTags.LastOrDefault()?.TagId ?? 0) + 1,
-                Value = tagName
-            });
-
-            await _metaService.SetPersistentMetaValue(EFMeta.ClientTagNameV2, existingTags,
-                gameEvent.Owner.Manager.CancellationToken);
-            gameEvent.Origin.Tell(_translationLookup["COMMANDS_ADD_CLIENT_TAG_SUCCESS"].FormatExt(gameEvent.Data));
-        }
-    }
-}

Application/Commands/ClientTags/ListClientTags.cs

@@ -1,38 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Data.Models;
-using Data.Models.Client;
-using SharedLibraryCore;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
-
-namespace IW4MAdmin.Application.Commands.ClientTags
-{
-    public class ListClientTags : Command
-    {
-        private readonly IMetaServiceV2 _metaService;
-
-        public ListClientTags(CommandConfiguration config, ITranslationLookup layout, IMetaServiceV2 metaService) : base(
-            config, layout)
-        {
-            Name = "listclienttags";
-            Description = layout["COMMANDS_LIST_CLIENT_TAGS_DESC"];
-            Alias = "lct";
-            Permission = EFClient.Permission.Owner;
-            RequiresTarget = false;
-            _metaService = metaService;
-        }
-
-        public override async Task ExecuteAsync(GameEvent gameEvent)
-        {
-            var tags = await _metaService.GetPersistentMetaValue<List<TagMeta>>(EFMeta.ClientTagNameV2);
-            
-            if (tags is not null)
-            {
-                await gameEvent.Origin.TellAsync(tags.Select(tag => tag.TagName),
-                    gameEvent.Owner.Manager.CancellationToken);
-            }
-        }
-    }
-}

Application/Commands/ClientTags/TagMeta.cs

@@ -1,13 +0,0 @@
-using System.Text.Json.Serialization;
-using SharedLibraryCore.Interfaces;
-
-namespace IW4MAdmin.Application.Commands.ClientTags;
-
-public class TagMeta : ILookupValue<string>
-{
-    [JsonIgnore] public int TagId => Id;
-    [JsonIgnore] public string TagName => Value;
-
-    public int Id { get; set; }
-    public string Value { get; set; }
-}

Application/Commands/ListClientsCommand.cs

@@ -29,9 +29,9 @@ namespace IW4MAdmin.Application.Commands
                     $"[(Color::Accent){client.ClientPermission.Name}(Color::White){(string.IsNullOrEmpty(client.Tag) ? "" : $" {client.Tag}")}(Color::White)][(Color::Yellow)#{client.ClientNumber}(Color::White)] {client.Name}")
                 .ToArray();
 
-            gameEvent.Origin.TellAsync(clientList, gameEvent.Owner.Manager.CancellationToken);
+            gameEvent.Origin.Tell(clientList);
 
             return Task.CompletedTask;
         }
     }
-}
+}

Application/Commands/MapAndGameTypeCommand.cs

@@ -54,8 +54,20 @@ namespace IW4MAdmin.Application.Commands
                 return;
             }
 
-            var map = match.Groups[1].Length > 0 ? match.Groups[1].ToString() : match.Groups[2].ToString();
+            string map;
-            var gametype = match.Groups[3].Length > 0 ? match.Groups[3].ToString() : match.Groups[4].ToString();
+            string gametype;
+
+            if (match.Groups.Count > 3)
+            {
+                map = match.Groups[2].ToString();
+                gametype = match.Groups[4].ToString();
+            }
+
+            else
+            {
+                map = match.Groups[1].ToString();
+                gametype = match.Groups[3].ToString();
+            }
 
             var matchingMaps = gameEvent.Owner.FindMap(map);
             var matchingGametypes = _defaultSettings.FindGametype(gametype, gameEvent.Owner.GameName);
@@ -92,7 +104,7 @@ namespace IW4MAdmin.Application.Commands
 
             _logger.LogDebug("Changing map to {Map} and gametype {Gametype}", map, gametype);
 
-            await gameEvent.Owner.SetDvarAsync("g_gametype", gametype, gameEvent.Owner.Manager.CancellationToken);
+            await gameEvent.Owner.SetDvarAsync("g_gametype", gametype);
             gameEvent.Owner.Broadcast(_translationLookup["COMMANDS_MAP_SUCCESS"].FormatExt(map));
             await Task.Delay(gameEvent.Owner.Manager.GetApplicationSettings().Configuration().MapChangeDelaySeconds);
 

Application/Commands/OfflineMessageCommand.cs

@@ -1,14 +1,11 @@
 using System;
-using System.Linq;
 using System.Threading.Tasks;
 using Data.Abstractions;
 using Data.Models.Client;
 using Data.Models.Misc;
-using IW4MAdmin.Application.Alerts;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using SharedLibraryCore;
-using SharedLibraryCore.Alerts;
 using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Interfaces;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
@@ -19,66 +16,19 @@ namespace IW4MAdmin.Application.Commands
     {
         private readonly IDatabaseContextFactory _contextFactory;
         private readonly ILogger _logger;
-        private readonly IAlertManager _alertManager;
         private const short MaxLength = 1024;
-
+        
         public OfflineMessageCommand(CommandConfiguration config, ITranslationLookup layout,
-            IDatabaseContextFactory contextFactory, ILogger<IDatabaseContextFactory> logger, IAlertManager alertManager)
+            IDatabaseContextFactory contextFactory, ILogger<IDatabaseContextFactory> logger) : base(config, layout)
-            : base(config, layout)
         {
             Name = "offlinemessage";
             Description = _translationLookup["COMMANDS_OFFLINE_MESSAGE_DESC"];
             Alias = "om";
             Permission = EFClient.Permission.Moderator;
             RequiresTarget = true;
-
+            
             _contextFactory = contextFactory;
             _logger = logger;
-            _alertManager = alertManager;
-
-            _alertManager.RegisterStaticAlertSource(async () =>
-            {
-                var context = contextFactory.CreateContext(false);
-                return await context.InboxMessages.Where(message => !message.IsDelivered)
-                    .Where(message => message.CreatedDateTime >= DateTime.UtcNow.AddDays(-7))
-                    .Where(message => message.DestinationClient.Level > EFClient.Permission.User)
-                    .Select(message => new Alert.AlertState
-                    {
-                        OccuredAt = message.CreatedDateTime,
-                        Message = message.Message,
-                        ExpiresAt = DateTime.UtcNow.AddDays(7),
-                        Category = Alert.AlertCategory.Message,
-                        Source = message.SourceClient.CurrentAlias.Name.StripColors(),
-                        SourceId = message.SourceClientId,
-                        RecipientId = message.DestinationClientId,
-                        ReferenceId = message.InboxMessageId,
-                        Type = nameof(EFInboxMessage)
-                    }).ToListAsync();
-            });
-
-            _alertManager.OnAlertConsumed += (_, state) =>
-            {
-                if (state.Category != Alert.AlertCategory.Message || state.ReferenceId is null)
-                {
-                    return;
-                }
-
-                try
-                {
-                    var context = contextFactory.CreateContext(true);
-                    foreach (var message in context.InboxMessages
-                                 .Where(message => message.InboxMessageId == state.ReferenceId.Value).ToList())
-                    {
-                        message.IsDelivered = true;
-                    }
-
-                    context.SaveChanges();
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Could not update message state for alert {@Alert}", state);
-                }
-            };
         }
 
         public override async Task ExecuteAsync(GameEvent gameEvent)
@@ -88,24 +38,23 @@ namespace IW4MAdmin.Application.Commands
                 gameEvent.Origin.Tell(_translationLookup["COMMANDS_OFFLINE_MESSAGE_TOO_LONG"].FormatExt(MaxLength));
                 return;
             }
-
+            
             if (gameEvent.Target.ClientId == gameEvent.Origin.ClientId)
             {
                 gameEvent.Origin.Tell(_translationLookup["COMMANDS_OFFLINE_MESSAGE_SELF"].FormatExt(MaxLength));
                 return;
             }
-
+            
             if (gameEvent.Target.IsIngame)
             {
-                gameEvent.Origin.Tell(_translationLookup["COMMANDS_OFFLINE_MESSAGE_INGAME"]
+                gameEvent.Origin.Tell(_translationLookup["COMMANDS_OFFLINE_MESSAGE_INGAME"].FormatExt(gameEvent.Target.Name));
-                    .FormatExt(gameEvent.Target.Name));
                 return;
             }
-
+            
             await using var context = _contextFactory.CreateContext(enableTracking: false);
             var server = await context.Servers.FirstAsync(srv => srv.EndPoint == gameEvent.Owner.ToString());
 
-            var newMessage = new EFInboxMessage
+            var newMessage = new EFInboxMessage()
             {
                 SourceClientId = gameEvent.Origin.ClientId,
                 DestinationClientId = gameEvent.Target.ClientId,
@@ -113,12 +62,6 @@ namespace IW4MAdmin.Application.Commands
                 Message = gameEvent.Data,
             };
 
-            _alertManager.AddAlert(gameEvent.Target.BuildAlert(Alert.AlertCategory.Message)
-                .WithMessage(gameEvent.Data.Trim())
-                .FromClient(gameEvent.Origin)
-                .OfType(nameof(EFInboxMessage))
-                .ExpiresIn(TimeSpan.FromDays(7)));
-
             try
             {
                 context.Set<EFInboxMessage>().Add(newMessage);
@@ -132,4 +75,4 @@ namespace IW4MAdmin.Application.Commands
             }
         }
     }
-}
+}

Application/DefaultSettings.json

@@ -158,14 +158,14 @@
     {
       "Game": "IW5",
       "Gametypes": [
-        {
-          "Name": "tdm",
-          "Alias": "Team Deathmatch"
-        },
         {
           "Name": "dom",
           "Alias": "Domination"
         },
+        {
+          "Name": "conf",
+          "Alias": "Kill Confirmed"
+        },
         {
           "Name": "ctf",
           "Alias": "Capture The Flag"
@@ -175,37 +175,29 @@
           "Alias": "Demolition"
         },
         {
-          "Name": "dz",
+          "Name": "dm",
-          "Alias": "Drop Zone"
-        },
-        {
-          "Name": "ffa",
           "Alias": "Free For All"
         },
         {
-          "Name": "gg",
+          "Name": "grnd",
-          "Alias": "Gun Game"
+          "Alias": "Drop Zone"
         },
         {
-          "Name": "hq",
+          "Name": "gun",
-          "Alias": "Headquarters"
+          "Alias": "Gun Game"
         },
         {
           "Name": "koth",
           "Alias": "Headquarters"
         },
         {
-          "Name": "inf",
+          "Name": "infect",
           "Alias": "Infected"
         },
         {
-          "Name": "jug",
+          "Name": "jugg",
           "Alias": "Juggernaut"
         },
-        {
-          "Name": "kc",
-          "Alias": "Kill Confirmed"
-        },
         {
           "Name": "oic",
           "Alias": "One In The Chamber"
@@ -223,8 +215,12 @@
           "Alias": "Team Defender"
         },
         {
-          "Name": "tj",
+          "Name": "tjugg",
           "Alias": "Team Juggernaut"
+        },
+        {
+          "Name": "war",
+          "Alias": "Team Deathmatch"
         }
       ]
     },
@@ -564,56 +560,7 @@
           "Alias": "Momentum"
         }
       ]
-    },
+    }
-{
-      "Game": "H1",
-      "Gametypes": [
-	{
-          "Name": "conf",
-          "Alias": "Kill Confirmed"
-        },
-        {
-          "Name": "ctf",
-          "Alias": "Capture The Flag"
-        },
-        {
-          "Name": "dd",
-          "Alias": "Demolition"
-        },
-        {
-          "Name": "dm",
-          "Alias": "Free For All"
-        },
-        {
-          "Name": "dom",
-          "Alias": "Domination"
-        },
-	{
-          "Name": "gun",
-          "Alias": "Gun Game"
-        },
-	{
-          "Name": "hp",
-          "Alias": "Hardpoint"
-        },
-        {
-          "Name": "koth",
-          "Alias": "Headquarters"
-        },
-        {
-          "Name": "sab",
-          "Alias": "Sabotage"
-        },
-        {
-          "Name": "sd",
-          "Alias": "Search & Destroy"
-        },
-        {
-          "Name": "war",
-          "Alias": "Team Deathmatch"
-        }
-      ]
-}
   ],
   "Maps": [
     {
@@ -1817,103 +1764,6 @@
         }
       ]
     },
-    {
-      "Game": "H1",
-      "Maps": [
-        {
-          "Alias": "Ambush",
-          "Name": "mp_convoy"
-        },
-        {
-          "Alias": "Backlot",
-          "Name": "mp_backlot"
-        },
-        {
-          "Alias": "Bloc",
-          "Name": "mp_bloc"
-        },
-        {
-          "Alias": "Bog",
-          "Name": "mp_bog"
-        },
-        {
-          "Alias": "Countdown",
-          "Name": "mp_countdown"
-        },
-        {
-          "Alias": "Crash",
-          "Name": "mp_crash"
-        },
-        {
-          "Alias": "Crossfire",
-          "Name": "mp_crossfire"
-        },
-        {
-          "Alias": "District",
-          "Name": "mp_citystreets"
-        },
-        {
-          "Alias": "Downpour",
-          "Name": "mp_farm"
-        },
-        {
-          "Alias": "Overgrown",
-          "Name": "mp_overgrown"
-        },
-        {
-          "Alias": "Pipeline",
-          "Name": "mp_pipeline"
-        },
-        {
-          "Alias": "Shipment",
-          "Name": "mp_shipment"
-        },
-        {
-          "Alias": "Showdown",
-          "Name": "mp_showdown"
-        },
-        {
-          "Alias": "Strike",
-          "Name": "mp_strike"
-        },
-        {
-          "Alias": "Vacant",
-          "Name": "mp_vacant"
-        },
-        {
-          "Alias": "Wet Work",
-          "Name": "mp_cargoship"
-        },
-        {
-          "Alias": "Winter Crash",
-          "Name": "mp_crash_snow"
-        },
-        {
-          "Alias": "Broadcast",
-          "Name": "mp_broadcast"
-        },
-        {
-          "Alias": "Creek",
-          "Name": "mp_creek"
-        },
-        {
-          "Alias": "Chinatown",
-          "Name": "mp_carentan"
-        },
-        {
-          "Alias": "Killhouse",
-          "Name": "mp_killhouse"
-        },
-        {
-          "Alias": "Day Break",
-          "Name": "mp_farm_spring"
-        },
-        {
-          "Alias": "Beach Bog",
-          "Name": "mp_bog_summer"
-        }
-      ]
-    },  
     {
       "Game": "CSGO",
       "Maps": [
@@ -2167,7 +2017,7 @@
       "barrett": "Barrett .50cal",
       "mp44": "MP44",
       "remington700": "R700",
-      "rpd": "RPD",
+      "rpd": "RDP",
       "saw": " M249 SAW",
       "usp": "USP .45",
       "winchester1200": "W1200",
@@ -2229,126 +2079,6 @@
       "type99rifle": "Arisaka",
       "mosinrifle": "Mosin-Nagant",
       "ptrs41": "PTRS-41"
-    },
-	
-	"T6" : {
-        
-        "mp7": "MP7",
-        "pdw57": "PDW-57",
-        "vector": "Vector K10",
-        "insas": "MSMC",
-        "qcw05": "Chicom CQB",
-        "evoskorpion": "Skorpion EVO",
-        "peacekeeper": "Peacekeeper",
-        
-        "tar21": "MTAR",
-        "type95": "Type 25",
-        "sig556": "SWAT-556",
-        "sa58": "FAL-OSW",
-        "hk416": "M27",
-        "scar": "SCAR-H",
-        "saritch": "SMR",
-        "xm8": "M8A1",
-        "an94": "AN-94",
-        
-        "870mcs": "Remington-870 MCS",
-        "saiga12": "S12",
-        "ksg": "KSG",
-        "srm1216": "M1216",
-        
-        "mk48": "MK 48",
-        "qbb95": "QBB LSW",
-        "lsat": "LSAT",
-        "hamr": "HAMR",
-        
-        "svu": "SVU-AS",
-        "dsr50": "DSR 50",
-        "ballista": "Ballista",
-        "as50": "XPR-50",
-        
-        "fiveseven": "Five-Seven",
-        "fnp45": "TAC-45",
-        "beretta93r": "B23R",
-        "judge": "Executioner",
-        "kard": "KAP-40",
-        
-        "smaw": "SMAW",
-        "fhj18": "FHJ-18 AA",
-        "usrpg": "RPG",
-        
-        "riotshield": "Assault Shield",
-        "crossbow": "Crossbow",
-        "knife_ballistic": "Ballistic Knife",
-        "knife_held": "Knife",
-        "knife": "Knife",
-        
-        "frag_grenade": "Grenade",
-        "hatchet": "Combat Axe",
-        "sticky_grenade": "Semtex",
-        "satchel_charge": "C4",
-        "bouncingbetty": "Bouncing Betty",
-        "claymore": "Claymore",
-        
-        "smoke_center": "Smoke Grenade",
-        "concussion_grenade": "Concussion",
-        "emp_grenade": "EMP Grenade",
-        "sensor_grenade": "Sensor Grenade",
-        "flash_grenade": "Flashbang",
-        "proximity_grenade": "Shock Charge",
-        "pda_hack": "Black Hat",
-        "trophy_system": "Trophy System",
-        "tactical_insertion": "Tactical Insertion",
-        
-        "acog": "ACOG",
-        "stalker": "Stock",
-        "swayreduc": "Ballistics CPU",
-        "ir": "Dual Band",
-        "dw": "Dual Wield",
-        "extclip": "Extended Clip",
-        "halo": "EOTech",
-        "dualclip": "Fast Mag",
-        "fmj": "FMJ",
-        "grip": "Fore Grip",
-        "gl": "Grenade Launcher",
-        "dualoptic": "Hybrid Optic",
-        "is": "Iron Sights",
-        "steadyaim": "Laser Sight",
-        "extbarrel": "Long Barrel",
-        "mms": "MMS",
-        "fastads": "Quickdraw",
-        "rf": "Rapid Fire",
-        "reflex": "Reflex Sight",
-        "sf": "Select Fire",
-        "silencer": "Suppressor",
-        "tacknife": "Tactical Knife",
-        "stackfire": "Tri-Bolt",
-        "rangefinder": "Target Finder",
-        "vzoom": "Variable Zoom",
-        
-        "spyplane": "UAV",
-        "rcbomb": "RC-XD",
-        "missile_drone": "Hunter Killer",
-        "supplydrop": "Care Package",
-        "counteruav": "Counter-UAV",
-        "microwave_turret": "Guardian",
-        "remote_missile": "Hellstorm Missile",
-        "planemortar": "Lightning Strike",
-        "auto_turret": "Sentry Gun",
-        "minigun": "Death Machine",
-        "m32": "War Machine",
-        "qrdrone": "Dragonfire",
-        "ai_tank_drop": "AGR",
-        "comlink": "Stealth Chopper",
-        "spyplane_direction": "Orbital VSAT",
-        "helicopter_guard": "Escort Drone",
-        "emp": "EMP",
-        "straferun": "Warthog",
-        "remote_mortar": "Lodestar",
-        "player_gunner": "VTOL Warship",
-        "dogs": "K9 Unit",
-        "missile_swarm": "Swarm"
-        
     }
-	
   }
 }

Application/EventParsers/BaseEventParser.cs

@@ -49,13 +49,6 @@ namespace IW4MAdmin.Application.EventParsers
             Configuration.Join.AddMapping(ParserRegex.GroupType.OriginNetworkId, 2);
             Configuration.Join.AddMapping(ParserRegex.GroupType.OriginClientNumber, 3);
             Configuration.Join.AddMapping(ParserRegex.GroupType.OriginName, 4);
-            
-            Configuration.JoinTeam.Pattern = @"^(JT);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);([0-9]+);(\w+);(.+)$";
-            Configuration.JoinTeam.AddMapping(ParserRegex.GroupType.EventType, 1);
-            Configuration.JoinTeam.AddMapping(ParserRegex.GroupType.OriginNetworkId, 2);
-            Configuration.JoinTeam.AddMapping(ParserRegex.GroupType.OriginClientNumber, 3);
-            Configuration.JoinTeam.AddMapping(ParserRegex.GroupType.OriginTeam, 4);
-            Configuration.JoinTeam.AddMapping(ParserRegex.GroupType.OriginName, 5);
 
             Configuration.Damage.Pattern = @"^(D);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,32});(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0)?;(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,32})?;((?:[0-9]+|[a-z]+|_|\+)+);([0-9]+);((?:[A-Z]|_)+);((?:[a-z]|_)+)$";
             Configuration.Damage.AddMapping(ParserRegex.GroupType.EventType, 1);
@@ -97,8 +90,7 @@ namespace IW4MAdmin.Application.EventParsers
                 {Configuration.Say, GameEvent.EventType.Say},
                 {Configuration.Kill, GameEvent.EventType.Kill},
                 {Configuration.MapChange, GameEvent.EventType.MapChange},
-                {Configuration.MapEnd, GameEvent.EventType.MapEnd},
+                {Configuration.MapEnd, GameEvent.EventType.MapEnd}
-                {Configuration.JoinTeam, GameEvent.EventType.JoinTeam}
             };
             
             _eventTypeMap = new Dictionary<string, GameEvent.EventType>
@@ -108,8 +100,7 @@ namespace IW4MAdmin.Application.EventParsers
                 {"K", GameEvent.EventType.Kill},
                 {"D", GameEvent.EventType.Damage},
                 {"J", GameEvent.EventType.PreConnect},
-                {"JT", GameEvent.EventType.JoinTeam},
+                {"Q", GameEvent.EventType.PreDisconnect},
-                {"Q", GameEvent.EventType.PreDisconnect}
             };
         }
 
@@ -331,47 +322,6 @@ namespace IW4MAdmin.Application.EventParsers
                 }
             }
 
-            if (eventType == GameEvent.EventType.JoinTeam)
-            {
-                var match = Configuration.JoinTeam.PatternMatcher.Match(logLine);
-
-                if (match.Success)
-                {
-                    var originIdString = match.Values[Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginNetworkId]];
-                    var originName = match.Values[Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginName]];
-                    var team = match.Values[Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginTeam]];
-
-                    if (Configuration.TeamMapping.ContainsKey(team))
-                    {
-                        team = Configuration.TeamMapping[team].ToString();
-                    }
-
-                    var networkId = originIdString.IsBotGuid() ?
-                        originName.GenerateGuidFromString() :
-                        originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle);
-                    
-                    return new GameEvent
-                    {
-                        Type = GameEvent.EventType.JoinTeam,
-                        Data = logLine,
-                        Origin = new EFClient
-                        {
-                            CurrentAlias = new EFAlias
-                            {
-                                Name = match.Values[Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginName]].TrimNewLine(),
-                            },
-                            NetworkId = networkId,
-                            ClientNumber = Convert.ToInt32(match.Values[Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]),
-                            State = EFClient.ClientState.Connected,
-                        },
-                        Extra = team,
-                        RequiredEntity = GameEvent.EventRequiredEntity.Origin,
-                        GameTime = gameTime,
-                        Source = GameEvent.EventSource.Log
-                    };
-                }
-            }
-
             if (eventType == GameEvent.EventType.PreDisconnect)
             {
                 var match = Configuration.Quit.PatternMatcher.Match(logLine);

Application/EventParsers/DynamicEventParserConfiguration.cs

@@ -1,8 +1,6 @@
-using System.Collections.Generic;
+using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.Interfaces;
 using System.Globalization;
 using SharedLibraryCore;
-using SharedLibraryCore.Database.Models;
 
 namespace IW4MAdmin.Application.EventParsers
 {
@@ -10,12 +8,11 @@ namespace IW4MAdmin.Application.EventParsers
     /// generic implementation of the IEventParserConfiguration
     /// allows script plugins to generate dynamic configurations
     /// </summary>
-    internal sealed class DynamicEventParserConfiguration : IEventParserConfiguration
+    sealed internal class DynamicEventParserConfiguration : IEventParserConfiguration
     {
         public string GameDirectory { get; set; }
         public ParserRegex Say { get; set; }
         public ParserRegex Join { get; set; }
-        public ParserRegex JoinTeam { get; set; }
         public ParserRegex Quit { get; set; }
         public ParserRegex Kill { get; set; }
         public ParserRegex Damage { get; set; }
@@ -25,13 +22,10 @@ namespace IW4MAdmin.Application.EventParsers
         public ParserRegex MapEnd { get; set; }
         public NumberStyles GuidNumberStyle { get; set; } = NumberStyles.HexNumber;
 
-        public Dictionary<string, EFClient.TeamType> TeamMapping { get; set; } = new();
-
         public DynamicEventParserConfiguration(IParserRegexFactory parserRegexFactory)
         {
             Say = parserRegexFactory.CreateParserRegex();
             Join = parserRegexFactory.CreateParserRegex();
-            JoinTeam = parserRegexFactory.CreateParserRegex();
             Quit = parserRegexFactory.CreateParserRegex();
             Kill = parserRegexFactory.CreateParserRegex();
             Damage = parserRegexFactory.CreateParserRegex();

Application/Extensions/StartupExtensions.cs

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

Application/Factories/ConfigurationHandlerFactory.cs

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

Application/Factories/GameLogReaderFactory.cs

@@ -18,22 +18,14 @@ namespace IW4MAdmin.Application.Factories
         public IGameLogReader CreateGameLogReader(Uri[] logUris, IEventParser eventParser)
         {
             var baseUri = logUris[0];
-            if (baseUri.Scheme == Uri.UriSchemeHttp || baseUri.Scheme == Uri.UriSchemeHttps)
+            if (baseUri.Scheme == Uri.UriSchemeHttp)
             {
-                return new GameLogReaderHttp(logUris, eventParser,
+                return new GameLogReaderHttp(logUris, eventParser, _serviceProvider.GetRequiredService<ILogger<GameLogReaderHttp>>());
-                    _serviceProvider.GetRequiredService<ILogger<GameLogReaderHttp>>());
             }
 
-            if (baseUri.Scheme == Uri.UriSchemeFile)
+            else if (baseUri.Scheme == Uri.UriSchemeFile)
             {
-                return new GameLogReader(baseUri.LocalPath, eventParser,
+                return new GameLogReader(baseUri.LocalPath, eventParser, _serviceProvider.GetRequiredService<ILogger<GameLogReader>>());
-                    _serviceProvider.GetRequiredService<ILogger<GameLogReader>>());
-            }
-
-            if (baseUri.Scheme == Uri.UriSchemeNetTcp)
-            {
-                return new NetworkGameLogReader(logUris, eventParser,
-                    _serviceProvider.GetRequiredService<ILogger<NetworkGameLogReader>>());
             }
 
             throw new NotImplementedException($"No log reader implemented for Uri scheme \"{baseUri.Scheme}\"");

Application/Factories/GameServerInstanceFactory.cs

@@ -14,7 +14,7 @@ namespace IW4MAdmin.Application.Factories
     internal class GameServerInstanceFactory : IGameServerInstanceFactory
     {
         private readonly ITranslationLookup _translationLookup;
-        private readonly IMetaServiceV2 _metaService;
+        private readonly IMetaService _metaService;
         private readonly IServiceProvider _serviceProvider;
 
         /// <summary>
@@ -23,7 +23,7 @@ namespace IW4MAdmin.Application.Factories
         /// <param name="translationLookup"></param>
         /// <param name="rconConnectionFactory"></param>
         public GameServerInstanceFactory(ITranslationLookup translationLookup,
-            IMetaServiceV2 metaService,
+            IMetaService metaService,
             IServiceProvider serviceProvider)
         {
             _translationLookup = translationLookup;
@@ -45,4 +45,4 @@ namespace IW4MAdmin.Application.Factories
                 _serviceProvider.GetRequiredService<ILookupCache<EFServer>>());
         }
     }
-}
+}

Application/Factories/ScriptCommandFactory.cs

@@ -6,7 +6,6 @@ using SharedLibraryCore.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using Data.Models.Client;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -31,7 +30,7 @@ namespace IW4MAdmin.Application.Factories
 
         /// <inheritdoc/>
         public IManagerCommand CreateScriptCommand(string name, string alias, string description, string permission, 
-            bool isTargetRequired, IEnumerable<(string, bool)> args, Func<GameEvent, Task> executeAction, Server.Game[] supportedGames)
+            bool isTargetRequired, IEnumerable<(string, bool)> args, Action<GameEvent> executeAction)
         {
             var permissionEnum = Enum.Parse<EFClient.Permission>(permission);
             var argsArray = args.Select(_arg => new CommandArgument
@@ -41,7 +40,7 @@ namespace IW4MAdmin.Application.Factories
             }).ToArray();
 
             return new ScriptCommand(name, alias, description, isTargetRequired, permissionEnum, argsArray, executeAction,
-                _config, _transLookup, _serviceProvider.GetRequiredService<ILogger<ScriptCommand>>(), supportedGames);
+                _config, _transLookup, _serviceProvider.GetRequiredService<ILogger<ScriptCommand>>());
         }
     }
 }

Application/IO/GameLogEventDetection.cs

@@ -21,7 +21,7 @@ namespace IW4MAdmin.Application.IO
         {
             _reader = gameLogReaderFactory.CreateGameLogReader(gameLogUris, server.EventParser);
             _server = server;
-            _ignoreBots = server.Manager.GetApplicationSettings().Configuration()?.IgnoreBots ?? false;
+            _ignoreBots = server?.Manager.GetApplicationSettings().Configuration().IgnoreBots ?? false;
             _logger = logger;
         }
 
@@ -69,7 +69,7 @@ namespace IW4MAdmin.Application.IO
                 return;
             }
 
-            var events = await _reader.ReadEventsFromLog(fileDiff, previousFileSize, _server);
+            var events = await _reader.ReadEventsFromLog(fileDiff, previousFileSize);
 
             foreach (var gameEvent in events)
             {

Application/IO/GameLogReader.cs

@@ -28,7 +28,7 @@ namespace IW4MAdmin.Application.IO
             _logger = logger;
         }
 
-        public async Task<IEnumerable<GameEvent>> ReadEventsFromLog(long fileSizeDiff, long startPosition, Server server = null)
+        public async Task<IEnumerable<GameEvent>> ReadEventsFromLog(long fileSizeDiff, long startPosition)
         {
             // allocate the bytes for the new log lines
             List<string> logLines = new List<string>();

Application/IO/GameLogReaderHttp.cs

@@ -34,7 +34,7 @@ namespace IW4MAdmin.Application.IO
 
         public int UpdateInterval => 500;
 
-        public async Task<IEnumerable<GameEvent>> ReadEventsFromLog(long fileSizeDiff, long startPosition, Server server = null)
+        public async Task<IEnumerable<GameEvent>> ReadEventsFromLog(long fileSizeDiff, long startPosition)
         {
             var events = new List<GameEvent>();
             var response = await _logServerApi.Log(_safeLogPath, lastKey);

Application/IO/NetworkGameLogReader.cs

@@ -1,163 +0,0 @@
-using SharedLibraryCore;
-using SharedLibraryCore.Interfaces;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Sockets;
-using System.Threading;
-using System.Threading.Tasks;
-using Integrations.Cod;
-using Microsoft.Extensions.Logging;
-using Serilog.Context;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
-
-namespace IW4MAdmin.Application.IO
-{
-    /// <summary>
-    /// provides capability of reading log files over udp 
-    /// </summary>
-    class NetworkGameLogReader : IGameLogReader
-    {
-        private readonly IEventParser _eventParser;
-        private readonly ILogger _logger;
-        private readonly Uri _uri;
-        private static readonly NetworkLogState State = new();
-        private bool _stateRegistered;
-        private CancellationToken _token;
-
-        public NetworkGameLogReader(IReadOnlyList<Uri> uris, IEventParser parser, ILogger<NetworkGameLogReader> logger)
-        {
-            _eventParser = parser;
-            _uri = uris[0];
-            _logger = logger;
-        }
-
-        public long Length => -1;
-
-        public int UpdateInterval => 150;
-
-        public Task<IEnumerable<GameEvent>> ReadEventsFromLog(long fileSizeDiff, long startPosition,
-            Server server = null)
-        {
-            // todo: other games might support this
-            var serverEndpoint = (server?.RemoteConnection as CodRConConnection)?.Endpoint;
-
-            if (serverEndpoint is null)
-            {
-                return Task.FromResult(Enumerable.Empty<GameEvent>());
-            }
-
-            if (!_stateRegistered && !State.EndPointExists(serverEndpoint))
-            {
-                try
-                {
-                    var client = State.RegisterEndpoint(serverEndpoint, BuildLocalEndpoint()).Client;
-
-                    _stateRegistered = true;
-                    _token = server.Manager.CancellationToken;
-
-                    if (client == null)
-                    {
-                        using (LogContext.PushProperty("Server", server.ToString()))
-                        {
-                            _logger.LogInformation("Not registering {Name} socket because it is already bound",
-                                nameof(NetworkGameLogReader));
-                        }
-                        return Task.FromResult(Enumerable.Empty<GameEvent>());
-                    }
-
-                    Task.Run(async () => await ReadNetworkData(client, _token), _token);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Could not register {Name} endpoint {Endpoint}",
-                        nameof(NetworkGameLogReader), _uri);
-                    throw;
-                }
-            }
-
-            var events = new List<GameEvent>();
-
-            foreach (var logData in State.GetServerLogData(serverEndpoint)
-                         .Select(log => Utilities.EncodingType.GetString(log)))
-            {
-                if (string.IsNullOrWhiteSpace(logData))
-                {
-                    return Task.FromResult(Enumerable.Empty<GameEvent>());
-                }
-
-                var lines = logData
-                    .Split('\n')
-                    .Where(line => line.Length > 0 && !line.Contains('ÿ'));
-
-                foreach (var eventLine in lines)
-                {
-                    try
-                    {
-                        // this trim end should hopefully fix the nasty runaway regex
-                        var gameEvent = _eventParser.GenerateGameEvent(eventLine.TrimEnd('\r'));
-                        events.Add(gameEvent);
-                    }
-
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Could not properly parse event line from http {EventLine}",
-                            eventLine);
-                    }
-                }
-            }
-
-            return Task.FromResult((IEnumerable<GameEvent>)events);
-        }
-
-        private async Task ReadNetworkData(UdpClient client, CancellationToken token)
-        {
-            while (!token.IsCancellationRequested)
-            {
-                // get more data
-                IPEndPoint remoteEndpoint = null;
-                byte[] bufferedData = null;
-
-                if (client == null)
-                {
-                    // we already have a socket listening on this port for data, so we don't need to run another thread
-                    break;
-                }
-
-                try
-                {
-                    var result = await client.ReceiveAsync(_token);
-                    remoteEndpoint = result.RemoteEndPoint;
-                    bufferedData = result.Buffer;
-                }
-                catch (OperationCanceledException)
-                {
-                    _logger.LogDebug("Stopping network log receive");
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Could not receive lines for {LogReader}", nameof(NetworkGameLogReader));
-                }
-
-                if (bufferedData != null)
-                {
-                    State.QueueServerLogData(remoteEndpoint, bufferedData);
-                }
-            }
-        }
-
-        private IPEndPoint BuildLocalEndpoint()
-        {
-            try
-            {
-                return new IPEndPoint(Dns.GetHostAddresses(_uri.Host).First(), _uri.Port);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Could not setup {LogReader} endpoint", nameof(NetworkGameLogReader));
-                throw;
-            }
-        }
-    }
-}

Application/IO/NetworkLogState.cs

@@ -1,138 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Sockets;
-using System.Threading;
-
-namespace IW4MAdmin.Application.IO;
-
-public class NetworkLogState : Dictionary<IPEndPoint, UdpClientState>
-{
-    public UdpClientState RegisterEndpoint(IPEndPoint serverEndpoint, IPEndPoint localEndpoint)
-    {
-        try
-        {
-            lock (this)
-            {
-                if (!ContainsKey(serverEndpoint))
-                {
-                    Add(serverEndpoint, new UdpClientState { Client = new UdpClient(localEndpoint) });
-                }
-            }
-        }
-        catch (SocketException ex) when (ex.SocketErrorCode == SocketError.AddressAlreadyInUse)
-        {
-            lock (this)
-            {
-                // we don't add the udp client because it already exists (listening to multiple servers from one socket)
-                Add(serverEndpoint,  new UdpClientState());
-            }
-        }
-
-        return this[serverEndpoint];
-    }
-
-
-    public List<byte[]> GetServerLogData(IPEndPoint serverEndpoint)
-    {
-        try
-        {
-            var state = this[serverEndpoint];
-            
-            if (state == null)
-            {
-                return new List<byte[]>();
-            }
-            
-            // it's possible that we could be trying to read and write to the queue simultaneously so we need to wait 
-            this[serverEndpoint].OnAction.Wait();
-
-            var data = new List<byte[]>();
-            
-            while (this[serverEndpoint].AvailableLogData.Count > 0)
-            {
-                data.Add(this[serverEndpoint].AvailableLogData.Dequeue());
-            }
-           
-            return data;
-        }
-        finally
-        {
-            if (this[serverEndpoint].OnAction.CurrentCount == 0)
-            {
-                this[serverEndpoint].OnAction.Release(1);
-            }
-        }
-    }
-
-    public void QueueServerLogData(IPEndPoint serverEndpoint, byte[] data)
-    {
-        var endpoint = Keys.FirstOrDefault(key =>
-            Equals(key.Address, serverEndpoint.Address) && key.Port == serverEndpoint.Port);
-
-        try
-        {
-            if (endpoint == null)
-            {
-                return;
-            }
-
-            // currently our expected start and end characters
-            var startsWithPrefix = StartsWith(data, "ÿÿÿÿprint\n");
-            var endsWithDelimiter = data[^1] == '\n';
-
-            // we have the data we expected
-            if (!startsWithPrefix || !endsWithDelimiter)
-            {
-                return;
-            }
-
-            // it's possible that we could be trying to read and write to the queue simultaneously so we need to wait 
-            this[endpoint].OnAction.Wait();
-            this[endpoint].AvailableLogData.Enqueue(data);
-        }
-        finally
-        {
-            if (endpoint != null && this[endpoint].OnAction.CurrentCount == 0)
-            {
-                this[endpoint].OnAction.Release(1);
-            }
-        }
-    }
-
-    public bool EndPointExists(IPEndPoint serverEndpoint)
-    {
-        lock (this)
-        {
-            return ContainsKey(serverEndpoint);
-        }
-    }
-
-    private static bool StartsWith(byte[] sourceArray, string match)
-    {
-        if (sourceArray is null)
-        {
-            return false;
-        }
-        
-        if (match.Length > sourceArray.Length)
-        {
-            return false;
-        }
-
-        return !match.Where((t, i) => sourceArray[i] != (byte)t).Any();
-    }
-}
-
-public class UdpClientState
-{
-    public UdpClient Client { get; set; }
-    public Queue<byte[]> AvailableLogData { get; } = new();
-    public SemaphoreSlim OnAction { get; } = new(1, 1);
-
-    ~UdpClientState()
-    {
-        OnAction.Dispose();
-        Client?.Dispose();
-    }
-}

Application/IW4MServer.cs

@@ -12,7 +12,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
-using System.Net.Sockets;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -24,10 +23,9 @@ using Serilog.Context;
 using static SharedLibraryCore.Database.Models.EFClient;
 using Data.Models;
 using Data.Models.Server;
-using IW4MAdmin.Application.Alerts;
 using IW4MAdmin.Application.Commands;
 using Microsoft.EntityFrameworkCore;
-using SharedLibraryCore.Alerts;
+using SharedLibraryCore.Formatting;
 using static Data.Models.Client.EFClient;
 
 namespace IW4MAdmin
@@ -37,7 +35,7 @@ namespace IW4MAdmin
         private static readonly SharedLibraryCore.Localization.TranslationLookup loc = Utilities.CurrentLocalization.LocalizationIndex;
         public GameLogEventDetection LogEvent;
         private readonly ITranslationLookup _translationLookup;
-        private readonly IMetaServiceV2 _metaService;
+        private readonly IMetaService _metaService;
         private const int REPORT_FLAG_COUNT = 4;
         private long lastGameTime = 0;
 
@@ -51,13 +49,11 @@ namespace IW4MAdmin
             ServerConfiguration serverConfiguration,
             CommandConfiguration commandConfiguration,
             ITranslationLookup lookup,
-            IMetaServiceV2 metaService, 
+            IMetaService metaService, 
             IServiceProvider serviceProvider,
             IClientNoticeMessageFormatter messageFormatter,
             ILookupCache<EFServer> serverCache) : base(serviceProvider.GetRequiredService<ILogger<Server>>(), 
-#pragma warning disable CS0612
             serviceProvider.GetRequiredService<SharedLibraryCore.Interfaces.ILogger>(), 
-#pragma warning restore CS0612
             serverConfiguration,
             serviceProvider.GetRequiredService<IManager>(), 
             serviceProvider.GetRequiredService<IRConConnectionFactory>(),
@@ -75,7 +71,7 @@ namespace IW4MAdmin
         {
             ServerLogger.LogDebug("Client slot #{clientNumber} now reserved", clientFromLog.ClientNumber);
 
-            var client = await Manager.GetClientService().GetUnique(clientFromLog.NetworkId, GameName);
+            EFClient client = await Manager.GetClientService().GetUnique(clientFromLog.NetworkId);
 
             // first time client is connecting to server
             if (client == null)
@@ -98,8 +94,6 @@ namespace IW4MAdmin
             client.ClientNumber = clientFromLog.ClientNumber;
             client.Score = clientFromLog.Score;
             client.Ping = clientFromLog.Ping;
-            client.Team = clientFromLog.Team;
-            client.TeamName = clientFromLog.TeamName;
             client.CurrentServer = this;
             client.State = ClientState.Connecting;
 
@@ -118,7 +112,7 @@ namespace IW4MAdmin
 
         public override async Task OnClientDisconnected(EFClient client)
         {
-            if (GetClientsAsList().All(eachClient => eachClient.NetworkId != client.NetworkId))
+            if (!GetClientsAsList().Any(_client => _client.NetworkId == client.NetworkId))
             {
                 using (LogContext.PushProperty("Server", ToString()))
                 {
@@ -154,10 +148,10 @@ namespace IW4MAdmin
             {
                 if (E.IsBlocking)
                 {
-                    await E.Origin.Lock();
+                    await E.Origin?.Lock();
                 }
 
-                var canExecuteCommand = true;
+                bool canExecuteCommand = true;
 
                 try
                 {
@@ -166,30 +160,30 @@ namespace IW4MAdmin
                         return;
                     }
 
-                    Command command = null;
+                    Command C = null;
                     if (E.Type == GameEvent.EventType.Command)
                     {
                         try
                         {
-                            command = await SharedLibraryCore.Commands.CommandProcessing.ValidateCommand(E, Manager.GetApplicationSettings().Configuration(), _commandConfiguration);
+                            C = await SharedLibraryCore.Commands.CommandProcessing.ValidateCommand(E, Manager.GetApplicationSettings().Configuration(), _commandConfiguration);
                         }
 
                         catch (CommandException e)
                         {
-                            ServerLogger.LogWarning(e, "Error validating command from event {@Event}", 
+                            ServerLogger.LogWarning(e, "Error validating command from event {@event}", 
                                 new { E.Type, E.Data, E.Message, E.Subtype, E.IsRemote, E.CorrelationId });
                             E.FailReason = GameEvent.EventFailReason.Invalid;
                         }
 
-                        if (command != null)
+                        if (C != null)
                         {
-                            E.Extra = command;
+                            E.Extra = C;
                         }
                     }
 
                     try
                     {
-                        var loginPlugin = Manager.Plugins.FirstOrDefault(plugin => plugin.Name == "Login");
+                        var loginPlugin = Manager.Plugins.FirstOrDefault(_plugin => _plugin.Name == "Login");
 
                         if (loginPlugin != null)
                         {
@@ -204,15 +198,15 @@ namespace IW4MAdmin
                     }
 
                     // hack: this prevents commands from getting executing that 'shouldn't' be
-                    if (E.Type == GameEvent.EventType.Command && E.Extra is Command cmd &&
+                    if (E.Type == GameEvent.EventType.Command && E.Extra is Command command &&
                         (canExecuteCommand || E.Origin?.Level == Permission.Console))
                     {
-                        ServerLogger.LogInformation("Executing command {Command} for {Client}", cmd.Name, E.Origin.ToString());
+                        ServerLogger.LogInformation("Executing command {comamnd} for {client}", command.Name, E.Origin.ToString());
-                        await cmd.ExecuteAsync(E);
+                        await command.ExecuteAsync(E);
                     }
 
                     var pluginTasks = Manager.Plugins
-                        .Where(plugin => plugin.Name != "Login")
+                        .Where(_plugin => _plugin.Name != "Login")
                         .Select(async plugin => await CreatePluginTask(plugin, E));
                     
                     await Task.WhenAll(pluginTasks);
@@ -240,7 +234,7 @@ namespace IW4MAdmin
         private async Task CreatePluginTask(IPlugin plugin, GameEvent gameEvent)
         {
             // we don't want to run the events on parser plugins
-            if (plugin is ScriptPlugin { IsParser: true })
+            if (plugin is ScriptPlugin scriptPlugin && scriptPlugin.IsParser)
             {
                 return;
             }
@@ -252,11 +246,6 @@ namespace IW4MAdmin
             {
                 await plugin.OnEventAsync(gameEvent, this).WithWaitCancellation(tokenSource.Token);
             }
-            catch (OperationCanceledException)
-            {
-                ServerLogger.LogWarning("Timed out executing event {EventType} for {Plugin}", gameEvent.Type,
-                    plugin.Name);
-            }
             catch (Exception ex)
             {
                 Console.WriteLine(loc["SERVER_PLUGIN_ERROR"].FormatExt(plugin.Name, ex.GetType().Name));
@@ -299,7 +288,7 @@ namespace IW4MAdmin
                     }
                 }
                 
-                else if (E.Type == GameEvent.EventType.ConnectionLost)
+                if (E.Type == GameEvent.EventType.ConnectionLost)
                 {
                     var exception = E.Extra as Exception;
                     ServerLogger.LogError(exception,
@@ -308,46 +297,30 @@ namespace IW4MAdmin
                     if (!Manager.GetApplicationSettings().Configuration().IgnoreServerConnectionLost)
                     {
                         Console.WriteLine(loc["SERVER_ERROR_COMMUNICATION"].FormatExt($"{IP}:{Port}"));
-                        
-                        var alert = Alert.AlertState.Build().OfType(E.Type.ToString())
-                            .WithCategory(Alert.AlertCategory.Error)
-                            .FromSource("System")
-                            .WithMessage(loc["SERVER_ERROR_COMMUNICATION"].FormatExt($"{IP}:{Port}"))
-                            .ExpiresIn(TimeSpan.FromDays(1));
-                        
-                        Manager.AlertManager.AddAlert(alert);
                     }
-      
+
                     Throttled = true;
                 }
 
-                else if (E.Type == GameEvent.EventType.ConnectionRestored)
+                if (E.Type == GameEvent.EventType.ConnectionRestored)
                 {
                     ServerLogger.LogInformation(
                         "Connection restored with {server}", ToString());
                     
                     if (!Manager.GetApplicationSettings().Configuration().IgnoreServerConnectionLost)
                     {
-                        Console.WriteLine(loc["MANAGER_CONNECTION_REST"].FormatExt($"{IP}:{Port}"));
+                        Console.WriteLine(loc["MANAGER_CONNECTION_REST"].FormatExt($"[{IP}:{Port}]"));
-                        
-                        var alert = Alert.AlertState.Build().OfType(E.Type.ToString())
-                            .WithCategory(Alert.AlertCategory.Information)
-                            .FromSource("System")
-                            .WithMessage(loc["MANAGER_CONNECTION_REST"].FormatExt($"{IP}:{Port}"))
-                            .ExpiresIn(TimeSpan.FromDays(1));
-
-                        Manager.AlertManager.AddAlert(alert);
                     }
 
                     if (!string.IsNullOrEmpty(CustomSayName))
                     {
-                        await this.SetDvarAsync("sv_sayname", CustomSayName, Manager.CancellationToken);
+                        await this.SetDvarAsync("sv_sayname", CustomSayName);
                     }
 
                     Throttled = false;
                 }
 
-                else if (E.Type == GameEvent.EventType.ChangePermission)
+                if (E.Type == GameEvent.EventType.ChangePermission)
                 {
                     var newPermission = (Permission) E.Extra;
                     ServerLogger.LogInformation("{origin} is setting {target} to permission level {newPermission}",
@@ -370,18 +343,17 @@ namespace IW4MAdmin
                             Time = DateTime.UtcNow
                         });
 
-                        var clientTag = await _metaService.GetPersistentMetaByLookup(EFMeta.ClientTagV2,
+                        var clientTag = await _metaService.GetPersistentMeta(EFMeta.ClientTag, E.Origin);
-                            EFMeta.ClientTagNameV2, E.Origin.ClientId, Manager.CancellationToken);
 
-                        if (clientTag?.Value != null)
+                        if (clientTag?.LinkedMeta != null)
                         {
-                            E.Origin.Tag = clientTag.Value;
+                            E.Origin.Tag = clientTag.LinkedMeta.Value;
                         }
 
                         try
                         {
                             var factory = _serviceProvider.GetRequiredService<IDatabaseContextFactory>();
-                            await using var context = factory.CreateContext(enableTracking: false);
+                            await using var context = factory.CreateContext();
 
                             var messageCount = await context.InboxMessages
                                 .CountAsync(msg => msg.DestinationClientId == E.Origin.ClientId && !msg.IsDelivered);
@@ -449,7 +421,6 @@ namespace IW4MAdmin
                         Clients[E.Origin.ClientNumber] = E.Origin;
                         try
                         {
-                            E.Origin.GameName = (Reference.Game)GameName;
                             E.Origin = await OnClientConnected(E.Origin);
                             E.Target = E.Origin;
                         }
@@ -504,7 +475,7 @@ namespace IW4MAdmin
 
                 else if (E.Type == GameEvent.EventType.Unflag)
                 {
-                    var unflagPenalty = new EFPenalty
+                    var unflagPenalty = new EFPenalty()
                     {
                         Type = EFPenalty.PenaltyType.Unflag,
                         Expires = DateTime.UtcNow,
@@ -516,8 +487,7 @@ namespace IW4MAdmin
                     };
 
                     E.Target.SetLevel(Permission.User, E.Origin);
-                    await Manager.GetPenaltyService().RemoveActivePenalties(E.Target.AliasLinkId, E.Target.NetworkId,
+                    await Manager.GetPenaltyService().RemoveActivePenalties(E.Target.AliasLinkId);
-                        E.Target.GameName, E.Target.CurrentAlias?.IPAddress);
                     await Manager.GetPenaltyService().Create(unflagPenalty);
                 }
 
@@ -527,8 +497,7 @@ namespace IW4MAdmin
                     {
                         Origin = E.Origin,
                         Target = E.Target,
-                        Reason = E.Data,
+                        Reason = E.Data
-                        ReportedOn = DateTime.UtcNow
                     });
 
                     var newReport = new EFPenalty()
@@ -591,8 +560,8 @@ namespace IW4MAdmin
                         Time = DateTime.UtcNow
                     });
 
-                    await _metaService.SetPersistentMeta("LastMapPlayed", CurrentMap.Alias, E.Origin.ClientId);
+                    await _metaService.AddPersistentMeta("LastMapPlayed", CurrentMap.Alias, E.Origin);
-                    await _metaService.SetPersistentMeta("LastServerPlayed", E.Owner.Hostname, E.Origin.ClientId);
+                    await _metaService.AddPersistentMeta("LastServerPlayed", E.Owner.Hostname, E.Origin);
                 }
 
                 else if (E.Type == GameEvent.EventType.PreDisconnect)
@@ -643,7 +612,7 @@ namespace IW4MAdmin
                     await OnClientUpdate(E.Origin);
                 }
 
-                else if (E.Type == GameEvent.EventType.Say)
+                if (E.Type == GameEvent.EventType.Say)
                 {
                     if (E.Data?.Length > 0)
                     {
@@ -663,7 +632,7 @@ namespace IW4MAdmin
                             }
                         }
 
-                        ChatHistory.Add(new ChatInfo
+                        ChatHistory.Add(new ChatInfo()
                         {
                             Name = E.Origin.Name,
                             Message = message,
@@ -673,7 +642,7 @@ namespace IW4MAdmin
                     }
                 }
 
-                else if (E.Type == GameEvent.EventType.MapChange)
+                if (E.Type == GameEvent.EventType.MapChange)
                 {
                     ServerLogger.LogInformation("New map loaded - {clientCount} active players", ClientNum);
 
@@ -689,50 +658,23 @@ namespace IW4MAdmin
 
                         else
                         {
-                            if (dict.ContainsKey("gametype"))
+                            Gametype = dict["gametype"];
-                            {
+                            Hostname = dict["hostname"];
-                                Gametype = dict["gametype"];
-                            }
 
-                            if (dict.ContainsKey("hostname"))
+                            string mapname = dict["mapname"] ?? CurrentMap.Name;
-                            {
+                            UpdateMap(mapname);
-                                Hostname = dict["hostname"];
-                            }
-
-                            var newMapName = dict.ContainsKey("mapname")
-                                ? dict["mapname"] ?? CurrentMap.Name
-                                : CurrentMap.Name;
-                            UpdateMap(newMapName);
                         }
                     }
 
                     else
                     {
-                        var dict = (Dictionary<string, string>)E.Extra;
+                        var dict = (Dictionary<string, string>) E.Extra;
-                        if (dict.ContainsKey("g_gametype"))
+                        Gametype = dict["g_gametype"];
-                        {
+                        Hostname = dict["sv_hostname"];
-                            Gametype = dict["g_gametype"];
+                        MaxClients = int.Parse(dict["sv_maxclients"]);
-                        }
 
-                        if (dict.ContainsKey("sv_hostname"))
+                        string mapname = dict["mapname"];
-                        {
+                        UpdateMap(mapname);
-                            Hostname = dict["sv_hostname"];
-                        }
-
-                        if (dict.ContainsKey("sv_maxclients"))
-                        {
-                            MaxClients = int.Parse(dict["sv_maxclients"]);
-                        }
-
-                        else if (dict.ContainsKey("com_maxclients"))
-                        {
-                            MaxClients = int.Parse(dict["com_maxclients"]);
-                        }
-
-                        if (dict.ContainsKey("mapname"))
-                        {
-                            UpdateMap(dict["mapname"]);
-                        }
                     }
 
                     if (E.GameTime.HasValue)
@@ -741,7 +683,7 @@ namespace IW4MAdmin
                     }
                 }
 
-                else if (E.Type == GameEvent.EventType.MapEnd)
+                if (E.Type == GameEvent.EventType.MapEnd)
                 {
                     ServerLogger.LogInformation("Game ending...");
 
@@ -751,40 +693,18 @@ namespace IW4MAdmin
                     }
                 }
 
-                else if (E.Type == GameEvent.EventType.Tell)
+                if (E.Type == GameEvent.EventType.Tell)
                 {
                     await Tell(E.Message, E.Target);
                 }
 
-                else if (E.Type == GameEvent.EventType.Broadcast)
+                if (E.Type == GameEvent.EventType.Broadcast)
                 {
                     if (!Utilities.IsDevelopment && E.Data != null) // hides broadcast when in development mode
                     {
                         await E.Owner.ExecuteCommandAsync(E.Data);
                     }
                 }
-                
-                else if (E.Type == GameEvent.EventType.JoinTeam)
-                {
-                    E.Origin.UpdateTeam(E.Extra as string);
-                }
-                
-                else if (E.Type == GameEvent.EventType.MetaUpdated)
-                {
-                    if (E.Extra is "PersistentStatClientId" && int.TryParse(E.Data, out var persistentClientId))
-                    {
-                        var penalties = await Manager.GetPenaltyService().GetActivePenaltiesByClientId(persistentClientId);
-                        var banPenalty = penalties.FirstOrDefault(penalty => penalty.Type == EFPenalty.PenaltyType.Ban);
-
-                        if (banPenalty is not null && E.Origin.Level != Permission.Banned)
-                        {
-                            ServerLogger.LogInformation(
-                                "Banning {Client} as they have have provided a persistent clientId of {PersistentClientId}, which is banned",
-                                E.Origin.ToString(), persistentClientId);
-                            E.Origin.Ban(loc["SERVER_BAN_EVADE"].FormatExt(persistentClientId), Utilities.IW4MAdminClient(this), true);
-                        }
-                    }
-                }
 
                 lock (ChatHistory)
                 {
@@ -807,7 +727,7 @@ namespace IW4MAdmin
 
         private async Task OnClientUpdate(EFClient origin)
         {
-            var client = GetClientsAsList().FirstOrDefault(c => c.NetworkId == origin.NetworkId);
+            var client = Manager.GetActiveClients().FirstOrDefault(c => c.NetworkId == origin.NetworkId);
 
             if (client == null)
             {
@@ -852,16 +772,10 @@ namespace IW4MAdmin
         /// array index 2 = updated clients
         /// </summary>
         /// <returns></returns>
-        async Task<List<EFClient>[]> PollPlayersAsync(CancellationToken token)
+        async Task<List<EFClient>[]> PollPlayersAsync()
         {
             var currentClients = GetClientsAsList();
-            var statusResponse = await this.GetStatusAsync(token);
+            var statusResponse = (await this.GetStatusAsync());
-
-            if (statusResponse is null)
-            {
-                return null;
-            }
-            
             var polledClients = statusResponse.Clients.AsEnumerable();
 
             if (Manager.GetApplicationSettings().Configuration().IgnoreBots)
@@ -973,16 +887,22 @@ namespace IW4MAdmin
 
                 await e.WaitAsync(Utilities.DefaultCommandTimeout, new CancellationTokenRegistration().Token);
             }
+
+            foreach (var plugin in Manager.Plugins)
+            {
+                await plugin.OnUnloadAsync();
+            }
         }
 
-        private DateTime _lastMessageSent = DateTime.Now;
+        DateTime start = DateTime.Now;
-        private DateTime _lastPlayerCount = DateTime.Now;
+        DateTime playerCountStart = DateTime.Now;
+        DateTime lastCount = DateTime.Now;
 
-        public override async Task<bool> ProcessUpdatesAsync(CancellationToken token)
+        public override async Task<bool> ProcessUpdatesAsync(CancellationToken cts)
         {
             try
             {
-                if (token.IsCancellationRequested)
+                if (cts.IsCancellationRequested)
                 {
                     await ShutdownInternal();
                     return true;
@@ -990,24 +910,17 @@ namespace IW4MAdmin
 
                 try
                 {
-                    if (Manager.GetApplicationSettings().Configuration().RConPollRate == int.MaxValue &&
+                    if (Manager.GetApplicationSettings().Configuration().RConPollRate == int.MaxValue && Utilities.IsDevelopment)
-                        Utilities.IsDevelopment)
                     {
                         return true;
                     }
 
-                    var polledClients = await PollPlayersAsync(token);
+                    var polledClients = await PollPlayersAsync();
 
-                    if (polledClients is null)
+                    foreach (var disconnectingClient in polledClients[1].Where(_client => !_client.IsZombieClient /* ignores "fake" zombie clients */))
-                    {
-                        return true;
-                    }
-
-                    foreach (var disconnectingClient in polledClients[1]
-                                 .Where(client => !client.IsZombieClient /* ignores "fake" zombie clients */))
                     {
                         disconnectingClient.CurrentServer = this;
-                        var e = new GameEvent
+                        var e = new GameEvent()
                         {
                             Type = GameEvent.EventType.PreDisconnect,
                             Origin = disconnectingClient,
@@ -1020,20 +933,23 @@ namespace IW4MAdmin
                     }
 
                     // this are our new connecting clients
-                    foreach (var client in polledClients[0].Where(client =>
+                    foreach (var client in polledClients[0])
-                                 !string.IsNullOrEmpty(client.Name) && (client.Ping != 999 || client.IsBot)))
                     {
+                        // note: this prevents players in ZMBI state from being registered with no name
+                        if (string.IsNullOrEmpty(client.Name) || (client.Ping == 999 && !client.IsBot))
+                        {
+                            continue;
+                        }
+
                         client.CurrentServer = this;
-                        client.GameName = (Reference.Game)GameName;
+                        var e = new GameEvent()
-                        
-                        var e = new GameEvent
                         {
                             Type = GameEvent.EventType.PreConnect,
                             Origin = client,
                             Owner = this,
                             IsBlocking = true,
                             Extra = client.GetAdditionalProperty<string>("BotGuid"),
-                            Source = GameEvent.EventSource.Status,
+                            Source = GameEvent.EventSource.Status
                         };
 
                         Manager.AddEvent(e);
@@ -1044,19 +960,19 @@ namespace IW4MAdmin
                     foreach (var client in polledClients[2])
                     {
                         client.CurrentServer = this;
-                        var gameEvent = new GameEvent
+                        var e = new GameEvent()
                         {
                             Type = GameEvent.EventType.Update,
                             Origin = client,
                             Owner = this
                         };
 
-                        Manager.AddEvent(gameEvent);
+                        Manager.AddEvent(e);
                     }
 
                     if (Throttled)
                     {
-                        var gameEvent = new GameEvent
+                        var _event = new GameEvent()
                         {
                             Type = GameEvent.EventType.ConnectionRestored,
                             Owner = this,
@@ -1064,52 +980,65 @@ namespace IW4MAdmin
                             Target = Utilities.IW4MAdminClient(this)
                         };
 
-                        Manager.AddEvent(gameEvent);
+                        Manager.AddEvent(_event);
                     }
 
                     LastPoll = DateTime.Now;
                 }
 
-                catch (NetworkException ex)
+                catch (NetworkException e)
                 {
-                    if (Throttled)
+                    if (!Throttled)
                     {
-                        return true;
+                        var _event = new GameEvent()
+                        {
+                            Type = GameEvent.EventType.ConnectionLost,
+                            Owner = this,
+                            Origin = Utilities.IW4MAdminClient(this),
+                            Target = Utilities.IW4MAdminClient(this),
+                            Extra = e,
+                            Data = ConnectionErrors.ToString()
+                        };
+
+                        Manager.AddEvent(_event);
                     }
 
-                    var gameEvent = new GameEvent
+                    return true;
+                }
+
+                LastMessage = DateTime.Now - start;
+                lastCount = DateTime.Now;
+
+                var appConfig = _serviceProvider.GetService<ApplicationConfiguration>();
+                // update the player history 
+                if (lastCount - playerCountStart >= appConfig.ServerDataCollectionInterval)
+                {
+                    var maxItems = Math.Ceiling(appConfig.MaxClientHistoryTime.TotalMinutes /
+                                                appConfig.ServerDataCollectionInterval.TotalMinutes);
+                    while ( ClientHistory.Count > maxItems) 
                     {
-                        Type = GameEvent.EventType.ConnectionLost,
+                        ClientHistory.Dequeue();
-                        Owner = this,
+                    }
-                        Origin = Utilities.IW4MAdminClient(this),
-                        Target = Utilities.IW4MAdminClient(this),
-                        Extra = ex,
-                        Data = ConnectionErrors.ToString()
-                    };
 
-                    Manager.AddEvent(gameEvent);
+                    ClientHistory.Enqueue(new PlayerHistory(ClientNum));
-                    return true;
+                    playerCountStart = DateTime.Now;
-                }
-                finally
-                {
-                    RunServerCollection();
-                }
-
-                if (DateTime.Now - _lastMessageSent <=
-                    TimeSpan.FromSeconds(Manager.GetApplicationSettings().Configuration().AutoMessagePeriod) ||
-                    BroadcastMessages.Count <= 0 || ClientNum <= 0)
-                {
-                    return true;
                 }
 
                 // send out broadcast messages
-                var messages =
+                if (LastMessage.TotalSeconds > Manager.GetApplicationSettings().Configuration().AutoMessagePeriod
-                    (await this.ProcessMessageToken(Manager.GetMessageTokens(), BroadcastMessages[NextMessage])).Split(
+                    && BroadcastMessages.Count > 0
-                        Environment.NewLine);
+                    && ClientNum > 0)
-                await BroadcastAsync(messages, token: Manager.CancellationToken);
+                {
+                    string[] messages = (await this.ProcessMessageToken(Manager.GetMessageTokens(), BroadcastMessages[NextMessage])).Split(Environment.NewLine);
 
-                NextMessage = NextMessage == BroadcastMessages.Count - 1 ? 0 : NextMessage + 1;
+                    foreach (string message in messages)
-                _lastMessageSent = DateTime.Now;
+                    {
+                        Broadcast(message);
+                    }
+
+                    NextMessage = NextMessage == (BroadcastMessages.Count - 1) ? 0 : NextMessage + 1;
+                    start = DateTime.Now;
+                }
 
                 return true;
             }
@@ -1121,80 +1050,43 @@ namespace IW4MAdmin
             }
 
             // this one is ok
-            catch (Exception e) when (e is ServerException || e is RConException)
+            catch (Exception e) when(e is ServerException || e is RConException)
             {
-                using (LogContext.PushProperty("Server", ToString()))
+                using(LogContext.PushProperty("Server", ToString()))
                 {
                     ServerLogger.LogWarning(e, "Undesirable exception occured during processing updates");
                 }
-
                 return false;
             }
 
             catch (Exception e)
             {
-                using (LogContext.PushProperty("Server", ToString()))
+                using(LogContext.PushProperty("Server", ToString()))
                 {
                     ServerLogger.LogError(e, "Unexpected exception occured during processing updates");
                 }
-
                 Console.WriteLine(loc["SERVER_ERROR_EXCEPTION"].FormatExt($"[{IP}:{Port}]"));
                 return false;
             }
         }
 
-        private void RunServerCollection()
-        {
-            var appConfig = _serviceProvider.GetService<ApplicationConfiguration>();
-           
-            if (DateTime.Now - _lastPlayerCount < appConfig?.ServerDataCollectionInterval)
-            {
-                return;
-            }
-
-            var maxItems = Math.Ceiling(appConfig.MaxClientHistoryTime.TotalMinutes /
-                                        appConfig.ServerDataCollectionInterval.TotalMinutes);
-                    
-            while (ClientHistory.ClientCounts.Count > maxItems) 
-            {
-                ClientHistory.ClientCounts.RemoveAt(0);
-            }
-
-            ClientHistory.ClientCounts.Add(new ClientCountSnapshot
-            {
-                ClientCount = ClientNum,
-                ConnectionInterrupted = Throttled,
-                Time = DateTime.UtcNow,
-                Map = CurrentMap.Name
-            });
-            
-            _lastPlayerCount = DateTime.Now;
-        }
-
         public async Task Initialize()
         {
             try
             {
-                ResolvedIpEndPoint =
+                ResolvedIpEndPoint = new IPEndPoint((await Dns.GetHostAddressesAsync(IP)).First(), Port);
-                    new IPEndPoint(
-                        (await Dns.GetHostAddressesAsync(IP)).First(address =>
-                            address.AddressFamily == AddressFamily.InterNetwork), Port);
             }
             catch (Exception ex)
             {
                 ServerLogger.LogWarning(ex, "Could not resolve hostname or IP for RCon connection {IP}:{Port}", IP, Port);
                 ResolvedIpEndPoint = new IPEndPoint(IPAddress.Parse(IP), Port);
             }
-
+            
             RconParser = Manager.AdditionalRConParsers
-                .FirstOrDefault(parser =>
+                .FirstOrDefault(_parser => _parser.Version == ServerConfig.RConParserVersion);
-                    parser.Version == ServerConfig.RConParserVersion ||
-                    parser.Name == ServerConfig.RConParserVersion);
 
             EventParser = Manager.AdditionalEventParsers
-                .FirstOrDefault(parser =>
+                .FirstOrDefault(_parser => _parser.Version == ServerConfig.EventParserVersion);
-                    parser.Version == ServerConfig.EventParserVersion ||
-                    parser.Name == ServerConfig.RConParserVersion);
 
             RconParser ??= Manager.AdditionalRConParsers[0];
             EventParser ??= Manager.AdditionalEventParsers[0];
@@ -1202,7 +1094,7 @@ namespace IW4MAdmin
             RemoteConnection = RConConnectionFactory.CreateConnection(ResolvedIpEndPoint, Password, RconParser.RConEngine);
             RemoteConnection.SetConfiguration(RconParser);
 
-            var version = await this.GetMappedDvarValueOrDefaultAsync<string>("version", token: Manager.CancellationToken);
+            var version = await this.GetMappedDvarValueOrDefaultAsync<string>("version");
             Version = version.Value;
             GameName = Utilities.GetGame(version.Value ?? RconParser.Version);
 
@@ -1211,7 +1103,7 @@ namespace IW4MAdmin
                 GameName = RconParser.GameName;
             }
 
-            if (version.Value?.Length != 0)
+            if (version?.Value?.Length != 0)
             {
                 var matchedRconParser = Manager.AdditionalRConParsers.FirstOrDefault(_parser => _parser.Version == version.Value);
                 RconParser.Configuration = matchedRconParser != null ? matchedRconParser.Configuration : RconParser.Configuration;
@@ -1219,7 +1111,7 @@ namespace IW4MAdmin
                 Version = RconParser.Version;
             }
 
-            var svRunning = await this.GetMappedDvarValueOrDefaultAsync<string>("sv_running", token: Manager.CancellationToken);
+            var svRunning = await this.GetMappedDvarValueOrDefaultAsync<string>("sv_running");
 
             if (!string.IsNullOrEmpty(svRunning.Value) && svRunning.Value != "1")
             {
@@ -1228,28 +1120,27 @@ namespace IW4MAdmin
 
             var infoResponse = RconParser.Configuration.CommandPrefixes.RConGetInfo != null ? await this.GetInfoAsync() : null;
 
-            var hostname = (await this.GetMappedDvarValueOrDefaultAsync<string>("sv_hostname", "hostname", infoResponse, token: Manager.CancellationToken)).Value;
+            string hostname = (await this.GetMappedDvarValueOrDefaultAsync<string>("sv_hostname", "hostname", infoResponse)).Value;
-            var mapname = (await this.GetMappedDvarValueOrDefaultAsync<string>("mapname", infoResponse: infoResponse, token: Manager.CancellationToken)).Value;
+            string mapname = (await this.GetMappedDvarValueOrDefaultAsync<string>("mapname", infoResponse: infoResponse)).Value;
-            var maxplayers = (await this.GetMappedDvarValueOrDefaultAsync<int>("sv_maxclients", infoResponse: infoResponse, token: Manager.CancellationToken)).Value;
+            int maxplayers = (await this.GetMappedDvarValueOrDefaultAsync<int>("sv_maxclients", infoResponse: infoResponse)).Value;
-            var gametype = (await this.GetMappedDvarValueOrDefaultAsync<string>("g_gametype", "gametype", infoResponse, token: Manager.CancellationToken)).Value;
+            string gametype = (await this.GetMappedDvarValueOrDefaultAsync<string>("g_gametype", "gametype", infoResponse)).Value;
-            var basepath = await this.GetMappedDvarValueOrDefaultAsync<string>("fs_basepath", token: Manager.CancellationToken);
+            var basepath = await this.GetMappedDvarValueOrDefaultAsync<string>("fs_basepath");
-            var basegame = await this.GetMappedDvarValueOrDefaultAsync<string>("fs_basegame", token: Manager.CancellationToken);
+            var basegame = await this.GetMappedDvarValueOrDefaultAsync<string>("fs_basegame");
-            var homepath = await this.GetMappedDvarValueOrDefaultAsync<string>("fs_homepath", token: Manager.CancellationToken);
+            var homepath = await this.GetMappedDvarValueOrDefaultAsync<string>("fs_homepath");
-            var game = await this.GetMappedDvarValueOrDefaultAsync<string>("fs_game", infoResponse: infoResponse, token: Manager.CancellationToken);
+            var game = (await this.GetMappedDvarValueOrDefaultAsync<string>("fs_game", infoResponse: infoResponse));
-            var logfile = await this.GetMappedDvarValueOrDefaultAsync<string>("g_log", token: Manager.CancellationToken);
+            var logfile = await this.GetMappedDvarValueOrDefaultAsync<string>("g_log");
-            var logsync = await this.GetMappedDvarValueOrDefaultAsync<int>("g_logsync", token: Manager.CancellationToken);
+            var logsync = await this.GetMappedDvarValueOrDefaultAsync<int>("g_logsync");
-            var ip = await this.GetMappedDvarValueOrDefaultAsync<string>("net_ip", token: Manager.CancellationToken);
+            var ip = await this.GetMappedDvarValueOrDefaultAsync<string>("net_ip");
-            var gamePassword = await this.GetMappedDvarValueOrDefaultAsync("g_password", overrideDefault: "", token: Manager.CancellationToken);
+            var gamePassword = await this.GetMappedDvarValueOrDefaultAsync("g_password", overrideDefault: "");
 
             if (Manager.GetApplicationSettings().Configuration().EnableCustomSayName)
             {
-                await this.SetDvarAsync("sv_sayname", Manager.GetApplicationSettings().Configuration().CustomSayName,
+                await this.SetDvarAsync("sv_sayname", Manager.GetApplicationSettings().Configuration().CustomSayName);
-                    Manager.CancellationToken);
             }
 
             try
             {
-                var website = await this.GetMappedDvarValueOrDefaultAsync<string>("_website", token: Manager.CancellationToken);
+                var website = await this.GetMappedDvarValueOrDefaultAsync<string>("_website");
 
                 // this occurs for games that don't give us anything back when
                 // the dvar is not set
@@ -1295,14 +1186,14 @@ namespace IW4MAdmin
 
                 if (logsync.Value == 0)
                 {
-                    await this.SetDvarAsync("g_logsync", 2, Manager.CancellationToken); // set to 2 for continous in other games, clamps to 1 for IW4
+                    await this.SetDvarAsync("g_logsync", 2); // set to 2 for continous in other games, clamps to 1 for IW4
                     needsRestart = true;
                 }
 
                 if (string.IsNullOrWhiteSpace(logfile.Value))
                 {
                     logfile.Value = "games_mp.log";
-                    await this.SetDvarAsync("g_log", logfile.Value, Manager.CancellationToken);
+                    await this.SetDvarAsync("g_log", logfile.Value);
                     needsRestart = true;
                 }
 
@@ -1314,7 +1205,7 @@ namespace IW4MAdmin
                 }
 
                 // this DVAR isn't set until the a map is loaded
-                await this.SetDvarAsync("logfile", 2, Manager.CancellationToken);
+                await this.SetDvarAsync("logfile", 2);
             }
 
             CustomCallback = await ScriptLoaded();
@@ -1516,11 +1407,6 @@ namespace IW4MAdmin
 
             ServerLogger.LogDebug("Creating tempban penalty for {TargetClient}", targetClient.ToString());
             await newPenalty.TryCreatePenalty(Manager.GetPenaltyService(), ServerLogger);
-            
-            foreach (var reports in Manager.GetServers().Select(server => server.Reports))
-            {
-                reports.RemoveAll(report => report.Target.ClientId == targetClient.ClientId);
-            }
 
             if (activeClient.IsIngame)
             {
@@ -1544,6 +1430,7 @@ namespace IW4MAdmin
                 Offender = targetClient,
                 Offense = reason,
                 Punisher = originClient,
+                Link = targetClient.AliasLink,
                 IsEvadedOffense = isEvade
             };
 
@@ -1551,11 +1438,6 @@ namespace IW4MAdmin
             activeClient.SetLevel(Permission.Banned, originClient);
             await newPenalty.TryCreatePenalty(Manager.GetPenaltyService(), ServerLogger);
 
-            foreach (var reports in Manager.GetServers().Select(server => server.Reports))
-            {
-                reports.RemoveAll(report => report.Target.ClientId == targetClient.ClientId);
-            }
-
             if (activeClient.IsIngame)
             {
                 ServerLogger.LogDebug("Attempting to kicking newly banned client {ActiveClient}", activeClient.ToString());
@@ -1583,8 +1465,7 @@ namespace IW4MAdmin
 
             ServerLogger.LogDebug("Creating unban penalty for {targetClient}", targetClient.ToString());
             targetClient.SetLevel(Permission.User, originClient);
-            await Manager.GetPenaltyService().RemoveActivePenalties(targetClient.AliasLink.AliasLinkId,
+            await Manager.GetPenaltyService().RemoveActivePenalties(targetClient.AliasLink.AliasLinkId);
-                targetClient.NetworkId, targetClient.GameName, targetClient.CurrentAlias?.IPAddress);
             await Manager.GetPenaltyService().Create(unbanPenalty);
         }
 

Application/Main.cs

@@ -18,7 +18,6 @@ using SharedLibraryCore.Repositories;
 using SharedLibraryCore.Services;
 using Stats.Dtos;
 using System;
-using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Text;
@@ -27,7 +26,6 @@ using System.Threading.Tasks;
 using Data.Abstractions;
 using Data.Helpers;
 using Integrations.Source.Extensions;
-using IW4MAdmin.Application.Alerts;
 using IW4MAdmin.Application.Extensions;
 using IW4MAdmin.Application.Localization;
 using Microsoft.Extensions.Logging;
@@ -36,17 +34,16 @@ using IW4MAdmin.Plugins.Stats.Client.Abstractions;
 using IW4MAdmin.Plugins.Stats.Client;
 using Stats.Client.Abstractions;
 using Stats.Client;
-using Stats.Config;
 using Stats.Helpers;
 
 namespace IW4MAdmin.Application
 {
     public class Program
     {
-        public static BuildNumber Version { get; } = BuildNumber.Parse(Utilities.GetVersionAsString());
+        public static BuildNumber Version { get; private set; } = BuildNumber.Parse(Utilities.GetVersionAsString());
-        private static ApplicationManager _serverManager;
+        public static ApplicationManager ServerManager;
-        private static Task _applicationTask;
+        private static Task ApplicationTask;
-        private static ServiceProvider _serviceProvider;
+        private static ServiceProvider serviceProvider;
 
         /// <summary>
         /// entrypoint of the application
@@ -59,7 +56,7 @@ namespace IW4MAdmin.Application
             Console.OutputEncoding = Encoding.UTF8;
             Console.ForegroundColor = ConsoleColor.Gray;
 
-            Console.CancelKeyPress += OnCancelKey;
+            Console.CancelKeyPress += new ConsoleCancelEventHandler(OnCancelKey);
 
             Console.WriteLine("=====================================================");
             Console.WriteLine(" IW4MAdmin");
@@ -78,14 +75,10 @@ namespace IW4MAdmin.Application
         /// <param name="e"></param>
         private static async void OnCancelKey(object sender, ConsoleCancelEventArgs e)
         {
-            if (_serverManager is not null)
+            ServerManager?.Stop();
+            if (ApplicationTask != null)
             {
-                await _serverManager.Stop();
+                await ApplicationTask;
-            }
-
-            if (_applicationTask is not null)
-            {
-                await _applicationTask;
             }
         }
 
@@ -99,8 +92,9 @@ namespace IW4MAdmin.Application
             ITranslationLookup translationLookup = null;
             var logger = BuildDefaultLogger<Program>(new ApplicationConfiguration());
             Utilities.DefaultLogger = logger;
-            logger.LogInformation("Begin IW4MAdmin startup. Version is {Version} {@Args}", Version, args);
+            IServiceCollection services = null;
-            
+            logger.LogInformation("Begin IW4MAdmin startup. Version is {version} {@args}", Version, args);
+
             try
             {
                 // do any needed housekeeping file/folder migrations
@@ -108,30 +102,22 @@ namespace IW4MAdmin.Application
                 ConfigurationMigration.CheckDirectories();
                 ConfigurationMigration.RemoveObsoletePlugins20210322();
                 logger.LogDebug("Configuring services...");
-                var services = await ConfigureServices(args);
+                services = ConfigureServices(args);
-                _serviceProvider = services.BuildServiceProvider();
+                serviceProvider = services.BuildServiceProvider();
-                var versionChecker = _serviceProvider.GetRequiredService<IMasterCommunication>();
+                var versionChecker = serviceProvider.GetRequiredService<IMasterCommunication>();
-                _serverManager = (ApplicationManager) _serviceProvider.GetRequiredService<IManager>();
+                ServerManager = (ApplicationManager) serviceProvider.GetRequiredService<IManager>();
-                translationLookup = _serviceProvider.GetRequiredService<ITranslationLookup>();
+                translationLookup = serviceProvider.GetRequiredService<ITranslationLookup>();
 
-                _applicationTask = RunApplicationTasksAsync(logger, services);
+                await versionChecker.CheckVersion();
-                var tasks = new[]
+                await ServerManager.Init();
-                {
-                    versionChecker.CheckVersion(),
-                    _applicationTask
-                };
-
-                await _serverManager.Init();
-
-                await Task.WhenAll(tasks);
             }
 
             catch (Exception e)
             {
-                var failMessage = translationLookup == null
+                string failMessage = translationLookup == null
                     ? "Failed to initialize IW4MAdmin"
                     : translationLookup["MANAGER_INIT_FAIL"];
-                var exitMessage = translationLookup == null
+                string exitMessage = translationLookup == null
                     ? "Press enter to exit..."
                     : translationLookup["MANAGER_EXIT"];
 
@@ -145,10 +131,13 @@ namespace IW4MAdmin.Application
 
                 if (e is ConfigurationException configException)
                 {
-                    Console.WriteLine("{{fileName}} contains an error."
+                    if (translationLookup != null)
-                        .FormatExt(Path.GetFileName(configException.ConfigurationFileName)));
+                    {
+                        Console.WriteLine(translationLookup[configException.Message]
+                            .FormatExt(configException.ConfigurationFileName));
+                    }
 
-                    foreach (var error in configException.Errors)
+                    foreach (string error in configException.Errors)
                     {
                         Console.WriteLine(error);
                     }
@@ -159,22 +148,32 @@ namespace IW4MAdmin.Application
                     Console.WriteLine(e.Message);
                 }
 
-                if (_serverManager is not null)
-                {
-                    await _serverManager?.Stop();
-                }
-
                 Console.WriteLine(exitMessage);
                 await Console.In.ReadAsync(new char[1], 0, 1);
                 return;
             }
 
-            if (_serverManager.IsRestartRequested)
+            try
+            {
+                ApplicationTask = RunApplicationTasksAsync(logger, services);
+                await ApplicationTask;
+            }
+
+            catch (Exception e)
+            {
+                logger.LogCritical(e, "Failed to launch IW4MAdmin");
+                string failMessage = translationLookup == null
+                    ? "Failed to launch IW4MAdmin"
+                    : translationLookup["MANAGER_INIT_FAIL"];
+                Console.WriteLine($"{failMessage}: {e.GetExceptionInfo()}");
+            }
+
+            if (ServerManager.IsRestartRequested)
             {
                 goto restart;
             }
 
-            await _serviceProvider.DisposeAsync();
+            serviceProvider.Dispose();
         }
 
         /// <summary>
@@ -183,26 +182,24 @@ namespace IW4MAdmin.Application
         /// <returns></returns>
         private static async Task RunApplicationTasksAsync(ILogger logger, IServiceCollection services)
         {
-            var webfrontTask = _serverManager.GetApplicationSettings().Configuration().EnableWebFront
+            var webfrontTask = ServerManager.GetApplicationSettings().Configuration().EnableWebFront
-                ? WebfrontCore.Program.Init(_serverManager, _serviceProvider, services, _serverManager.CancellationToken)
+                ? WebfrontCore.Program.Init(ServerManager, serviceProvider, services, ServerManager.CancellationToken)
                 : Task.CompletedTask;
 
-            var collectionService = _serviceProvider.GetRequiredService<IServerDataCollector>();
+            var collectionService = serviceProvider.GetRequiredService<IServerDataCollector>();
 
             // we want to run this one on a manual thread instead of letting the thread pool handle it,
             // because we can't exit early from waiting on console input, and it prevents us from restarting
-            async void ReadInput() => await ReadConsoleInput(logger);
+            var inputThread = new Thread(async () => await ReadConsoleInput(logger));
-
-            var inputThread = new Thread(ReadInput);
             inputThread.Start();
 
             var tasks = new[]
             {
+                ServerManager.Start(),
                 webfrontTask,
-                _serverManager.Start(),
+                serviceProvider.GetRequiredService<IMasterCommunication>()
-                _serviceProvider.GetRequiredService<IMasterCommunication>()
+                    .RunUploadStatus(ServerManager.CancellationToken),
-                    .RunUploadStatus(_serverManager.CancellationToken),
+                collectionService.BeginCollectionAsync(cancellationToken: ServerManager.CancellationToken)
-                collectionService.BeginCollectionAsync(cancellationToken: _serverManager.CancellationToken)
             };
 
             logger.LogDebug("Starting webfront and input tasks");
@@ -211,7 +208,8 @@ namespace IW4MAdmin.Application
             logger.LogInformation("Shutdown completed successfully");
             Console.WriteLine(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_SHUTDOWN_SUCCESS"]);
         }
-        
+
+
         /// <summary>
         /// reads input from the console and executes entered commands on the default server
         /// </summary>
@@ -224,41 +222,32 @@ namespace IW4MAdmin.Application
                 return;
             }
 
-            EFClient origin = null;
+            string lastCommand;
+            var Origin = Utilities.IW4MAdminClient(ServerManager.Servers[0]);
 
             try
             {
-                while (!_serverManager.CancellationToken.IsCancellationRequested)
+                while (!ServerManager.CancellationToken.IsCancellationRequested)
                 {
-                    if (!_serverManager.IsInitialized)
+                    lastCommand = await Console.In.ReadLineAsync();
+
+                    if (lastCommand?.Length > 0)
                     {
-                        await Task.Delay(1000);
+                        if (lastCommand?.Length > 0)
-                        continue;
+                        {
+                            GameEvent E = new GameEvent()
+                            {
+                                Type = GameEvent.EventType.Command,
+                                Data = lastCommand,
+                                Origin = Origin,
+                                Owner = ServerManager.Servers[0]
+                            };
+
+                            ServerManager.AddEvent(E);
+                            await E.WaitAsync(Utilities.DefaultCommandTimeout, ServerManager.CancellationToken);
+                            Console.Write('>');
+                        }
                     }
-                    
-                    var lastCommand = await Console.In.ReadLineAsync();
-
-                    if (lastCommand == null)
-                    {
-                        continue;
-                    }
-
-                    if (!lastCommand.Any())
-                    {
-                        continue;
-                    }
-
-                    var gameEvent = new GameEvent
-                    {
-                        Type = GameEvent.EventType.Command,
-                        Data = lastCommand,
-                        Origin = origin ??= Utilities.IW4MAdminClient(_serverManager.Servers.FirstOrDefault()),
-                        Owner = _serverManager.Servers[0]
-                    };
-
-                    _serverManager.AddEvent(gameEvent);
-                    await gameEvent.WaitAsync(Utilities.DefaultCommandTimeout, _serverManager.CancellationToken);
-                    Console.Write('>');
                 }
             }
             catch (OperationCanceledException)
@@ -286,10 +275,10 @@ namespace IW4MAdmin.Application
 
             // register the native commands
             foreach (var commandType in typeof(SharedLibraryCore.Commands.QuitCommand).Assembly.GetTypes()
-                .Concat(typeof(Program).Assembly.GetTypes().Where(type => type.Namespace?.StartsWith("IW4MAdmin.Application.Commands") ?? false))
+                .Concat(typeof(Program).Assembly.GetTypes().Where(type => type.Namespace == "IW4MAdmin.Application.Commands"))
-                .Where(command => command.BaseType == typeof(Command)))
+                .Where(_command => _command.BaseType == typeof(Command)))
             {
-                defaultLogger.LogDebug("Registered native command type {Name}", commandType.Name);
+                defaultLogger.LogDebug("Registered native command type {name}", commandType.Name);
                 serviceCollection.AddSingleton(typeof(IManagerCommand), commandType);
             }
 
@@ -297,40 +286,40 @@ namespace IW4MAdmin.Application
             var (plugins, commands, configurations) = pluginImporter.DiscoverAssemblyPluginImplementations();
             foreach (var pluginType in plugins)
             {
-                defaultLogger.LogDebug("Registered plugin type {Name}", pluginType.FullName);
+                defaultLogger.LogDebug("Registered plugin type {name}", pluginType.FullName);
                 serviceCollection.AddSingleton(typeof(IPlugin), pluginType);
             }
 
             // register the plugin commands
             foreach (var commandType in commands)
             {
-                defaultLogger.LogDebug("Registered plugin command type {Name}", commandType.FullName);
+                defaultLogger.LogDebug("Registered plugin command type {name}", commandType.FullName);
                 serviceCollection.AddSingleton(typeof(IManagerCommand), commandType);
             }
 
             foreach (var configurationType in configurations)
             {
-                defaultLogger.LogDebug("Registered plugin config type {Name}", configurationType.Name);
+                defaultLogger.LogDebug("Registered plugin config type {name}", configurationType.Name);
                 var configInstance = (IBaseConfiguration) Activator.CreateInstance(configurationType);
                 var handlerType = typeof(BaseConfigurationHandler<>).MakeGenericType(configurationType);
-                var handlerInstance = Activator.CreateInstance(handlerType, configInstance.Name());
+                var handlerInstance = Activator.CreateInstance(handlerType, new[] {configInstance.Name()});
                 var genericInterfaceType = typeof(IConfigurationHandler<>).MakeGenericType(configurationType);
                 
                 serviceCollection.AddSingleton(genericInterfaceType, handlerInstance);
             }
 
             // register any script plugins
-            foreach (var plugin in pluginImporter.DiscoverScriptPlugins())
+            foreach (var scriptPlugin in pluginImporter.DiscoverScriptPlugins())
             {
-                serviceCollection.AddSingleton(plugin);
+                serviceCollection.AddSingleton(scriptPlugin);
             }
 
             // register any eventable types
             foreach (var assemblyType in typeof(Program).Assembly.GetTypes()
-                .Where(asmType => typeof(IRegisterEvent).IsAssignableFrom(asmType))
+                .Where(_asmType => typeof(IRegisterEvent).IsAssignableFrom(_asmType))
-                .Union(plugins.SelectMany(asm => asm.Assembly.GetTypes())
+                .Union(plugins.SelectMany(_asm => _asm.Assembly.GetTypes())
                     .Distinct()
-                    .Where(asmType => typeof(IRegisterEvent).IsAssignableFrom(asmType))))
+                    .Where(_asmType => typeof(IRegisterEvent).IsAssignableFrom(_asmType))))
             {
                 var instance = Activator.CreateInstance(assemblyType) as IRegisterEvent;
                 serviceCollection.AddSingleton(instance);
@@ -343,21 +332,12 @@ namespace IW4MAdmin.Application
         /// <summary>
         /// Configures the dependency injection services
         /// </summary>
-        private static async Task<IServiceCollection> ConfigureServices(string[] args)
+        private static IServiceCollection ConfigureServices(string[] args)
         {
-            // todo: this is a quick fix
-            AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
-
             // setup the static resources (config/master api/translations)
             var serviceCollection = new ServiceCollection();
             var appConfigHandler = new BaseConfigurationHandler<ApplicationConfiguration>("IW4MAdminSettings");
-            await appConfigHandler.BuildAsync();
             var defaultConfigHandler = new BaseConfigurationHandler<DefaultSettings>("DefaultSettings");
-            await defaultConfigHandler.BuildAsync();
-            var commandConfigHandler = new BaseConfigurationHandler<CommandConfiguration>("CommandConfiguration");
-            await commandConfigHandler.BuildAsync();
-            var statsCommandHandler = new BaseConfigurationHandler<StatsConfiguration>("StatsPluginSettings");
-            await statsCommandHandler.BuildAsync();
             var defaultConfig = defaultConfigHandler.Configuration();
             var appConfig = appConfigHandler.Configuration();
             var masterUri = Utilities.IsDevelopment
@@ -375,7 +355,7 @@ namespace IW4MAdmin.Application
             {
                 appConfig = (ApplicationConfiguration) new ApplicationConfiguration().Generate();
                 appConfigHandler.Set(appConfig);
-                await appConfigHandler.Save();
+                appConfigHandler.Save();
             }
 
             // register override level names
@@ -393,14 +373,15 @@ namespace IW4MAdmin.Application
             serviceCollection
                 .AddBaseLogger(appConfig)
                 .AddSingleton(defaultConfig)
-                .AddSingleton<IServiceCollection>(serviceCollection)
+                .AddSingleton<IServiceCollection>(_serviceProvider => serviceCollection)
                 .AddSingleton<IConfigurationHandler<DefaultSettings>, BaseConfigurationHandler<DefaultSettings>>()
                 .AddSingleton((IConfigurationHandler<ApplicationConfiguration>) appConfigHandler)
-                .AddSingleton<IConfigurationHandler<CommandConfiguration>>(commandConfigHandler)
+                .AddSingleton(
+                    new BaseConfigurationHandler<CommandConfiguration>("CommandConfiguration") as
+                        IConfigurationHandler<CommandConfiguration>)
                 .AddSingleton(appConfig)
-                .AddSingleton(statsCommandHandler.Configuration() ?? new StatsConfiguration())
+                .AddSingleton(_serviceProvider =>
-                .AddSingleton(serviceProvider =>
+                    _serviceProvider.GetRequiredService<IConfigurationHandler<CommandConfiguration>>()
-                    serviceProvider.GetRequiredService<IConfigurationHandler<CommandConfiguration>>()
                         .Configuration() ?? new CommandConfiguration())
                 .AddSingleton<IPluginImporter, PluginImporter>()
                 .AddSingleton<IMiddlewareActionHandler, MiddlewareActionHandler>()
@@ -413,10 +394,7 @@ namespace IW4MAdmin.Application
                 .AddSingleton<IScriptCommandFactory, ScriptCommandFactory>()
                 .AddSingleton<IAuditInformationRepository, AuditInformationRepository>()
                 .AddSingleton<IEntityService<EFClient>, ClientService>()
-#pragma warning disable CS0618
                 .AddSingleton<IMetaService, MetaService>()
-#pragma warning restore CS0618
-                .AddSingleton<IMetaServiceV2, MetaServiceV2>()
                 .AddSingleton<ClientService>()
                 .AddSingleton<PenaltyService>()
                 .AddSingleton<ChangeHistoryService>()
@@ -430,14 +408,11 @@ namespace IW4MAdmin.Application
                     UpdatedAliasResourceQueryHelper>()
                 .AddSingleton<IResourceQueryHelper<ChatSearchQuery, MessageResponse>, ChatResourceQueryHelper>()
                 .AddSingleton<IResourceQueryHelper<ClientPaginationRequest, ConnectionHistoryResponse>, ConnectionsResourceQueryHelper>()
-                .AddSingleton<IResourceQueryHelper<ClientPaginationRequest, PermissionLevelChangedResponse>, PermissionLevelChangedResourceQueryHelper>()
                 .AddTransient<IParserPatternMatcher, ParserPatternMatcher>()
                 .AddSingleton<IRemoteAssemblyHandler, RemoteAssemblyHandler>()
                 .AddSingleton<IMasterCommunication, MasterCommunication>()
                 .AddSingleton<IManager, ApplicationManager>()
-#pragma warning disable CS0612
                 .AddSingleton<SharedLibraryCore.Interfaces.ILogger, Logger>()
-#pragma warning restore CS0612
                 .AddSingleton<IClientNoticeMessageFormatter, ClientNoticeMessageFormatter>()
                 .AddSingleton<IClientStatisticCalculator, HitCalculator>()
                 .AddSingleton<IServerDistributionCalculator, ServerDistributionCalculator>()
@@ -448,9 +423,6 @@ namespace IW4MAdmin.Application
                 .AddSingleton<IServerDataViewer, ServerDataViewer>()
                 .AddSingleton<IServerDataCollector, ServerDataCollector>()
                 .AddSingleton<IEventPublisher, EventPublisher>()
-                .AddSingleton<IGeoLocationService>(new GeoLocationService(Path.Join(".", "Resources", "GeoLite2-Country.mmdb")))
-                .AddSingleton<IAlertManager, AlertManager>()
-                .AddTransient<IScriptPluginTimerHelper, ScriptPluginTimerHelper>()
                 .AddSingleton(translationLookup)
                 .AddDatabaseContextOptions(appConfig);
 
@@ -477,4 +449,4 @@ namespace IW4MAdmin.Application
             return collection.GetRequiredService<ILogger<T>>();
         }
     }
-}
+}

Application/Meta/MetaRegistration.cs

@@ -5,7 +5,6 @@ using SharedLibraryCore.Interfaces;
 using SharedLibraryCore.QueryHelper;
 using System;
 using System.Collections.Generic;
-using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
@@ -16,28 +15,19 @@ namespace IW4MAdmin.Application.Meta
     {
         private readonly ILogger _logger;
         private ITranslationLookup _transLookup;
-        private readonly IMetaServiceV2 _metaService;
+        private readonly IMetaService _metaService;
         private readonly IEntityService<EFClient> _clientEntityService;
         private readonly IResourceQueryHelper<ClientPaginationRequest, ReceivedPenaltyResponse> _receivedPenaltyHelper;
-
+        private readonly IResourceQueryHelper<ClientPaginationRequest, AdministeredPenaltyResponse> _administeredPenaltyHelper;
-        private readonly IResourceQueryHelper<ClientPaginationRequest, AdministeredPenaltyResponse>
-            _administeredPenaltyHelper;
-
         private readonly IResourceQueryHelper<ClientPaginationRequest, UpdatedAliasResponse> _updatedAliasHelper;
-
         private readonly IResourceQueryHelper<ClientPaginationRequest, ConnectionHistoryResponse>
             _connectionHistoryHelper;
 
-        private readonly IResourceQueryHelper<ClientPaginationRequest, PermissionLevelChangedResponse>
+        public MetaRegistration(ILogger<MetaRegistration> logger, IMetaService metaService, ITranslationLookup transLookup, IEntityService<EFClient> clientEntityService,
-            _permissionLevelHelper;
-
-        public MetaRegistration(ILogger<MetaRegistration> logger, IMetaServiceV2 metaService,
-            ITranslationLookup transLookup, IEntityService<EFClient> clientEntityService,
             IResourceQueryHelper<ClientPaginationRequest, ReceivedPenaltyResponse> receivedPenaltyHelper,
             IResourceQueryHelper<ClientPaginationRequest, AdministeredPenaltyResponse> administeredPenaltyHelper,
             IResourceQueryHelper<ClientPaginationRequest, UpdatedAliasResponse> updatedAliasHelper,
-            IResourceQueryHelper<ClientPaginationRequest, ConnectionHistoryResponse> connectionHistoryHelper,
+            IResourceQueryHelper<ClientPaginationRequest, ConnectionHistoryResponse> connectionHistoryHelper)
-            IResourceQueryHelper<ClientPaginationRequest, PermissionLevelChangedResponse> permissionLevelHelper)
         {
             _logger = logger;
             _transLookup = transLookup;
@@ -47,31 +37,21 @@ namespace IW4MAdmin.Application.Meta
             _administeredPenaltyHelper = administeredPenaltyHelper;
             _updatedAliasHelper = updatedAliasHelper;
             _connectionHistoryHelper = connectionHistoryHelper;
-            _permissionLevelHelper = permissionLevelHelper;
         }
 
         public void Register()
         {
-            _metaService.AddRuntimeMeta<ClientPaginationRequest, InformationResponse>(MetaType.Information,
+            _metaService.AddRuntimeMeta<ClientPaginationRequest, InformationResponse>(MetaType.Information, GetProfileMeta);
-                GetProfileMeta);
+            _metaService.AddRuntimeMeta<ClientPaginationRequest, ReceivedPenaltyResponse>(MetaType.ReceivedPenalty, GetReceivedPenaltiesMeta);
-            _metaService.AddRuntimeMeta<ClientPaginationRequest, ReceivedPenaltyResponse>(MetaType.ReceivedPenalty,
+            _metaService.AddRuntimeMeta<ClientPaginationRequest, AdministeredPenaltyResponse>(MetaType.Penalized, GetAdministeredPenaltiesMeta);
-                GetReceivedPenaltiesMeta);
+            _metaService.AddRuntimeMeta<ClientPaginationRequest, UpdatedAliasResponse>(MetaType.AliasUpdate, GetUpdatedAliasMeta);
-            _metaService.AddRuntimeMeta<ClientPaginationRequest, AdministeredPenaltyResponse>(MetaType.Penalized,
+            _metaService.AddRuntimeMeta<ClientPaginationRequest, ConnectionHistoryResponse>(MetaType.ConnectionHistory, GetConnectionHistoryMeta);
-                GetAdministeredPenaltiesMeta);
-            _metaService.AddRuntimeMeta<ClientPaginationRequest, UpdatedAliasResponse>(MetaType.AliasUpdate,
-                GetUpdatedAliasMeta);
-            _metaService.AddRuntimeMeta<ClientPaginationRequest, ConnectionHistoryResponse>(MetaType.ConnectionHistory,
-                GetConnectionHistoryMeta);
-            _metaService.AddRuntimeMeta<ClientPaginationRequest, PermissionLevelChangedResponse>(
-                MetaType.PermissionLevel, GetPermissionLevelMeta);
         }
 
-        private async Task<IEnumerable<InformationResponse>> GetProfileMeta(ClientPaginationRequest request,
+        private async Task<IEnumerable<InformationResponse>> GetProfileMeta(ClientPaginationRequest request)
-            CancellationToken cancellationToken = default)
         {
             var metaList = new List<InformationResponse>();
-            var lastMapMeta =
+            var lastMapMeta = await _metaService.GetPersistentMeta("LastMapPlayed", new EFClient() { ClientId = request.ClientId });
-                await _metaService.GetPersistentMeta("LastMapPlayed", request.ClientId, cancellationToken);
 
             if (lastMapMeta != null)
             {
@@ -83,12 +63,12 @@ namespace IW4MAdmin.Application.Meta
                     Value = lastMapMeta.Value,
                     ShouldDisplay = true,
                     Type = MetaType.Information,
+                    Column = 1,
                     Order = 6
                 });
             }
 
-            var lastServerMeta =
+            var lastServerMeta = await _metaService.GetPersistentMeta("LastServerPlayed", new EFClient() { ClientId = request.ClientId });
-                await _metaService.GetPersistentMeta("LastServerPlayed", request.ClientId, cancellationToken);
 
             if (lastServerMeta != null)
             {
@@ -100,7 +80,8 @@ namespace IW4MAdmin.Application.Meta
                     Value = lastServerMeta.Value,
                     ShouldDisplay = true,
                     Type = MetaType.Information,
-                    Order = 7
+                    Column = 0,
+                    Order = 6
                 });
             }
 
@@ -108,7 +89,7 @@ namespace IW4MAdmin.Application.Meta
 
             if (client == null)
             {
-                _logger.LogWarning("No client found with id {ClientId} when generating profile meta", request.ClientId);
+                _logger.LogWarning("No client found with id {clientId} when generating profile meta", request.ClientId);
                 return metaList;
             }
 
@@ -118,7 +99,8 @@ namespace IW4MAdmin.Application.Meta
                 Key = _transLookup["WEBFRONT_PROFILE_META_PLAY_TIME"],
                 Value = TimeSpan.FromHours(client.TotalConnectionTime / 3600.0).HumanizeForCurrentCulture(),
                 ShouldDisplay = true,
-                Order = 8,
+                Column = 1,
+                Order = 0,
                 Type = MetaType.Information
             });
 
@@ -128,7 +110,8 @@ namespace IW4MAdmin.Application.Meta
                 Key = _transLookup["WEBFRONT_PROFILE_META_FIRST_SEEN"],
                 Value = (DateTime.UtcNow - client.FirstConnection).HumanizeForCurrentCulture(),
                 ShouldDisplay = true,
-                Order = 9,
+                Column = 1,
+                Order = 1,
                 Type = MetaType.Information
             });
 
@@ -138,7 +121,8 @@ namespace IW4MAdmin.Application.Meta
                 Key = _transLookup["WEBFRONT_PROFILE_META_LAST_SEEN"],
                 Value = (DateTime.UtcNow - client.LastConnection).HumanizeForCurrentCulture(),
                 ShouldDisplay = true,
-                Order = 10,
+                Column = 1,
+                Order = 2,
                 Type = MetaType.Information
             });
 
@@ -146,10 +130,10 @@ namespace IW4MAdmin.Application.Meta
             {
                 ClientId = client.ClientId,
                 Key = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_CONNECTIONS"],
-                Value = client.Connections.ToString("#,##0",
+                Value = client.Connections.ToString("#,##0", new System.Globalization.CultureInfo(Utilities.CurrentLocalization.LocalizationName)),
-                    new System.Globalization.CultureInfo(Utilities.CurrentLocalization.LocalizationName)),
                 ShouldDisplay = true,
-                Order = 11,
+                Column = 1,
+                Order = 3,
                 Type = MetaType.Information
             });
 
@@ -157,50 +141,38 @@ namespace IW4MAdmin.Application.Meta
             {
                 ClientId = client.ClientId,
                 Key = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_MASKED"],
-                Value = client.Masked
+                Value = client.Masked ? Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_TRUE"] : Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_FALSE"],
-                    ? Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_TRUE"]
-                    : Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_FALSE"],
                 IsSensitive = true,
-                Order = 12,
+                Column = 1,
+                Order = 4,
                 Type = MetaType.Information
             });
 
             return metaList;
         }
 
-        private async Task<IEnumerable<ReceivedPenaltyResponse>> GetReceivedPenaltiesMeta(
+        private async Task<IEnumerable<ReceivedPenaltyResponse>> GetReceivedPenaltiesMeta(ClientPaginationRequest request)
-            ClientPaginationRequest request, CancellationToken token = default)
         {
             var penalties = await _receivedPenaltyHelper.QueryResource(request);
             return penalties.Results;
         }
 
-        private async Task<IEnumerable<AdministeredPenaltyResponse>> GetAdministeredPenaltiesMeta(
+        private async Task<IEnumerable<AdministeredPenaltyResponse>> GetAdministeredPenaltiesMeta(ClientPaginationRequest request)
-            ClientPaginationRequest request, CancellationToken token = default)
         {
             var penalties = await _administeredPenaltyHelper.QueryResource(request);
             return penalties.Results;
         }
 
-        private async Task<IEnumerable<UpdatedAliasResponse>> GetUpdatedAliasMeta(ClientPaginationRequest request,
+        private async Task<IEnumerable<UpdatedAliasResponse>> GetUpdatedAliasMeta(ClientPaginationRequest request)
-            CancellationToken token = default)
         {
             var aliases = await _updatedAliasHelper.QueryResource(request);
             return aliases.Results;
         }
-
+        
-        private async Task<IEnumerable<ConnectionHistoryResponse>> GetConnectionHistoryMeta(
+        private async Task<IEnumerable<ConnectionHistoryResponse>> GetConnectionHistoryMeta(ClientPaginationRequest request)
-            ClientPaginationRequest request, CancellationToken token = default)
         {
             var connections = await _connectionHistoryHelper.QueryResource(request);
             return connections.Results;
         }
-
-        private async Task<IEnumerable<PermissionLevelChangedResponse>> GetPermissionLevelMeta(
-            ClientPaginationRequest request, CancellationToken token = default)
-        {
-            var permissionChanges = await _permissionLevelHelper.QueryResource(request);
-            return permissionChanges.Results;
-        }
     }
 }

Application/Meta/PermissionLevelChangedResourceQueryHelper.cs

@@ -1,51 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using Data.Abstractions;
-using Data.Models;
-using Microsoft.EntityFrameworkCore;
-using SharedLibraryCore.Dtos.Meta.Responses;
-using SharedLibraryCore.Helpers;
-using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.QueryHelper;
-
-namespace IW4MAdmin.Application.Meta;
-
-public class
-    PermissionLevelChangedResourceQueryHelper : IResourceQueryHelper<ClientPaginationRequest,
-        PermissionLevelChangedResponse>
-{
-    private readonly IDatabaseContextFactory _contextFactory;
-
-    public PermissionLevelChangedResourceQueryHelper(IDatabaseContextFactory contextFactory)
-    {
-        _contextFactory = contextFactory;
-    }
-
-    public async Task<ResourceQueryHelperResult<PermissionLevelChangedResponse>> QueryResource(
-        ClientPaginationRequest query)
-    {
-        await using var context = _contextFactory.CreateContext();
-
-        var auditEntries = context.EFChangeHistory.Where(change => change.TargetEntityId == query.ClientId)
-            .Where(change => change.TypeOfChange == EFChangeHistory.ChangeType.Permission);
-
-        var audits = from change in auditEntries
-            join client in context.Clients
-                on change.OriginEntityId equals client.ClientId
-            select new PermissionLevelChangedResponse
-            {
-                ChangedById = change.OriginEntityId,
-                ChangedByName = client.CurrentAlias.Name,
-                PreviousPermissionLevelValue = change.PreviousValue,
-                CurrentPermissionLevelValue = change.CurrentValue,
-                When = change.TimeChanged,
-                ClientId = change.TargetEntityId,
-                IsSensitive = true
-            };
-
-        return new ResourceQueryHelperResult<PermissionLevelChangedResponse>
-        {
-            Results = await audits.Skip(query.Offset).Take(query.Count).ToListAsync()
-        };
-    }
-}

Application/Meta/ReceivedPenaltyResourceQueryHelper.cs

@@ -11,7 +11,6 @@ using SharedLibraryCore.Dtos.Meta.Responses;
 using SharedLibraryCore.Helpers;
 using SharedLibraryCore.Interfaces;
 using SharedLibraryCore.QueryHelper;
-using SharedLibraryCore.Services;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application.Meta
@@ -20,14 +19,13 @@ namespace IW4MAdmin.Application.Meta
     /// implementation of IResourceQueryHelper
     /// used to pull in penalties applied to a given client id
     /// </summary>
-    public class
+    public class ReceivedPenaltyResourceQueryHelper : IResourceQueryHelper<ClientPaginationRequest, ReceivedPenaltyResponse>
-        ReceivedPenaltyResourceQueryHelper : IResourceQueryHelper<ClientPaginationRequest, ReceivedPenaltyResponse>
     {
         private readonly ILogger _logger;
         private readonly IDatabaseContextFactory _contextFactory;
         private readonly ApplicationConfiguration _appConfig;
 
-        public ReceivedPenaltyResourceQueryHelper(ILogger<ReceivedPenaltyResourceQueryHelper> logger,
+        public ReceivedPenaltyResourceQueryHelper(ILogger<ReceivedPenaltyResourceQueryHelper> logger, 
             IDatabaseContextFactory contextFactory, ApplicationConfiguration appConfig)
         {
             _contextFactory = contextFactory;
@@ -35,58 +33,45 @@ namespace IW4MAdmin.Application.Meta
             _appConfig = appConfig;
         }
 
-        public async Task<ResourceQueryHelperResult<ReceivedPenaltyResponse>> QueryResource(
+        public async Task<ResourceQueryHelperResult<ReceivedPenaltyResponse>> QueryResource(ClientPaginationRequest query)
-            ClientPaginationRequest query)
         {
             var linkedPenaltyType = Utilities.LinkedPenaltyTypes();
             await using var ctx = _contextFactory.CreateContext(enableTracking: false);
 
             var linkId = await ctx.Clients.AsNoTracking()
-                .Where(_client => _client.ClientId == query.ClientId)
+                    .Where(_client => _client.ClientId == query.ClientId)
-                .Select(_client => new { _client.AliasLinkId, _client.CurrentAliasId })
+                    .Select(_client => new {_client.AliasLinkId, _client.CurrentAliasId })
-                .FirstOrDefaultAsync();
+                    .FirstOrDefaultAsync();
 
             var iqPenalties = ctx.Penalties.AsNoTracking()
                 .Where(_penalty => _penalty.OffenderId == query.ClientId ||
                                    linkedPenaltyType.Contains(_penalty.Type) && _penalty.LinkId == linkId.AliasLinkId);
 
             IQueryable<EFPenalty> iqIpLinkedPenalties = null;
-            IQueryable<EFPenalty> identifierPenalties = null;
+            
-
             if (!_appConfig.EnableImplicitAccountLinking)
             {
                 var usedIps = await ctx.Aliases.AsNoTracking()
-                    .Where(alias =>
+                    .Where(alias => (alias.LinkId == linkId.AliasLinkId || alias.AliasId == linkId.CurrentAliasId) && alias.IPAddress != null)
-                        (alias.LinkId == linkId.AliasLinkId || alias.AliasId == linkId.CurrentAliasId) &&
-                        alias.IPAddress != null)
                     .Select(alias => alias.IPAddress).ToListAsync();
 
-                   identifierPenalties = ctx.PenaltyIdentifiers.AsNoTracking().Where(identifier =>
-                        identifier.IPv4Address != null && usedIps.Contains(identifier.IPv4Address))
-                    .Select(id => id.Penalty);
-
                 var aliasedIds = await ctx.Aliases.AsNoTracking().Where(alias => usedIps.Contains(alias.IPAddress))
                     .Select(alias => alias.LinkId)
                     .ToListAsync();
 
                 iqIpLinkedPenalties = ctx.Penalties.AsNoTracking()
                     .Where(penalty =>
-                        linkedPenaltyType.Contains(penalty.Type) && aliasedIds.Contains(penalty.LinkId ?? -1));
+                        linkedPenaltyType.Contains(penalty.Type) && aliasedIds.Contains(penalty.LinkId));
             }
 
             var iqAllPenalties = iqPenalties;
-
+            
             if (iqIpLinkedPenalties != null)
             {
                 iqAllPenalties = iqPenalties.Union(iqIpLinkedPenalties);
             }
 
-            if (identifierPenalties != null)
+             var penalties = await iqAllPenalties
-            {
-                iqAllPenalties = iqPenalties.Union(identifierPenalties);
-            }
-
-            var penalties = await iqAllPenalties
                 .Where(_penalty => _penalty.When < query.Before)
                 .OrderByDescending(_penalty => _penalty.When)
                 .Take(query.Count)
@@ -112,7 +97,7 @@ namespace IW4MAdmin.Application.Meta
             {
                 // todo: maybe actually count
                 RetrievedResultCount = penalties.Count,
-                Results = penalties.Distinct()
+                Results = penalties
             };
         }
     }

Application/Migration/ConfigurationMigration.cs

@@ -88,7 +88,7 @@ namespace IW4MAdmin.Application.Migration
 
         public static void RemoveObsoletePlugins20210322()
         {
-            var files = new[] {"StatsWeb.dll", "StatsWeb.Views.dll", "IW4ScriptCommands.dll"};
+            var files = new[] {"StatsWeb.dll", "StatsWeb.Views.dll"};
 
             foreach (var file in files)
             {

Application/Misc/AsyncResult.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Threading;
-
-namespace IW4MAdmin.Application.Misc;
-
-public class AsyncResult : IAsyncResult
-{
-    public object AsyncState { get; set; }
-    public WaitHandle AsyncWaitHandle { get; set; }
-    public bool CompletedSynchronously { get; set; }
-    public bool IsCompleted { get; set; }
-}

Application/Misc/BaseConfigurationHandler.cs

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

Application/Misc/EventPublisher.cs

@@ -10,7 +10,6 @@ namespace IW4MAdmin.Application.Misc
     {
         public event EventHandler<GameEvent> OnClientDisconnect;
         public event EventHandler<GameEvent> OnClientConnect;
-        public event EventHandler<GameEvent> OnClientMetaUpdated;
 
         private readonly ILogger _logger;
 
@@ -30,15 +29,10 @@ namespace IW4MAdmin.Application.Misc
                     OnClientConnect?.Invoke(this, gameEvent);
                 }
 
-                if (gameEvent.Type == GameEvent.EventType.Disconnect && gameEvent.Origin.ClientId != 0)
+                if (gameEvent.Type == GameEvent.EventType.Disconnect)
                 {
                     OnClientDisconnect?.Invoke(this, gameEvent);
                 }
-
-                if (gameEvent.Type == GameEvent.EventType.MetaUpdated)
-                {
-                    OnClientMetaUpdated?.Invoke(this, gameEvent);
-                }
             }
 
             catch (Exception ex)
@@ -47,4 +41,4 @@ namespace IW4MAdmin.Application.Misc
             }
         }
     }
-}
+}

Application/Misc/GeoLocationResult.cs

@@ -1,13 +0,0 @@
-using SharedLibraryCore.Interfaces;
-
-namespace IW4MAdmin.Application.Misc;
-
-public class GeoLocationResult : IGeoLocationResult
-{
-    public string Country { get; set; }
-    public string CountryCode { get; set; }
-    public string Region { get; set; }
-    public string ASN { get; set; }
-    public string Timezone { get; set; }
-    public string Organization { get; set; }
-}

Application/Misc/GeoLocationService.cs

@@ -1,40 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using MaxMind.GeoIP2;
-using MaxMind.GeoIP2.Responses;
-using SharedLibraryCore.Interfaces;
-
-namespace IW4MAdmin.Application.Misc;
-
-public class GeoLocationService : IGeoLocationService
-{
-    private readonly string _sourceAddress;
-    
-    public GeoLocationService(string sourceAddress)
-    {
-        _sourceAddress = sourceAddress;
-    }
-    
-    public Task<IGeoLocationResult> Locate(string address)
-    {
-        CountryResponse country = null;
-        
-        try
-        {
-            using var reader = new DatabaseReader(_sourceAddress);
-            reader.TryCountry(address, out country);
-        }
-        catch
-        {
-            // ignored
-        }
-
-        var response = new GeoLocationResult
-        {
-            Country = country?.Country.Name ?? "Unknown",
-            CountryCode = country?.Country.IsoCode ?? ""
-        };
-
-        return Task.FromResult((IGeoLocationResult)response);
-    }
-}

Application/Misc/MasterCommunication.cs

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

Application/Misc/MetaService.cs

@@ -18,7 +18,6 @@ namespace IW4MAdmin.Application.Misc
     /// implementation of IMetaService
     /// used to add and retrieve runtime and persistent meta
     /// </summary>
-    [Obsolete("Use MetaServiceV2")]
     public class MetaService : IMetaService
     {
         private readonly IDictionary<MetaType, List<dynamic>> _metaActions;
@@ -69,29 +68,6 @@ namespace IW4MAdmin.Application.Misc
             await ctx.SaveChangesAsync();
         }
 
-        public async Task SetPersistentMeta(string metaKey, string metaValue, int clientId)
-        {
-            await AddPersistentMeta(metaKey, metaValue, new EFClient { ClientId = clientId });
-        }
-
-        public async Task IncrementPersistentMeta(string metaKey, int incrementAmount, int clientId)
-        {
-            var existingMeta = await GetPersistentMeta(metaKey, new EFClient { ClientId = clientId });
-            
-            if (!long.TryParse(existingMeta?.Value ?? "0", out var existingValue))
-            {
-                existingValue = 0;
-            }
-
-            var newValue = existingValue + incrementAmount;
-            await SetPersistentMeta(metaKey, newValue.ToString(), clientId);
-        }
-
-        public async Task DecrementPersistentMeta(string metaKey, int decrementAmount, int clientId)
-        {
-            await IncrementPersistentMeta(metaKey, -decrementAmount, clientId);
-        }
-
         public async Task AddPersistentMeta(string metaKey, string metaValue)
         {
             await using var ctx = _contextFactory.CreateContext();
@@ -231,30 +207,42 @@ namespace IW4MAdmin.Application.Misc
 
         public async Task<IEnumerable<IClientMeta>> GetRuntimeMeta(ClientPaginationRequest request)
         {
-            var metas = await Task.WhenAll(_metaActions.Where(kvp => kvp.Key != MetaType.Information)
+            var meta = new List<IClientMeta>();
-                .Select(async kvp => await kvp.Value[0](request)));
 
-            return metas.SelectMany(m => (IEnumerable<IClientMeta>)m)
+            foreach (var (type, actions) in _metaActions)
-                .OrderByDescending(m => m.When)
+            {
+                // information is not listed chronologically
+                if (type != MetaType.Information)
+                {
+                    var metaItems = await actions[0](request);
+                    meta.AddRange(metaItems);
+                }
+            }
+
+            return meta.OrderByDescending(_meta => _meta.When)
                 .Take(request.Count)
                 .ToList();
         }
 
         public async Task<IEnumerable<T>> GetRuntimeMeta<T>(ClientPaginationRequest request, MetaType metaType) where T : IClientMeta
         {
+            IEnumerable<T> meta;
             if (metaType == MetaType.Information)
             {
                 var allMeta = new List<T>();
 
-                var completedMeta = await Task.WhenAll(_metaActions[metaType].Select(async individualMetaRegistration =>
+                foreach (var individualMetaRegistration in _metaActions[metaType])
-                    (IEnumerable<T>)await individualMetaRegistration(request)));
+                {
-                
+                    allMeta.AddRange(await individualMetaRegistration(request));
-                allMeta.AddRange(completedMeta.SelectMany(meta => meta));
+                }
-                
+
                 return ProcessInformationMeta(allMeta);
             }
 
-            var meta = await _metaActions[metaType][0](request) as IEnumerable<T>;
+            else
+            {
+                meta = await _metaActions[metaType][0](request) as IEnumerable<T>;
+            }
 
             return meta;
         }

Application/Misc/MetaServiceV2.cs

@@ -1,478 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
-using Data.Abstractions;
-using Data.Models;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using SharedLibraryCore;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Dtos;
-using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.QueryHelper;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
-
-namespace IW4MAdmin.Application.Misc;
-
-public class MetaServiceV2 : IMetaServiceV2
-{
-    private readonly IDictionary<MetaType, List<dynamic>> _metaActions;
-    private readonly IDatabaseContextFactory _contextFactory;
-    private readonly IServiceProvider _serviceProvider;
-    private readonly ILogger _logger;
-
-    public MetaServiceV2(ILogger<MetaServiceV2> logger, IDatabaseContextFactory contextFactory, IServiceProvider serviceProvider)
-    {
-        _logger = logger;
-        _metaActions = new Dictionary<MetaType, List<dynamic>>();
-        _contextFactory = contextFactory;
-        _serviceProvider = serviceProvider;
-    }
-
-    public async Task SetPersistentMeta(string metaKey, string metaValue, int clientId,
-        CancellationToken token = default)
-    {
-        if (!ValidArgs(metaKey, clientId))
-        {
-            return;
-        }
-
-        await using var context = _contextFactory.CreateContext();
-
-        var existingMeta = await context.EFMeta
-            .Where(meta => meta.Key == metaKey)
-            .Where(meta => meta.ClientId == clientId)
-            .FirstOrDefaultAsync(token);
-
-        if (existingMeta != null)
-        {
-            _logger.LogDebug("Updating existing meta with key {Key} and id {Id}", existingMeta.Key,
-                existingMeta.MetaId);
-            existingMeta.Value = metaValue;
-            existingMeta.Updated = DateTime.UtcNow;
-        }
-
-        else
-        {
-            _logger.LogDebug("Adding new meta with key {Key}", metaKey);
-            context.EFMeta.Add(new EFMeta
-            {
-                ClientId = clientId,
-                Created = DateTime.UtcNow,
-                Key = metaKey,
-                Value = metaValue,
-            });
-        }
-
-        await context.SaveChangesAsync(token);
-            
-            
-        var manager = _serviceProvider.GetRequiredService<IManager>();
-        var matchingClient = manager.GetActiveClients().FirstOrDefault(client => client.ClientId == clientId);
-        var server = matchingClient?.CurrentServer ?? manager.GetServers().FirstOrDefault();
-
-        if (server is not null)
-        {
-            manager.AddEvent(new GameEvent
-            {
-                Type = GameEvent.EventType.MetaUpdated,
-                Origin = matchingClient ?? new EFClient
-                {
-                    ClientId = clientId
-                },
-                Data = metaValue,
-                Extra = metaKey,
-                Owner = server
-            });
-        }
-    }
-
-    public async Task SetPersistentMetaValue<T>(string metaKey, T metaValue, int clientId,
-        CancellationToken token = default) where T : class
-    {
-        if (!ValidArgs(metaKey, clientId))
-        {
-            return;
-        }
-
-        string serializedValue;
-
-        try
-        {
-            serializedValue = JsonSerializer.Serialize(metaValue);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Could not serialize meta with key {Key}", metaKey);
-            return;
-        }
-
-        await SetPersistentMeta(metaKey, serializedValue, clientId, token);
-    }
-
-    public async Task SetPersistentMetaForLookupKey(string metaKey, string lookupKey, int lookupId, int clientId,
-        CancellationToken token = default)
-    {
-        if (!ValidArgs(metaKey, clientId))
-        {
-            return;
-        }
-
-        await using var context = _contextFactory.CreateContext();
-
-        var lookupMeta = await context.EFMeta.FirstOrDefaultAsync(meta => meta.Key == lookupKey, token);
-
-        if (lookupMeta is null)
-        {
-            _logger.LogWarning("No lookup meta exists for metaKey {MetaKey} and lookupKey {LookupKey}", metaKey,
-                lookupKey);
-            return;
-        }
-
-        var lookupValues = JsonSerializer.Deserialize<List<LookupValue<string>>>(lookupMeta.Value);
-
-        if (lookupValues is null)
-        {
-            return;
-        }
-
-        var foundLookup = lookupValues.FirstOrDefault(value => value.Id == lookupId);
-
-        if (foundLookup is null)
-        {
-            _logger.LogWarning("No lookup meta found for provided lookup id {MetaKey}, {LookupKey}, {LookupId}",
-                metaKey, lookupKey, lookupId);
-            return;
-        }
-
-        _logger.LogDebug("Setting meta for lookup {MetaKey}, {LookupKey}, {LookupId}",
-            metaKey, lookupKey, lookupId);
-
-        await SetPersistentMeta(metaKey, lookupId.ToString(), clientId, token);
-    }
-
-    public async Task IncrementPersistentMeta(string metaKey, int incrementAmount, int clientId,
-        CancellationToken token = default)
-    {
-        if (!ValidArgs(metaKey, clientId))
-        {
-            return;
-        }
-
-        var existingMeta = await GetPersistentMeta(metaKey, clientId, token);
-
-        if (!long.TryParse(existingMeta?.Value ?? "0", out var existingValue))
-        {
-            existingValue = 0;
-        }
-
-        var newValue = existingValue + incrementAmount;
-        await SetPersistentMeta(metaKey, newValue.ToString(), clientId, token);
-    }
-
-    public async Task DecrementPersistentMeta(string metaKey, int decrementAmount, int clientId,
-        CancellationToken token = default)
-    {
-        await IncrementPersistentMeta(metaKey, -decrementAmount, clientId, token);
-    }
-
-    public async Task<EFMeta> GetPersistentMeta(string metaKey, int clientId, CancellationToken token = default)
-    {
-        if (!ValidArgs(metaKey, clientId))
-        {
-            return null;
-        }
-
-        await using var ctx = _contextFactory.CreateContext(enableTracking: false);
-
-        return await ctx.EFMeta
-            .Where(meta => meta.Key == metaKey)
-            .Where(meta => meta.ClientId == clientId)
-            .Select(meta => new EFMeta
-            {
-                MetaId = meta.MetaId,
-                Key = meta.Key,
-                ClientId = meta.ClientId,
-                Value = meta.Value,
-            })
-            .FirstOrDefaultAsync(token);
-    }
-
-    public async Task<T> GetPersistentMetaValue<T>(string metaKey, int clientId, CancellationToken token = default)
-        where T : class
-    {
-        var meta = await GetPersistentMeta(metaKey, clientId, token);
-
-        if (meta is null)
-        {
-            return default;
-        }
-
-        try
-        {
-            return JsonSerializer.Deserialize<T>(meta.Value);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Could not deserialize meta with key {Key} and value {Value}", metaKey, meta.Value);
-            return default;
-        }
-    }
-
-    public async Task<EFMeta> GetPersistentMetaByLookup(string metaKey, string lookupKey, int clientId,
-        CancellationToken token = default)
-    {
-        await using var context = _contextFactory.CreateContext();
-
-        var metaValue = await GetPersistentMeta(metaKey, clientId, token);
-
-        if (metaValue is null)
-        {
-            _logger.LogDebug("No meta exists for key {Key}, clientId {ClientId}", metaKey, clientId);
-            return default;
-        }
-
-        var lookupMeta = await context.EFMeta.FirstOrDefaultAsync(meta => meta.Key == lookupKey, token);
-
-        if (lookupMeta is null)
-        {
-            _logger.LogWarning("No lookup meta exists for metaKey {MetaKey} and lookupKey {LookupKey}", metaKey,
-                lookupKey);
-            return default;
-        }
-
-        var lookupId = int.Parse(metaValue.Value);
-        var lookupValues = JsonSerializer.Deserialize<List<LookupValue<string>>>(lookupMeta.Value);
-
-        if (lookupValues is null)
-        {
-            return default;
-        }
-
-        var foundLookup = lookupValues.FirstOrDefault(value => value.Id == lookupId);
-
-        if (foundLookup is not null)
-        {
-            return new EFMeta
-            {
-                Created = metaValue.Created,
-                Updated = metaValue.Updated,
-                Extra = metaValue.Extra,
-                MetaId = metaValue.MetaId,
-                Value = foundLookup.Value
-            };
-        }
-
-        _logger.LogWarning("No lookup meta found for provided lookup id {MetaKey}, {LookupKey}, {LookupId}",
-            metaKey, lookupKey, lookupId);
-        return default;
-    }
-
-    public async Task RemovePersistentMeta(string metaKey, int clientId, CancellationToken token = default)
-    {
-        if (!ValidArgs(metaKey, clientId))
-        {
-            return;
-        }
-
-        await using var context = _contextFactory.CreateContext();
-
-        var existingMeta = await context.EFMeta
-            .FirstOrDefaultAsync(meta => meta.Key == metaKey && meta.ClientId == clientId, token);
-
-        if (existingMeta == null)
-        {
-            _logger.LogDebug("No meta with key {Key} found for client id {Id}", metaKey, clientId);
-            return;
-        }
-
-        _logger.LogDebug("Removing meta for key {Key} with id {Id}", metaKey, existingMeta.MetaId);
-        context.EFMeta.Remove(existingMeta);
-        await context.SaveChangesAsync(token);
-    }
-
-    public async Task SetPersistentMeta(string metaKey, string metaValue, CancellationToken token = default)
-    {
-        if (string.IsNullOrWhiteSpace(metaKey))
-        {
-            _logger.LogWarning("Cannot save meta with no key");
-            return;
-        }
-
-        await using var ctx = _contextFactory.CreateContext();
-
-        var existingMeta = await ctx.EFMeta
-            .Where(meta => meta.Key == metaKey)
-            .Where(meta => meta.ClientId == null)
-            .FirstOrDefaultAsync(token);
-
-        if (existingMeta is not null)
-        {
-            _logger.LogDebug("Updating existing meta with key {Key} and id {Id}", existingMeta.Key,
-                existingMeta.MetaId);
-
-            existingMeta.Value = metaValue;
-            existingMeta.Updated = DateTime.UtcNow;
-
-            await ctx.SaveChangesAsync(token);
-        }
-
-        else
-        {
-            _logger.LogDebug("Adding new meta with key {Key}", metaKey);
-
-            ctx.EFMeta.Add(new EFMeta
-            {
-                Created = DateTime.UtcNow,
-                Key = metaKey,
-                Value = metaValue
-            });
-
-            await ctx.SaveChangesAsync(token);
-        }
-    }
-
-    public async Task SetPersistentMetaValue<T>(string metaKey, T metaValue, CancellationToken token = default)
-        where T : class
-    {
-        if (string.IsNullOrWhiteSpace(metaKey))
-        {
-            _logger.LogWarning("Meta key is null, not setting");
-            return;
-        }
-
-        if (metaValue is null)
-        {
-            _logger.LogWarning("Meta value is null, not setting");
-            return;
-        }
-
-        string serializedMeta;
-        try
-        {
-            serializedMeta = JsonSerializer.Serialize(metaValue);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Could not serialize meta with {Key} and value {Value}", metaKey, metaValue);
-            return;
-        }
-
-        await SetPersistentMeta(metaKey, serializedMeta, token);
-    }
-
-    public async Task<EFMeta> GetPersistentMeta(string metaKey, CancellationToken token = default)
-    {
-        if (string.IsNullOrWhiteSpace(metaKey))
-        {
-            return null;
-        }
-
-        await using var context = _contextFactory.CreateContext(false);
-        return await context.EFMeta.FirstOrDefaultAsync(meta => meta.Key == metaKey, token);
-    }
-
-    public async Task<T> GetPersistentMetaValue<T>(string metaKey, CancellationToken token = default) where T : class
-    {
-        if (string.IsNullOrWhiteSpace(metaKey))
-        {
-            return default;
-        }
-
-        var meta = await GetPersistentMeta(metaKey, token);
-
-        if (meta is null)
-        {
-            return default;
-        }
-
-        try
-        {
-            return JsonSerializer.Deserialize<T>(meta.Value);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Could not serialize meta with key {Key} and value {Value}", metaKey, meta.Value);
-            return default;
-        }
-    }
-
-    public async Task RemovePersistentMeta(string metaKey, CancellationToken token = default)
-    {
-        if (string.IsNullOrWhiteSpace(metaKey))
-        {
-            return;
-        }
-
-        await using var context = _contextFactory.CreateContext(enableTracking: false);
-
-        var existingMeta = await context.EFMeta
-            .Where(meta => meta.Key == metaKey)
-            .Where(meta => meta.ClientId == null)
-            .FirstOrDefaultAsync(token);
-
-        if (existingMeta != null)
-        {
-            _logger.LogDebug("Removing meta for key {Key} with id {Id}", metaKey, existingMeta.MetaId);
-            context.Remove(existingMeta);
-            await context.SaveChangesAsync(token);
-        }
-    }
-
-    public void AddRuntimeMeta<T, TReturnType>(MetaType metaKey,
-        Func<T, CancellationToken, Task<IEnumerable<TReturnType>>> metaAction)
-        where T : PaginationRequest where TReturnType : IClientMeta
-    {
-        if (!_metaActions.ContainsKey(metaKey))
-        {
-            _metaActions.Add(metaKey, new List<dynamic> { metaAction });
-        }
-
-        else
-        {
-            _metaActions[metaKey].Add(metaAction);
-        }
-    }
-
-    public async Task<IEnumerable<IClientMeta>> GetRuntimeMeta(ClientPaginationRequest request, CancellationToken token = default)
-    {
-        var metas = await Task.WhenAll(_metaActions.Where(kvp => kvp.Key != MetaType.Information)
-            .Select(async kvp => await kvp.Value[0](request, token)));
-
-        return metas.SelectMany(m => (IEnumerable<IClientMeta>)m)
-            .OrderByDescending(m => m.When)
-            .Take(request.Count)
-            .ToList();
-    }
-
-    public async Task<IEnumerable<T>> GetRuntimeMeta<T>(ClientPaginationRequest request, MetaType metaType,  CancellationToken token = default)
-        where T : IClientMeta
-    {
-        if (metaType == MetaType.Information)
-        {
-            var allMeta = new List<T>();
-
-            var completedMeta = await Task.WhenAll(_metaActions[metaType].Select(async individualMetaRegistration =>
-                (IEnumerable<T>)await individualMetaRegistration(request, token)));
-
-            allMeta.AddRange(completedMeta.SelectMany(meta => meta));
-
-            return ProcessInformationMeta(allMeta);
-        }
-
-        var meta = await _metaActions[metaType][0](request, token) as IEnumerable<T>;
-
-        return meta;
-    }
-
-    private static IEnumerable<T> ProcessInformationMeta<T>(IEnumerable<T> meta) where T : IClientMeta
-    {
-        return meta;
-    }
-
-    private static bool ValidArgs(string key, int clientId) => !string.IsNullOrWhiteSpace(key) && clientId > 0;
-}

Application/Misc/PluginImporter.cs

@@ -6,7 +6,6 @@ using SharedLibraryCore.Interfaces;
 using System.Linq;
 using SharedLibraryCore;
 using IW4MAdmin.Application.API.Master;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using SharedLibraryCore.Configuration;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
@@ -40,23 +39,24 @@ namespace IW4MAdmin.Application.Misc
         /// <returns></returns>
         public IEnumerable<IPlugin> DiscoverScriptPlugins()
         {
-            var pluginDir = $"{Utilities.OperatingDirectory}{PLUGIN_DIR}{Path.DirectorySeparatorChar}";
+            string pluginDir = $"{Utilities.OperatingDirectory}{PLUGIN_DIR}{Path.DirectorySeparatorChar}";
 
-            if (!Directory.Exists(pluginDir))
+            if (Directory.Exists(pluginDir))
             {
-                return Enumerable.Empty<IPlugin>();
+                var scriptPluginFiles = Directory.GetFiles(pluginDir, "*.js").AsEnumerable().Union(GetRemoteScripts());
+
+                _logger.LogDebug("Discovered {count} potential script plugins", scriptPluginFiles.Count());
+
+                if (scriptPluginFiles.Count() > 0)
+                {
+                    foreach (string fileName in scriptPluginFiles)
+                    {
+                        _logger.LogDebug("Discovered script plugin {fileName}", fileName);
+                        var plugin = new ScriptPlugin(_logger, fileName);
+                        yield return plugin;
+                    }
+                }
             }
-
-            var scriptPluginFiles =
-                Directory.GetFiles(pluginDir, "*.js").AsEnumerable().Union(GetRemoteScripts()).ToList();
-
-            _logger.LogDebug("Discovered {count} potential script plugins", scriptPluginFiles.Count);
-
-            return scriptPluginFiles.Select(fileName =>
-            {
-                _logger.LogDebug("Discovered script plugin {fileName}", fileName);
-                return new ScriptPlugin(_logger, fileName);
-            }).ToList();
         }
 
         /// <summary>
@@ -83,47 +83,19 @@ namespace IW4MAdmin.Application.Misc
                         .GroupBy(_assembly => _assembly.FullName).Select(_assembly => _assembly.OrderByDescending(_assembly => _assembly.GetName().Version).First());
 
                     pluginTypes = assemblies
-                        .SelectMany(_asm =>
+                        .SelectMany(_asm => _asm.GetTypes())
-                        {
-                            try
-                            {
-                                return _asm.GetTypes();
-                            }
-                            catch
-                            {
-                                return Enumerable.Empty<Type>();
-                            }
-                        })
                         .Where(_assemblyType => _assemblyType.GetInterface(nameof(IPlugin), false) != null);
 
                     _logger.LogDebug("Discovered {count} plugin implementations", pluginTypes.Count());
 
                     commandTypes = assemblies
-                        .SelectMany(_asm =>{
+                        .SelectMany(_asm => _asm.GetTypes())
-                            try
-                            {
-                                return _asm.GetTypes();
-                            }
-                            catch
-                            {
-                                return Enumerable.Empty<Type>();
-                            }
-                        })
                         .Where(_assemblyType => _assemblyType.IsClass && _assemblyType.BaseType == typeof(Command));
 
                     _logger.LogDebug("Discovered {count} plugin commands", commandTypes.Count());
 
                     configurationTypes = assemblies
-                        .SelectMany(asm => {
+                        .SelectMany(asm => asm.GetTypes())
-                            try
-                            {
-                                return asm.GetTypes();
-                            }
-                            catch
-                            {
-                                return Enumerable.Empty<Type>();
-                            }
-                        })
                         .Where(asmType =>
                             asmType.IsClass && asmType.GetInterface(nameof(IBaseConfiguration), false) != null);
 

Application/Misc/ScriptCommand.cs

@@ -6,6 +6,7 @@ using System;
 using System.Threading.Tasks;
 using Data.Models.Client;
 using Microsoft.Extensions.Logging;
+using static SharedLibraryCore.Database.Models.EFClient;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application.Misc
@@ -15,15 +16,14 @@ namespace IW4MAdmin.Application.Misc
     /// </summary>
     public class ScriptCommand : Command
     {
-        private readonly Func<GameEvent, Task> _executeAction;
+        private readonly Action<GameEvent> _executeAction;
         private readonly ILogger _logger;
 
-        public ScriptCommand(string name, string alias, string description, bool isTargetRequired,
+        public ScriptCommand(string name, string alias, string description, bool isTargetRequired, EFClient.Permission permission,
-            EFClient.Permission permission,
+            CommandArgument[] args, Action<GameEvent> executeAction, CommandConfiguration config, ITranslationLookup layout, ILogger<ScriptCommand> logger)
-            CommandArgument[] args, Func<GameEvent, Task> executeAction, CommandConfiguration config,
-            ITranslationLookup layout, ILogger<ScriptCommand> logger, Server.Game[] supportedGames)
             : base(config, layout)
         {
+
             _executeAction = executeAction;
             _logger = logger;
             Name = name;
@@ -32,7 +32,6 @@ namespace IW4MAdmin.Application.Misc
             RequiresTarget = isTargetRequired;
             Permission = permission;
             Arguments = args;
-            SupportedGames = supportedGames;
         }
 
         public override async Task ExecuteAsync(GameEvent e)
@@ -44,7 +43,7 @@ namespace IW4MAdmin.Application.Misc
 
             try
             {
-                await _executeAction(e);
+                await Task.Run(() => _executeAction(e));
             }
             catch (Exception ex)
             {

Application/Misc/ScriptPlugin.cs

@@ -13,7 +13,6 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Jint.Runtime.Interop;
 using Microsoft.Extensions.Logging;
 using Serilog.Context;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
@@ -37,12 +36,12 @@ namespace IW4MAdmin.Application.Misc
         /// </summary>
         public bool IsParser { get; private set; }
 
-        public FileSystemWatcher Watcher { get; }
+        public FileSystemWatcher Watcher { get; private set; }
 
         private Engine _scriptEngine;
         private readonly string _fileName;
-        private readonly SemaphoreSlim _onProcessing = new(1, 1);
+        private readonly SemaphoreSlim _onProcessing;
-        private bool _successfullyLoaded;
+        private bool successfullyLoaded;
         private readonly List<string> _registeredCommandNames;
         private readonly ILogger _logger;
 
@@ -50,14 +49,15 @@ namespace IW4MAdmin.Application.Misc
         {
             _logger = logger;
             _fileName = filename;
-            Watcher = new FileSystemWatcher
+            Watcher = new FileSystemWatcher()
             {
-                Path = workingDirectory ?? $"{Utilities.OperatingDirectory}Plugins{Path.DirectorySeparatorChar}",
+                Path = workingDirectory == null ? $"{Utilities.OperatingDirectory}Plugins{Path.DirectorySeparatorChar}" : workingDirectory,
                 NotifyFilter = NotifyFilters.Size,
                 Filter = _fileName.Split(Path.DirectorySeparatorChar).Last()
             };
 
             Watcher.EnableRaisingEvents = true;
+            _onProcessing = new SemaphoreSlim(1, 1);
             _registeredCommandNames = new List<string>();
         }
 
@@ -67,13 +67,12 @@ namespace IW4MAdmin.Application.Misc
             _onProcessing.Dispose();
         }
 
-        public async Task Initialize(IManager manager, IScriptCommandFactory scriptCommandFactory,
+        public async Task Initialize(IManager manager, IScriptCommandFactory scriptCommandFactory, IScriptPluginServiceResolver serviceResolver)
-            IScriptPluginServiceResolver serviceResolver)
         {
+            await _onProcessing.WaitAsync();
+
             try
             {
-                await _onProcessing.WaitAsync();
-
                 // for some reason we get an event trigger when the file is not finished being modified.
                 // this must have been a change in .NET CORE 3.x
                 // so if the new file is empty we can't process it yet
@@ -82,27 +81,26 @@ namespace IW4MAdmin.Application.Misc
                     return;
                 }
 
-                var firstRun = _scriptEngine == null;
+                bool firstRun = _scriptEngine == null;
 
                 // it's been loaded before so we need to call the unload event
                 if (!firstRun)
                 {
                     await OnUnloadAsync();
 
-                    foreach (var commandName in _registeredCommandNames)
+                    foreach (string commandName in _registeredCommandNames)
                     {
-                        _logger.LogDebug("Removing plugin registered command {Command}", commandName);
+                        _logger.LogDebug("Removing plugin registered command {command}", commandName);
                         manager.RemoveCommandByName(commandName);
                     }
 
                     _registeredCommandNames.Clear();
                 }
 
-                _successfullyLoaded = false;
+                successfullyLoaded = false;
                 string script;
 
-                await using (var stream =
+                using (var stream = new FileStream(_fileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
-                             new FileStream(_fileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
                 {
                     using (var reader = new StreamReader(stream, Encoding.Default))
                     {
@@ -112,35 +110,45 @@ namespace IW4MAdmin.Application.Misc
 
                 _scriptEngine = new Engine(cfg =>
                     cfg.AllowClr(new[]
-                        {
+                    {
-                            typeof(System.Net.Http.HttpClient).Assembly,
+                    typeof(System.Net.Http.HttpClient).Assembly,
-                            typeof(EFClient).Assembly,
+                    typeof(EFClient).Assembly,
-                            typeof(Utilities).Assembly,
+                    typeof(Utilities).Assembly,
-                            typeof(Encoding).Assembly,
+                    typeof(Encoding).Assembly
-                            typeof(CancellationTokenSource).Assembly
+                    })
-                        })
+                    .CatchClrExceptions());
-                        .CatchClrExceptions()
+
-                        .AddObjectConverter(new PermissionLevelToStringConverter()));
+                try
+                {
+                    _scriptEngine.Execute(script);
+                }
+                catch (JavaScriptException ex)
+                {
+                
+                    _logger.LogError(ex,
+                        "Encountered JavaScript runtime error while executing {methodName} for script plugin {plugin} at {@locationInfo}",
+                        nameof(Initialize), _fileName, ex.Location);
+                    throw new PluginException($"A JavaScript parsing error occured while initializing script plugin");
+                }
+
+                catch (Exception e)
+                {
+
+                        _logger.LogError(e,
+                            "Encountered unexpected error while running {methodName} for script plugin {plugin}",
+                            nameof(Initialize), _fileName);
+                    throw new PluginException($"An unexpected error occured while initialization script plugin");
+                }
 
-                _scriptEngine.Execute(script);
                 _scriptEngine.SetValue("_localization", Utilities.CurrentLocalization);
                 _scriptEngine.SetValue("_serviceResolver", serviceResolver);
-                _scriptEngine.SetValue("_lock", _onProcessing);
+                dynamic pluginObject = _scriptEngine.GetValue("plugin").ToObject();
-                dynamic pluginObject = _scriptEngine.Evaluate("plugin").ToObject();
 
                 Author = pluginObject.author;
                 Name = pluginObject.name;
                 Version = (float)pluginObject.version;
 
-                var commands = JsValue.Undefined;
+                var commands = _scriptEngine.GetValue("commands");
-                try
-                {
-                    commands = _scriptEngine.Evaluate("commands");
-                }
-                catch (JavaScriptException)
-                {
-                    // ignore because commands aren't defined;
-                }
 
                 if (commands != JsValue.Undefined)
                 {
@@ -148,7 +156,7 @@ namespace IW4MAdmin.Application.Misc
                     {
                         foreach (var command in GenerateScriptCommands(commands, scriptCommandFactory))
                         {
-                            _logger.LogDebug("Adding plugin registered command {CommandName}", command.Name);
+                            _logger.LogDebug("Adding plugin registered command {commandName}", command.Name);
                             manager.AddAdditionalCommand(command);
                             _registeredCommandNames.Add(command.Name);
                         }
@@ -156,63 +164,53 @@ namespace IW4MAdmin.Application.Misc
 
                     catch (RuntimeBinderException e)
                     {
-                        throw new PluginException($"Not all required fields were found: {e.Message}")
+                        throw new PluginException($"Not all required fields were found: {e.Message}") { PluginFile = _fileName };
-                            { PluginFile = _fileName };
                     }
                 }
 
+                _scriptEngine.SetValue("_configHandler", new ScriptPluginConfigurationWrapper(Name, _scriptEngine));
+                await OnLoadAsync(manager);
+
                 try
                 {
                     if (pluginObject.isParser)
                     {
-                        await OnLoadAsync(manager);
                         IsParser = true;
-                        var eventParser = (IEventParser)_scriptEngine.Evaluate("eventParser").ToObject();
+                        IEventParser eventParser = (IEventParser)_scriptEngine.GetValue("eventParser").ToObject();
-                        var rconParser = (IRConParser)_scriptEngine.Evaluate("rconParser").ToObject();
+                        IRConParser rconParser = (IRConParser)_scriptEngine.GetValue("rconParser").ToObject();
                         manager.AdditionalEventParsers.Add(eventParser);
                         manager.AdditionalRConParsers.Add(rconParser);
                     }
                 }
 
-                catch (RuntimeBinderException)
+                catch (RuntimeBinderException) { }
-                {
-                    var configWrapper = new ScriptPluginConfigurationWrapper(Name, _scriptEngine);
-                    await configWrapper.InitializeAsync();
-                    _scriptEngine.SetValue("_configHandler", configWrapper);
-                    await OnLoadAsync(manager);
-                }
 
                 if (!firstRun)
                 {
                     await OnLoadAsync(manager);
                 }
 
-                _successfullyLoaded = true;
+                successfullyLoaded = true;
             }
+
             catch (JavaScriptException ex)
             {
                 _logger.LogError(ex,
-                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} at {@LocationInfo}",
+                    "Encountered JavaScript runtime error while executing {methodName} for script plugin {plugin} initialization {@locationInfo}",
-                    nameof(Initialize), Path.GetFileName(_fileName), ex.Location);
+                    nameof(OnLoadAsync), _fileName, ex.Location);
-
+                
-                throw new PluginException("An error occured while initializing script plugin");
-            }
-            catch (Exception ex) when (ex.InnerException is JavaScriptException jsEx)
-            {
-                _logger.LogError(ex,
-                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} initialization {@LocationInfo}",
-                    nameof(Initialize), _fileName, jsEx.Location);
-
                 throw new PluginException("An error occured while initializing script plugin");
             }
+            
             catch (Exception ex)
             {
                 _logger.LogError(ex,
-                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin}",
+                    "Encountered unexpected error while running {methodName} for script plugin {plugin}",
-                    nameof(OnLoadAsync), Path.GetFileName(_fileName));
+                    nameof(OnLoadAsync), _fileName);
-
+                
-                throw new PluginException("An error occured while executing action for script plugin");
+                throw new PluginException("An unexpected error occured while initializing script plugin");
             }
+
             finally
             {
                 if (_onProcessing.CurrentCount == 0)
@@ -222,120 +220,73 @@ namespace IW4MAdmin.Application.Misc
             }
         }
 
-        public async Task OnEventAsync(GameEvent gameEvent, Server server)
+        public async Task OnEventAsync(GameEvent E, Server S)
         {
-            if (!_successfullyLoaded)
+            if (successfullyLoaded)
-            {
-                return;
-            }
-
-            try
             {
                 await _onProcessing.WaitAsync();
-                _scriptEngine.SetValue("_gameEvent", gameEvent);
-                _scriptEngine.SetValue("_server", server);
-                _scriptEngine.SetValue("_IW4MAdminClient", Utilities.IW4MAdminClient(server));
-                _scriptEngine.Evaluate("plugin.onEventAsync(_gameEvent, _server)");
-            }
 
-            catch (JavaScriptException ex)
+                try
-            {
-                using (LogContext.PushProperty("Server", server.ToString()))
                 {
-                    _logger.LogError(ex,
+                    _scriptEngine.SetValue("_gameEvent", E);
-                        "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} with event type {EventType} {@LocationInfo}",
+                    _scriptEngine.SetValue("_server", S);
-                        nameof(OnEventAsync), Path.GetFileName(_fileName), gameEvent.Type, ex.Location);
+                    _scriptEngine.SetValue("_IW4MAdminClient", Utilities.IW4MAdminClient(S));
+                    _scriptEngine.Execute("plugin.onEventAsync(_gameEvent, _server)").GetCompletionValue();
+                }
+                
+                catch (JavaScriptException ex)
+                {
+                    using (LogContext.PushProperty("Server", S.ToString()))
+                    {
+                        _logger.LogError(ex,
+                            "Encountered JavaScript runtime error while executing {methodName} for script plugin {plugin} with event type {eventType} {@locationInfo}",
+                            nameof(OnEventAsync), _fileName, E.Type, ex.Location);
+                    }
+
+                    throw new PluginException($"An error occured while executing action for script plugin");
                 }
 
-                throw new PluginException("An error occured while executing action for script plugin");
+                catch (Exception e)
-            }
-
-            catch (Exception ex)
-            {
-                using (LogContext.PushProperty("Server", server.ToString()))
                 {
-                    _logger.LogError(ex,
+                    using (LogContext.PushProperty("Server", S.ToString()))
-                        "Encountered error while running {MethodName} for script plugin {Plugin} with event type {EventType}",
+                    {
-                        nameof(OnEventAsync), _fileName, gameEvent.Type);
+                        _logger.LogError(e,
+                            "Encountered unexpected error while running {methodName} for script plugin {plugin} with event type {eventType}",
+                            nameof(OnEventAsync), _fileName, E.Type);
+                    }
+
+                    throw new PluginException($"An error occured while executing action for script plugin");
                 }
 
-                throw new PluginException("An error occured while executing action for script plugin");
+                finally
-            }
-
-            finally
-            {
-                if (_onProcessing.CurrentCount == 0)
                 {
-                    _onProcessing.Release(1);
+                    if (_onProcessing.CurrentCount == 0)
+                    {
+                        _onProcessing.Release(1);
+                    }
                 }
             }
         }
 
         public Task OnLoadAsync(IManager manager)
         {
-            try
+            _logger.LogDebug("OnLoad executing for {name}", Name);
-            {
+            _scriptEngine.SetValue("_manager", manager);
-                _logger.LogDebug("OnLoad executing for {Name}", Name);
+            return Task.FromResult(_scriptEngine.Execute("plugin.onLoadAsync(_manager)").GetCompletionValue());
-                _scriptEngine.SetValue("_manager", manager);
-                _scriptEngine.SetValue("getDvar", BeginGetDvar);
-                _scriptEngine.SetValue("setDvar", BeginSetDvar);
-                _scriptEngine.Evaluate("plugin.onLoadAsync(_manager)");
-
-                return Task.CompletedTask;
-            }
-            catch (JavaScriptException ex)
-            {
-                _logger.LogError(ex,
-                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} at {@LocationInfo}",
-                    nameof(OnLoadAsync), Path.GetFileName(_fileName), ex.Location);
-
-                throw new PluginException("A runtime error occured while executing action for script plugin");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex,
-                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin}",
-                    nameof(OnLoadAsync), Path.GetFileName(_fileName));
-
-                throw new PluginException("An error occured while executing action for script plugin");
-            }
         }
 
-        public async Task OnTickAsync(Server server)
+        public Task OnTickAsync(Server S)
         {
-            _scriptEngine.SetValue("_server", server);
+            _scriptEngine.SetValue("_server", S);
-            await Task.FromResult(_scriptEngine.Evaluate("plugin.onTickAsync(_server)"));
+            return Task.FromResult(_scriptEngine.Execute("plugin.onTickAsync(_server)").GetCompletionValue());
         }
 
-        public Task OnUnloadAsync()
+        public async Task OnUnloadAsync()
         {
-            if (!_successfullyLoaded)
+            if (successfullyLoaded)
             {
-                return Task.CompletedTask;
+                await Task.FromResult(_scriptEngine.Execute("plugin.onUnloadAsync()").GetCompletionValue());
             }
-
-            try
-            {
-                _scriptEngine.Evaluate("plugin.onUnloadAsync()");
-            }
-            catch (JavaScriptException ex)
-            {
-                _logger.LogError(ex,
-                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} at {@LocationInfo}",
-                    nameof(OnUnloadAsync), Path.GetFileName(_fileName), ex.Location);
-
-                throw new PluginException("A runtime error occured while executing action for script plugin");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex,
-                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin}",
-                    nameof(OnUnloadAsync), Path.GetFileName(_fileName));
-
-                throw new PluginException("An error occured while executing action for script plugin");
-            }
-
-            return Task.CompletedTask;
         }
 
         /// <summary>
@@ -344,10 +295,9 @@ namespace IW4MAdmin.Application.Misc
         /// <param name="commands">commands value from jint parser</param>
         /// <param name="scriptCommandFactory">factory to create the command from</param>
         /// <returns></returns>
-        private IEnumerable<IManagerCommand> GenerateScriptCommands(JsValue commands,
+        public IEnumerable<IManagerCommand> GenerateScriptCommands(JsValue commands, IScriptCommandFactory scriptCommandFactory)
-            IScriptCommandFactory scriptCommandFactory)
         {
-            var commandList = new List<IManagerCommand>();
+            List<IManagerCommand> commandList = new List<IManagerCommand>();
 
             // go through each defined command
             foreach (var command in commands.AsArray())
@@ -357,10 +307,9 @@ namespace IW4MAdmin.Application.Misc
                 string alias = dynamicCommand.alias;
                 string description = dynamicCommand.description;
                 string permission = dynamicCommand.permission;
-                List<Server.Game> supportedGames = null;
+                bool targetRequired = false;
-                var targetRequired = false;
 
-                var args = new List<(string, bool)>();
+                List<(string, bool)> args = new List<(string, bool)>();
                 dynamic arguments = null;
 
                 try
@@ -391,152 +340,26 @@ namespace IW4MAdmin.Application.Misc
                     }
                 }
 
-                try
+                void execute(GameEvent e)
                 {
-                    foreach (var game in dynamicCommand.supportedGames)
+                    _scriptEngine.SetValue("_event", e);
-                    {
+                    var jsEventObject = _scriptEngine.GetValue("_event");
-                        supportedGames ??= new List<Server.Game>();
-                        supportedGames.Add(Enum.Parse(typeof(Server.Game), game.ToString()));
-                    }
-                }
-                catch (RuntimeBinderException)
-                {
-                    // supported games is optional
-                }
 
-                async Task Execute(GameEvent gameEvent)
-                {
                     try
                     {
-                        await _onProcessing.WaitAsync();
+                        dynamicCommand.execute.Target.Invoke(jsEventObject);
-
-                        _scriptEngine.SetValue("_event", gameEvent);
-                        var jsEventObject = _scriptEngine.Evaluate("_event");
-
-                        dynamicCommand.execute.Target.Invoke(_scriptEngine, jsEventObject);
                     }
 
                     catch (JavaScriptException ex)
                     {
-                        using (LogContext.PushProperty("Server", gameEvent.Owner?.ToString()))
+                        throw new PluginException($"An error occured while executing action for script plugin: {ex.Error} (Line: {ex.Location.Start.Line}, Character: {ex.Location.Start.Column})") { PluginFile = _fileName };
-                        {
-                            _logger.LogError(ex, "Could not execute command action for {Filename} {@Location}",
-                                Path.GetFileName(_fileName), ex.Location);
-                        }
-
-                        throw new PluginException("A runtime error occured while executing action for script plugin");
-                    }
-
-                    catch (Exception ex)
-                    {
-                        using (LogContext.PushProperty("Server", gameEvent.Owner?.ToString()))
-                        {
-                            _logger.LogError(ex,
-                                "Could not execute command action for script plugin {FileName}",
-                                Path.GetFileName(_fileName));
-                        }
-
-                        throw new PluginException("An error occured while executing action for script plugin");
-                    }
-
-
-                    finally
-                    {
-                        if (_onProcessing.CurrentCount == 0)
-                        {
-                            _onProcessing.Release(1);
-                        }
                     }
                 }
 
-                commandList.Add(scriptCommandFactory.CreateScriptCommand(name, alias, description, permission,
+                commandList.Add(scriptCommandFactory.CreateScriptCommand(name, alias, description, permission, targetRequired, args, execute));
-                    targetRequired, args, Execute, supportedGames?.ToArray()));
             }
 
             return commandList;
         }
-
-        private void BeginGetDvar(Server server, string dvarName, Delegate onCompleted)
-        {
-            var tokenSource = new CancellationTokenSource();
-            tokenSource.CancelAfter(TimeSpan.FromSeconds(15));
-            
-            server.BeginGetDvar(dvarName, result =>
-            {
-                var shouldRelease = false;
-                try
-                {
-                    _onProcessing.Wait(tokenSource.Token);
-                    shouldRelease = true;
-                    var (success, value) = (ValueTuple<bool, string>)result.AsyncState;
-
-                    onCompleted.DynamicInvoke(JsValue.Undefined,
-                        new[]
-                        {
-                            JsValue.FromObject(_scriptEngine, server),
-                            JsValue.FromObject(_scriptEngine, dvarName),
-                            JsValue.FromObject(_scriptEngine, value),
-                            JsValue.FromObject(_scriptEngine, success)
-                        });
-                }
-
-                finally
-                {
-                    if (_onProcessing.CurrentCount == 0 && shouldRelease)
-                    {
-                        _onProcessing.Release();
-                    }
-                }
-            }, tokenSource.Token);
-        }
-
-        private void BeginSetDvar(Server server, string dvarName, string dvarValue, Delegate onCompleted)
-        {
-            var tokenSource = new CancellationTokenSource();
-            tokenSource.CancelAfter(TimeSpan.FromSeconds(15));
-            
-            server.BeginSetDvar(dvarName, dvarValue, result =>
-            {
-                var shouldRelease = false;
-                try
-                {
-                    _onProcessing.Wait(tokenSource.Token);
-                    shouldRelease = true;
-                    var success = (bool)result.AsyncState;
-                    
-                    onCompleted.DynamicInvoke(JsValue.Undefined,
-                        new[]
-                        {
-                            JsValue.FromObject(_scriptEngine, server),
-                            JsValue.FromObject(_scriptEngine, dvarName),
-                            JsValue.FromObject(_scriptEngine, dvarValue),
-                            JsValue.FromObject(_scriptEngine, success)
-                        });
-                }
-                finally
-                {
-                    if (_onProcessing.CurrentCount == 0 && shouldRelease)
-                    {
-                        _onProcessing.Release();
-                    }
-                }
-            }, tokenSource.Token);
-        }
-    }
-
-    public class PermissionLevelToStringConverter : IObjectConverter
-    {
-        public bool TryConvert(Engine engine, object value, out JsValue result)
-        {
-            if (value is Data.Models.Client.EFClient.Permission)
-            {
-                result = value.ToString();
-                return true;
-            }
-
-
-            result = JsValue.Null;
-            return false;
-        }
     }
 }

Application/Misc/ScriptPluginConfigurationWrapper.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Text.Json;
 using System.Threading.Tasks;
 using IW4MAdmin.Application.Configuration;
 using Jint;
@@ -13,22 +12,17 @@ namespace IW4MAdmin.Application.Misc
     public class ScriptPluginConfigurationWrapper
     {
         private readonly BaseConfigurationHandler<ScriptPluginConfiguration> _handler;
-        private ScriptPluginConfiguration _config;
+        private readonly ScriptPluginConfiguration _config;
         private readonly string _pluginName;
         private readonly Engine _scriptEngine;
 
         public ScriptPluginConfigurationWrapper(string pluginName, Engine scriptEngine)
         {
             _handler = new BaseConfigurationHandler<ScriptPluginConfiguration>("ScriptPluginSettings");
-            _pluginName = pluginName;
-            _scriptEngine = scriptEngine;
-        }
-
-        public async Task InitializeAsync()
-        {
-            await _handler.BuildAsync();
             _config = _handler.Configuration() ??
                       (ScriptPluginConfiguration) new ScriptPluginConfiguration().Generate();
+            _pluginName = pluginName;
+            _scriptEngine = scriptEngine;
         }
 
         private static int? AsInteger(double d)
@@ -85,12 +79,12 @@ namespace IW4MAdmin.Application.Misc
 
             var item = _config[_pluginName][key];
 
-            if (item is JsonElement { ValueKind: JsonValueKind.Array } jElem)
+            if (item is JArray array)
             {
-                item = jElem.Deserialize<List<dynamic>>();
+                item = array.ToObject<List<dynamic>>();
             }
 
             return JsValue.FromObject(_scriptEngine, item);
         }
     }
-}
+}

Application/Misc/ScriptPluginTimerHelper.cs

@@ -1,159 +0,0 @@
-using System;
-using System.Threading;
-using Jint.Native;
-using Jint.Runtime;
-using Microsoft.Extensions.Logging;
-using SharedLibraryCore.Interfaces;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
-
-namespace IW4MAdmin.Application.Misc;
-
-public class ScriptPluginTimerHelper : IScriptPluginTimerHelper
-{
-    private Timer _timer;
-    private Action _actions;
-    private Delegate _jsAction;
-    private string _actionName;
-    private const int DefaultDelay = 0;
-    private const int DefaultInterval = 1000;
-    private readonly ILogger _logger;
-    private readonly ManualResetEventSlim _onRunningTick = new();
-    private SemaphoreSlim _onDependentAction;
-
-    public ScriptPluginTimerHelper(ILogger<ScriptPluginTimerHelper> logger)
-    {
-        _logger = logger;
-    }
-
-    ~ScriptPluginTimerHelper()
-    {
-        if (_timer != null)
-        {
-            Stop();
-        }
-        _onRunningTick.Dispose();
-    }
-
-    public void Start(int delay, int interval)
-    {
-        if (_actions is null)
-        {
-            throw new InvalidOperationException("Timer action must be defined before starting");
-        }
-
-        if (delay < 0)
-        {
-            throw new ArgumentException("Timer delay must be >= 0");
-        }
-
-        if (interval < 20)
-        {
-            throw new ArgumentException("Timer interval must be at least 20ms");
-        }
-        
-        Stop();
-        
-        _logger.LogDebug("Starting script timer...");
-
-        _onRunningTick.Set();
-        _timer ??= new Timer(callback => _actions(), null, delay, interval);
-        IsRunning = true;
-    }
-
-    public void Start(int interval)
-    {
-        Start(DefaultDelay, interval);
-    }
-
-    public void Start()
-    {
-        Start(DefaultDelay, DefaultInterval);
-    }
-
-    public void Stop()
-    {
-        if (_timer == null)
-        {
-            return;
-        }
-        
-        _logger.LogDebug("Stopping script timer...");
-        _timer.Change(Timeout.Infinite, Timeout.Infinite);
-        _timer.Dispose();
-        _timer = null;
-        IsRunning = false;
-    }
-
-    public void OnTick(Delegate action, string actionName)
-    {
-        if (string.IsNullOrEmpty(actionName))
-        {
-            throw new ArgumentException("actionName must be provided", nameof(actionName));
-        }
-
-        if (action is null)
-        {
-            throw new ArgumentException("action must be provided", nameof(action));
-        }
-
-        _logger.LogDebug("Adding new action with name {ActionName}", actionName);
-
-        _jsAction = action;
-        _actionName = actionName;
-        _actions = OnTick;
-    }
-
-    private void ReleaseThreads()
-    {
-        _onRunningTick.Set();
-
-        if (_onDependentAction?.CurrentCount != 0)
-        {
-            return;
-        }
-
-        _onDependentAction?.Release(1);
-    }
-    private void OnTick()
-    {
-        try
-        {
-            if (!_onRunningTick.IsSet)
-            {
-                _logger.LogDebug("Previous {OnTick} is still running, so we are skipping this one",
-                    nameof(OnTick));
-                return;
-            }
-
-            _onRunningTick.Reset();
-
-            // the js engine is not thread safe so we need to ensure we're not executing OnTick and OnEventAsync simultaneously
-            _onDependentAction?.WaitAsync().Wait();
-            var start = DateTime.Now;
-            _jsAction.DynamicInvoke(JsValue.Undefined, new[] { JsValue.Undefined });
-            _logger.LogDebug("OnTick took {Time}ms", (DateTime.Now - start).TotalMilliseconds);
-            ReleaseThreads();
-        }
-
-        catch (Exception ex) when (ex.InnerException is JavaScriptException jsex)
-        {
-            _logger.LogError(jsex,
-                "Could not execute timer tick for script action {ActionName} [@{LocationInfo}]", _actionName,
-                jsex.Location);
-            ReleaseThreads();
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Could not execute timer tick for script action {ActionName}", _actionName);
-            _onRunningTick.Set();
-            ReleaseThreads();
-        }
-    }
-
-    public void SetDependency(SemaphoreSlim dependentSemaphore)
-    {
-        _onDependentAction = dependentSemaphore;
-    }
-
-    public bool IsRunning { get; private set; }
-}

Application/Misc/ServerDataCollector.cs

@@ -94,8 +94,7 @@ namespace IW4MAdmin.Application.Misc
                     PeriodBlock = (int) (DateTimeOffset.UtcNow - DateTimeOffset.UnixEpoch).TotalMinutes,
                     ServerId = await server.GetIdForServer(),
                     MapId = await GetOrCreateMap(server.CurrentMap.Name, (Reference.Game) server.GameName, token),
-                    ClientCount = server.ClientNum,
+                    ClientCount = server.ClientNum
-                    ConnectionInterrupted = server.Throttled,
                 }));
 
             return data;
@@ -145,4 +144,4 @@ namespace IW4MAdmin.Application.Misc
             context.SaveChanges();
         }
     }
-}
+}

Application/Misc/ServerDataViewer.cs

@@ -5,7 +5,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Data.Abstractions;
 using Data.Models.Client;
-using Data.Models.Client.Stats;
 using Data.Models.Server;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
@@ -23,20 +22,18 @@ namespace IW4MAdmin.Application.Misc
         private readonly IDataValueCache<EFServerSnapshot, (int?, DateTime?)> _snapshotCache;
         private readonly IDataValueCache<EFClient, (int, int)> _serverStatsCache;
         private readonly IDataValueCache<EFServerSnapshot, List<ClientHistoryInfo>> _clientHistoryCache;
-        private readonly IDataValueCache<EFClientRankingHistory, int> _rankedClientsCache;
 
         private readonly TimeSpan? _cacheTimeSpan =
             Utilities.IsDevelopment ? TimeSpan.FromSeconds(30) : (TimeSpan?) TimeSpan.FromMinutes(10);
 
         public ServerDataViewer(ILogger<ServerDataViewer> logger, IDataValueCache<EFServerSnapshot, (int?, DateTime?)> snapshotCache,
             IDataValueCache<EFClient, (int, int)> serverStatsCache,
-            IDataValueCache<EFServerSnapshot, List<ClientHistoryInfo>> clientHistoryCache, IDataValueCache<EFClientRankingHistory, int> rankedClientsCache)
+            IDataValueCache<EFServerSnapshot, List<ClientHistoryInfo>> clientHistoryCache)
         {
             _logger = logger;
             _snapshotCache = snapshotCache;
             _serverStatsCache = serverStatsCache;
             _clientHistoryCache = clientHistoryCache;
-            _rankedClientsCache = rankedClientsCache;
         }
 
         public async Task<(int?, DateTime?)> 
@@ -138,9 +135,7 @@ namespace IW4MAdmin.Application.Misc
                         {
                             snapshot.ServerId,
                             snapshot.CapturedAt,
-                            snapshot.ClientCount,
+                            snapshot.ClientCount
-                            snapshot.ConnectionInterrupted,
-                            MapName = snapshot.Map.Name,
                         })
                     .OrderBy(snapshot => snapshot.CapturedAt)
                     .ToListAsync(cancellationToken);
@@ -148,8 +143,8 @@ namespace IW4MAdmin.Application.Misc
                 return history.GroupBy(snapshot => snapshot.ServerId).Select(byServer => new ClientHistoryInfo
                 {
                     ServerId = byServer.Key,
-                    ClientCounts = byServer.Select(snapshot => new ClientCountSnapshot
+                    ClientCounts = byServer.Select(snapshot => new ClientCountSnapshot()
-                        { Time = snapshot.CapturedAt, ClientCount = snapshot.ClientCount, ConnectionInterrupted = snapshot.ConnectionInterrupted ?? false, Map = snapshot.MapName}).ToList()
+                        {Time = snapshot.CapturedAt, ClientCount = snapshot.ClientCount}).ToList()
                 }).ToList();
             }, nameof(_clientHistoryCache), TimeSpan.MaxValue);
 
@@ -163,30 +158,5 @@ namespace IW4MAdmin.Application.Misc
                 return Enumerable.Empty<ClientHistoryInfo>();
             }
         }
-
-        public async Task<int> RankedClientsCountAsync(long? serverId = null, CancellationToken token = default)
-        {
-            _rankedClientsCache.SetCacheItem(async (set, cancellationToken) =>
-            {
-                var fifteenDaysAgo = DateTime.UtcNow.AddDays(-15);
-                return await set
-                    .Where(rating => rating.Newest)
-                    .Where(rating => rating.ServerId == serverId)
-                    .Where(rating => rating.CreatedDateTime >= fifteenDaysAgo)
-                    .Where(rating => rating.Client.Level != EFClient.Permission.Banned)
-                    .Where(rating => rating.Ranking != null)
-                    .CountAsync(cancellationToken);
-            }, nameof(_rankedClientsCache), serverId is null ? null: new[] { (object)serverId },  _cacheTimeSpan);
-            
-            try
-            {
-                return await _rankedClientsCache.GetCacheItem(nameof(_rankedClientsCache), serverId, token);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Could not retrieve data for {Name}", nameof(RankedClientsCountAsync));
-                return 0;
-            }
-        }
     }
-}
+}

Application/Misc/TokenAuthentication.cs

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

Application/RConParsers/BaseRConParser.cs

@@ -7,10 +7,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using System.Threading;
 using System.Threading.Tasks;
 using Data.Models;
-using IW4MAdmin.Application.Misc;
 using Microsoft.Extensions.Logging;
 using static SharedLibraryCore.Server;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
@@ -20,7 +18,6 @@ namespace IW4MAdmin.Application.RConParsers
     public class BaseRConParser : IRConParser
     {
         private readonly ILogger _logger;
-        private static string _botIpIndicator = "00000000.";
         
         public BaseRConParser(ILogger<BaseRConParser> logger, IParserRegexFactory parserRegexFactory)
         {
@@ -53,7 +50,7 @@ namespace IW4MAdmin.Application.RConParsers
             Configuration.Status.AddMapping(ParserRegex.GroupType.RConName, 5);
             Configuration.Status.AddMapping(ParserRegex.GroupType.RConIpAddress, 7);
 
-            Configuration.Dvar.Pattern = "^\"(.+)\" is: \"(.+)?\" default: \"(.+)?\"\n?(?:latched: \"(.+)?\"\n?)? *(.+)$";
+            Configuration.Dvar.Pattern = "^\"(.+)\" is: \"(.+)?\" default: \"(.+)?\"\n(?:latched: \"(.+)?\"\n)? *(.+)$";
             Configuration.Dvar.AddMapping(ParserRegex.GroupType.RConDvarName, 1);
             Configuration.Dvar.AddMapping(ParserRegex.GroupType.RConDvarValue, 2);
             Configuration.Dvar.AddMapping(ParserRegex.GroupType.RConDvarDefaultValue, 3);
@@ -80,20 +77,19 @@ namespace IW4MAdmin.Application.RConParsers
         public string RConEngine { get; set; } = "COD";
         public bool IsOneLog { get; set; }
 
-        public async Task<string[]> ExecuteCommandAsync(IRConConnection connection, string command, CancellationToken token = default)
+        public async Task<string[]> ExecuteCommandAsync(IRConConnection connection, string command)
         {
-            command = command.FormatMessageForEngine(Configuration);
+            var response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND, command);
-            var response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND, command, token);
             return response.Where(item => item != Configuration.CommandPrefixes.RConResponse).ToArray();
         }
 
-        public async Task<Dvar<T>> GetDvarAsync<T>(IRConConnection connection, string dvarName, T fallbackValue = default, CancellationToken token = default)
+        public async Task<Dvar<T>> GetDvarAsync<T>(IRConConnection connection, string dvarName, T fallbackValue = default)
         {
             string[] lineSplit;
 
             try
             {
-                lineSplit = await connection.SendQueryAsync(StaticHelpers.QueryType.GET_DVAR, dvarName, token);
+                lineSplit = await connection.SendQueryAsync(StaticHelpers.QueryType.GET_DVAR, dvarName);
             }
             catch
             {
@@ -102,10 +98,10 @@ namespace IW4MAdmin.Application.RConParsers
                     throw;
                 }
 
-                lineSplit = Array.Empty<string>();
+                lineSplit = new string[0];
             }
 
-            var response = string.Join('\n', lineSplit).Replace("\n", "").TrimEnd('\0');
+            string response = string.Join('\n', lineSplit).TrimEnd('\0');
             var match = Regex.Match(response, Configuration.Dvar.Pattern);
 
             if (response.Contains("Unknown command") ||
@@ -113,7 +109,7 @@ namespace IW4MAdmin.Application.RConParsers
             {
                 if (fallbackValue != null)
                 {
-                    return new Dvar<T>
+                    return new Dvar<T>()
                     {
                         Name = dvarName,
                         Value = fallbackValue
@@ -123,17 +119,17 @@ namespace IW4MAdmin.Application.RConParsers
                 throw new DvarException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_DVAR"].FormatExt(dvarName));
             }
 
-            var value = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarValue]].Value;
+            string value = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarValue]].Value;
-            var defaultValue = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarDefaultValue]].Value;
+            string defaultValue = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarDefaultValue]].Value;
-            var latchedValue = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarLatchedValue]].Value;
+            string latchedValue = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarLatchedValue]].Value;
 
-            string RemoveTrailingColorCode(string input) => Regex.Replace(input, @"\^7$", "");
+            string removeTrailingColorCode(string input) => Regex.Replace(input, @"\^7$", "");
 
-            value = RemoveTrailingColorCode(value);
+            value = removeTrailingColorCode(value);
-            defaultValue = RemoveTrailingColorCode(defaultValue);
+            defaultValue = removeTrailingColorCode(defaultValue);
-            latchedValue = RemoveTrailingColorCode(latchedValue);
+            latchedValue = removeTrailingColorCode(latchedValue);
 
-            return new Dvar<T>
+            return new Dvar<T>()
             {
                 Name = dvarName,
                 Value = string.IsNullOrEmpty(value) ? default : (T)Convert.ChangeType(value, typeof(T)),
@@ -143,36 +139,10 @@ namespace IW4MAdmin.Application.RConParsers
             };
         }
 
-        public void BeginGetDvar(IRConConnection connection, string dvarName, AsyncCallback callback, CancellationToken token = default)
+        public virtual async Task<IStatusResponse> GetStatusAsync(IRConConnection connection)
         {
-            GetDvarAsync<string>(connection, dvarName, token: token).ContinueWith(action =>
+            var response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND_STATUS);
-            {
+            _logger.LogDebug("Status Response {response}", string.Join(Environment.NewLine, response));
-                if (action.Exception is null)
-                {
-                    callback?.Invoke(new AsyncResult
-                    {
-                        IsCompleted = true,
-                        AsyncState = (true, action.Result.Value)
-                    });
-                }
-
-                else
-                {
-                    callback?.Invoke(new AsyncResult
-                    {
-                        IsCompleted = true,
-                        AsyncState = (false, (string)null)
-                    });
-                }
-            }, token);
-        }
-
-        public virtual async Task<IStatusResponse> GetStatusAsync(IRConConnection connection, CancellationToken token = default)
-        {
-            var response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND_STATUS, "status", token);
-            
-            _logger.LogDebug("Status Response {Response}", string.Join(Environment.NewLine, response));
-            
             return new StatusResponse
             {
                 Clients = ClientsFromStatus(response).ToArray(),
@@ -213,38 +183,13 @@ namespace IW4MAdmin.Application.RConParsers
             return (T)Convert.ChangeType(value, typeof(T));
         }
 
-        public async Task<bool> SetDvarAsync(IRConConnection connection, string dvarName, object dvarValue, CancellationToken token = default)
+        public async Task<bool> SetDvarAsync(IRConConnection connection, string dvarName, object dvarValue)
         {
-            var dvarString = (dvarValue is string str)
+            string dvarString = (dvarValue is string str)
                 ? $"{dvarName} \"{str}\""
                 : $"{dvarName} {dvarValue}";
 
-            return (await connection.SendQueryAsync(StaticHelpers.QueryType.SET_DVAR, dvarString, token)).Length > 0;
+            return (await connection.SendQueryAsync(StaticHelpers.QueryType.SET_DVAR, dvarString)).Length > 0;
-        }
-
-        public void BeginSetDvar(IRConConnection connection, string dvarName, object dvarValue, AsyncCallback callback,
-            CancellationToken token = default)
-        {
-            SetDvarAsync(connection, dvarName, dvarValue, token).ContinueWith(action =>
-            {
-                if (action.Exception is null)
-                {
-                    callback?.Invoke(new AsyncResult
-                    {
-                        IsCompleted = true,
-                        AsyncState = true
-                    });
-                }
-
-                else
-                {
-                    callback?.Invoke(new AsyncResult
-                    {
-                        IsCompleted = true,
-                        AsyncState = false
-                    });
-                }
-            }, token);
         }
 
         private List<EFClient> ClientsFromStatus(string[] Status)
@@ -291,15 +236,8 @@ namespace IW4MAdmin.Application.RConParsers
                     long networkId;
                     var name = match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConName]].TrimNewLine();
                     string networkIdString;
-                    
                     var ip = match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConIpAddress]].Split(':')[0].ConvertToIP();
 
-                    if (match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConIpAddress]]
-                        .Contains(_botIpIndicator))
-                    {
-                        ip = System.Net.IPAddress.Broadcast.ToString().ConvertToIP();
-                    }
-
                     try
                     {
                         networkIdString = match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConNetworkId]];
@@ -314,9 +252,9 @@ namespace IW4MAdmin.Application.RConParsers
                         continue;
                     }
 
-                    var client = new EFClient
+                    var client = new EFClient()
                     {
-                        CurrentAlias = new EFAlias
+                        CurrentAlias = new EFAlias()
                         {
                             Name = name,
                             IPAddress = ip
@@ -368,28 +306,15 @@ namespace IW4MAdmin.Application.RConParsers
             (T)Convert.ChangeType(Configuration.DefaultDvarValues[dvarName], typeof(T)) :
             default;
 
-        public TimeSpan? OverrideTimeoutForCommand(string command)
+        public TimeSpan OverrideTimeoutForCommand(string command)
         {
-            if (string.IsNullOrEmpty(command))
+            if (command.Contains("map_rotate", StringComparison.InvariantCultureIgnoreCase) ||
+                command.StartsWith("map ", StringComparison.InvariantCultureIgnoreCase))
             {
-                return TimeSpan.Zero;
+                return TimeSpan.FromSeconds(30);
-            }
-            
-            var commandToken = command.Split(' ', StringSplitOptions.RemoveEmptyEntries).First().ToLower();
-
-            if (!Configuration.OverrideCommandTimeouts.ContainsKey(commandToken))
-            {
-                return TimeSpan.Zero;
             }
 
-            var timeoutValue = Configuration.OverrideCommandTimeouts[commandToken];
+            return TimeSpan.Zero;
-            
-            if (timeoutValue.HasValue && timeoutValue.Value != 0) // JINT doesn't seem to be able to properly set nulls on dictionaries
-            {
-                return TimeSpan.FromSeconds(timeoutValue.Value);
-            }
-
-            return null;
         }
     }
 }

Application/RConParsers/DynamicRConParserConfiguration.cs

@@ -26,14 +26,11 @@ namespace IW4MAdmin.Application.RConParsers
         public NumberStyles GuidNumberStyle { get; set; } = NumberStyles.HexNumber;
         public IDictionary<string, string> OverrideDvarNameMapping { get; set; } = new Dictionary<string, string>();
         public IDictionary<string, string> DefaultDvarValues { get; set; } = new Dictionary<string, string>();
-        public IDictionary<string, int?> OverrideCommandTimeouts { get; set; } = new Dictionary<string, int?>();
         public int NoticeMaximumLines { get; set; } = 8;
         public int NoticeMaxCharactersPerLine { get; set; } = 50;
         public string NoticeLineSeparator { get; set; } = Environment.NewLine;
         public int? DefaultRConPort { get; set; }
         public string DefaultInstallationDirectoryHint { get; set; }
-        public short FloodProtectInterval { get; set; } = 750;
-        public bool ShouldRemoveDiacritics { get; set; }
 
         public ColorCodeMapping ColorCodeMapping { get; set; } = new ColorCodeMapping
         {
@@ -48,7 +45,7 @@ namespace IW4MAdmin.Application.RConParsers
             {ColorCodes.White.ToString(), "^7"},
             {ColorCodes.Map.ToString(), "^8"},
             {ColorCodes.Grey.ToString(), "^9"},
-            {ColorCodes.Wildcard.ToString(), "^:"}
+            {ColorCodes.Wildcard.ToString(), ":^"},
         };
 
         public DynamicRConParserConfiguration(IParserRegexFactory parserRegexFactory)
@@ -60,25 +57,6 @@ namespace IW4MAdmin.Application.RConParsers
             StatusHeader = parserRegexFactory.CreateParserRegex();
             HostnameStatus = parserRegexFactory.CreateParserRegex();
             MaxPlayersStatus = parserRegexFactory.CreateParserRegex();
-
-
-            const string mapRotateCommand = "map_rotate";
-            const string mapCommand = "map";
-            const string fastRestartCommand = "fast_restart";
-            const string quitCommand = "quit";
-
-            foreach (var command in new[] { mapRotateCommand, mapCommand, fastRestartCommand})
-            {
-                if (!OverrideCommandTimeouts.ContainsKey(command))
-                {
-                    OverrideCommandTimeouts.Add(command, 45);
-                }
-            }
-
-            if (!OverrideCommandTimeouts.ContainsKey(quitCommand))
-            {
-                OverrideCommandTimeouts.Add(quitCommand, 0); // we don't want to wait for a response when we quit the server
-            }
         }
     }
-}
+}

Data/Abstractions/IDataValueCache.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
@@ -10,11 +9,6 @@ namespace Data.Abstractions
     {
         void SetCacheItem(Func<DbSet<TEntityType>, CancellationToken, Task<TReturnType>> itemGetter, string keyName,
             TimeSpan? expirationTime = null, bool autoRefresh = false);
-
-        void SetCacheItem(Func<DbSet<TEntityType>, CancellationToken, Task<TReturnType>> itemGetter, string keyName,
-            IEnumerable<object> ids = null, TimeSpan? expirationTime = null, bool autoRefresh = false);
-
         Task<TReturnType> GetCacheItem(string keyName, CancellationToken token = default);
-        Task<TReturnType> GetCacheItem(string keyName, object id = null, CancellationToken token = default);
     }
-}
+}

Data/Context/ContextSeed.cs

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

Data/Context/DatabaseContext.cs

@@ -18,7 +18,6 @@ namespace Data.Context
         public DbSet<EFAlias> Aliases { get; set; }
         public DbSet<EFAliasLink> AliasLinks { get; set; }
         public DbSet<EFPenalty> Penalties { get; set; }
-        public DbSet<EFPenaltyIdentifier> PenaltyIdentifiers { get; set; }
         public DbSet<EFMeta> EFMeta { get; set; }
         public DbSet<EFChangeHistory> EFChangeHistory { get; set; }
 
@@ -85,15 +84,7 @@ namespace Data.Context
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             // make network id unique
-            modelBuilder.Entity<EFClient>(entity =>
+            modelBuilder.Entity<EFClient>(entity => { entity.HasIndex(e => e.NetworkId).IsUnique(); });
-            {
-                entity.HasIndex(e => e.NetworkId);
-                entity.HasAlternateKey(client => new
-                {
-                    client.NetworkId,
-                    client.GameName
-                });
-            });
 
             modelBuilder.Entity<EFPenalty>(entity =>
             {
@@ -128,9 +119,6 @@ namespace Data.Context
                 ent.Property(_alias => _alias.SearchableName).HasMaxLength(24);
                 ent.HasIndex(_alias => _alias.SearchableName);
                 ent.HasIndex(_alias => new {_alias.Name, _alias.IPAddress});
-                ent.Property(alias => alias.SearchableIPAddress)
-                    .HasComputedColumnSql(@"((IPAddress & 255) || '.' || ((IPAddress >> 8) & 255)) || '.' || ((IPAddress >> 16) & 255) || '.' || ((IPAddress >> 24) & 255)", stored: true);
-                ent.HasIndex(alias => alias.SearchableIPAddress);
             });
 
             modelBuilder.Entity<EFMeta>(ent =>
@@ -142,12 +130,6 @@ namespace Data.Context
                     .OnDelete(DeleteBehavior.SetNull);
             });
 
-            modelBuilder.Entity<EFPenaltyIdentifier>(ent =>
-            {
-                ent.HasIndex(identifiers => identifiers.NetworkId);
-                ent.HasIndex(identifiers => identifiers.IPv4Address);
-            });
-
             modelBuilder.Entity<EFClientConnectionHistory>(ent => ent.HasIndex(history => history.CreatedDateTime));
 
             // force full name for database conversion
@@ -155,7 +137,6 @@ namespace Data.Context
             modelBuilder.Entity<EFAlias>().ToTable("EFAlias");
             modelBuilder.Entity<EFAliasLink>().ToTable("EFAliasLinks");
             modelBuilder.Entity<EFPenalty>().ToTable("EFPenalties");
-            modelBuilder.Entity<EFPenaltyIdentifier>().ToTable("EFPenaltyIdentifiers");
             modelBuilder.Entity<EFServerSnapshot>().ToTable(nameof(EFServerSnapshot));
             modelBuilder.Entity<EFClientConnectionHistory>().ToTable(nameof(EFClientConnectionHistory));
 

Data/Data.csproj

@@ -1,27 +1,30 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Configurations>Debug;Release;Prerelease</Configurations>
     <Platforms>AnyCPU</Platforms>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageId>RaidMax.IW4MAdmin.Data</PackageId>
     <Title>RaidMax.IW4MAdmin.Data</Title>
     <Authors />
-    <PackageVersion>1.2.0</PackageVersion>
+    <PackageVersion>1.1.0</PackageVersion>
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.10">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Npgsql" Version="6.0.2" />
+    <PackageReference Include="Npgsql" Version="4.1.7" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.2" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.4" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.1" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.2.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.10" />
+  </ItemGroup>
+  
+  <ItemGroup Condition="'$(Configuration)'=='Debug'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.10" />
   </ItemGroup>
   
 </Project>

Data/Helpers/DataValueCache.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Data.Abstractions;
@@ -17,8 +15,8 @@ namespace Data.Helpers
         private readonly ILogger _logger;
         private readonly IDatabaseContextFactory _contextFactory;
 
-        private readonly ConcurrentDictionary<string, Dictionary<object, CacheState<TReturnType>>> _cacheStates = new();
+        private readonly ConcurrentDictionary<string, CacheState<TReturnType>> _cacheStates =
-        private readonly object _defaultKey = new();
+            new ConcurrentDictionary<string, CacheState<TReturnType>>();
 
         private bool _autoRefresh;
         private const int DefaultExpireMinutes = 15;
@@ -53,61 +51,41 @@ namespace Data.Helpers
         public void SetCacheItem(Func<DbSet<TEntityType>, CancellationToken, Task<TReturnType>> getter, string key,
             TimeSpan? expirationTime = null, bool autoRefresh = false)
         {
-            SetCacheItem(getter, key, null, expirationTime, autoRefresh);
+            if (_cacheStates.ContainsKey(key))
-        }
-
-        public void SetCacheItem(Func<DbSet<TEntityType>, CancellationToken, Task<TReturnType>> getter, string key,
-            IEnumerable<object> ids = null, TimeSpan? expirationTime = null, bool autoRefresh = false)
-        {
-            ids ??= new[] { _defaultKey };
-            
-            if (!_cacheStates.ContainsKey(key))
             {
-                _cacheStates.TryAdd(key, new Dictionary<object, CacheState<TReturnType>>());
+                _logger.LogDebug("Cache key {Key} is already added", key);
+                return;
             }
 
-            foreach (var id in ids)
+            var state = new CacheState<TReturnType>
             {
-                if (_cacheStates[key].ContainsKey(id))
+                Key = key,
-                {
+                Getter = getter,
-                    continue;
+                ExpirationTime = expirationTime ?? TimeSpan.FromMinutes(DefaultExpireMinutes)
-                }
+            };
 
-                var state = new CacheState<TReturnType>
+            _autoRefresh = autoRefresh;
-                {
-                    Key = key,
-                    Getter = getter,
-                    ExpirationTime = expirationTime ?? TimeSpan.FromMinutes(DefaultExpireMinutes)
-                };
 
-                _cacheStates[key].Add(id, state);
+            _cacheStates.TryAdd(key, state);
 
-                _autoRefresh = autoRefresh;
+            if (!_autoRefresh || expirationTime == TimeSpan.MaxValue)
-                
+            {
-
+                return;
-                if (!_autoRefresh || expirationTime == TimeSpan.MaxValue)
-                {
-                    return;
-                }
-                
-                _timer = new Timer(state.ExpirationTime.TotalMilliseconds);
-                _timer.Elapsed += async (sender, args) => await RunCacheUpdate(state, CancellationToken.None);
-                _timer.Start();
             }
+
+            _timer = new Timer(state.ExpirationTime.TotalMilliseconds);
+            _timer.Elapsed += async (sender, args) => await RunCacheUpdate(state, CancellationToken.None);
+            _timer.Start();
         }
 
-        public async Task<TReturnType> GetCacheItem(string keyName, CancellationToken cancellationToken = default) =>
+        public async Task<TReturnType> GetCacheItem(string keyName, CancellationToken cancellationToken = default)
-            await GetCacheItem(keyName, null, cancellationToken);
-
-        public async Task<TReturnType> GetCacheItem(string keyName, object id = null,
-            CancellationToken cancellationToken = default)
         {
             if (!_cacheStates.ContainsKey(keyName))
             {
                 throw new ArgumentException("No cache found for key {key}", keyName);
             }
 
-            var state = id is null ? _cacheStates[keyName].Values.First() : _cacheStates[keyName][id];
+            var state = _cacheStates[keyName];
 
             // when auto refresh is off we want to check the expiration and value
             // when auto refresh is on, we want to only check the value, because it'll be refreshed automatically
@@ -137,4 +115,4 @@ namespace Data.Helpers
             }
         }
     }
-}
+}

Data/Helpers/LookupCache.cs

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

Data/MigrationContext/MySqlDatabaseContext.cs

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

Data/MigrationContext/PostgresqlDatabaseContext.cs

@@ -23,13 +23,12 @@ namespace Data.MigrationContext
         {
             if (MigrationExtensions.IsMigration)
             {
-                AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
                 optionsBuilder.UseNpgsql(
                         "Host=127.0.0.1;Database=IW4MAdmin_Migration;Username=postgres;Password=password;",
-                        options => options.SetPostgresVersion(new Version("12.9")))
+                        options => options.SetPostgresVersion(new Version("9.4")))
                     .EnableDetailedErrors(true)
                     .EnableSensitiveDataLogging(true);
             }
         }
     }
-}
+}

Data/Migrations/MySql/20220222215149_AddEFPenaltyIdentifier.cs

@@ -1,250 +0,0 @@
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Data.Migrations.MySql
-{
-    public partial class AddEFPenaltyIdentifier : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "EFPenaltyIdentifiers",
-                columns: table => new
-                {
-                    PenaltyIdentifierId = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                    IPv4Address = table.Column<int>(type: "int", nullable: true),
-                    NetworkId = table.Column<long>(type: "bigint", nullable: false),
-                    PenaltyId = table.Column<int>(type: "int", nullable: false),
-                    Active = table.Column<bool>(type: "tinyint(1)", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_EFPenaltyIdentifiers", x => x.PenaltyIdentifierId);
-                    table.ForeignKey(
-                        name: "FK_EFPenaltyIdentifiers_EFPenalties_PenaltyId",
-                        column: x => x.PenaltyId,
-                        principalTable: "EFPenalties",
-                        principalColumn: "PenaltyId",
-                        onDelete: ReferentialAction.Cascade);
-                })
-                .Annotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_EFPenaltyIdentifiers_IPv4Address",
-                table: "EFPenaltyIdentifiers",
-                column: "IPv4Address");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_EFPenaltyIdentifiers_NetworkId",
-                table: "EFPenaltyIdentifiers",
-                column: "NetworkId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_EFPenaltyIdentifiers_PenaltyId",
-                table: "EFPenaltyIdentifiers",
-                column: "PenaltyId");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "EFPenaltyIdentifiers");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "Message",
-                table: "InboxMessages",
-                type: "longtext CHARACTER SET utf8mb4",
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "longtext",
-                oldNullable: true)
-                .Annotation("MySql:CharSet", "utf8mb4")
-                .OldAnnotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "Name",
-                table: "EFWeaponAttachments",
-                type: "longtext CHARACTER SET utf8mb4",
-                nullable: false,
-                oldClrType: typeof(string),
-                oldType: "longtext")
-                .Annotation("MySql:CharSet", "utf8mb4")
-                .OldAnnotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "HostName",
-                table: "EFServers",
-                type: "longtext CHARACTER SET utf8mb4",
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "longtext",
-                oldNullable: true)
-                .Annotation("MySql:CharSet", "utf8mb4")
-                .OldAnnotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "EndPoint",
-                table: "EFServers",
-                type: "longtext CHARACTER SET utf8mb4",
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "longtext",
-                oldNullable: true)
-                .Annotation("MySql:CharSet", "utf8mb4")
-                .OldAnnotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "Offense",
-                table: "EFPenalties",
-                type: "longtext CHARACTER SET utf8mb4",
-                nullable: false,
-                oldClrType: typeof(string),
-                oldType: "longtext")
-                .Annotation("MySql:CharSet", "utf8mb4")
-                .OldAnnotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "AutomatedOffense",
-                table: "EFPenalties",
-                type: "longtext CHARACTER SET utf8mb4",
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "longtext",
-                oldNullable: true)
-                .Annotation("MySql:CharSet", "utf8mb4")
-                .OldAnnotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "Value",
-                table: "EFMeta",
-                type: "longtext CHARACTER SET utf8mb4",
-                nullable: false,
-                oldClrType: typeof(string),
-                oldType: "longtext")
-                .Annotation("MySql:CharSet", "utf8mb4")
-                .OldAnnotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "Extra",
-                table: "EFMeta",
-                type: "longtext CHARACTER SET utf8mb4",
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "longtext",
-                oldNullable: true)
-                .Annotation("MySql:CharSet", "utf8mb4")
-                .OldAnnotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "Name",
-                table: "EFMeansOfDeath",
-                type: "longtext CHARACTER SET utf8mb4",
-                nullable: false,
-                oldClrType: typeof(string),
-                oldType: "longtext")
-                .Annotation("MySql:CharSet", "utf8mb4")
-                .OldAnnotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "Name",
-                table: "EFMaps",
-                type: "longtext CHARACTER SET utf8mb4",
-                nullable: false,
-                oldClrType: typeof(string),
-                oldType: "longtext")
-                .Annotation("MySql:CharSet", "utf8mb4")
-                .OldAnnotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "PasswordSalt",
-                table: "EFClients",
-                type: "longtext CHARACTER SET utf8mb4",
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "longtext",
-                oldNullable: true)
-                .Annotation("MySql:CharSet", "utf8mb4")
-                .OldAnnotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "Password",
-                table: "EFClients",
-                type: "longtext CHARACTER SET utf8mb4",
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "longtext",
-                oldNullable: true)
-                .Annotation("MySql:CharSet", "utf8mb4")
-                .OldAnnotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "Message",
-                table: "EFClientMessages",
-                type: "longtext CHARACTER SET utf8mb4",
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "longtext",
-                oldNullable: true)
-                .Annotation("MySql:CharSet", "utf8mb4")
-                .OldAnnotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "WeaponReference",
-                table: "EFClientKills",
-                type: "longtext CHARACTER SET utf8mb4",
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "longtext",
-                oldNullable: true)
-                .Annotation("MySql:CharSet", "utf8mb4")
-                .OldAnnotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "PreviousValue",
-                table: "EFChangeHistory",
-                type: "longtext CHARACTER SET utf8mb4",
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "longtext",
-                oldNullable: true)
-                .Annotation("MySql:CharSet", "utf8mb4")
-                .OldAnnotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "CurrentValue",
-                table: "EFChangeHistory",
-                type: "longtext CHARACTER SET utf8mb4",
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "longtext",
-                oldNullable: true)
-                .Annotation("MySql:CharSet", "utf8mb4")
-                .OldAnnotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "WeaponReference",
-                table: "EFACSnapshot",
-                type: "longtext CHARACTER SET utf8mb4",
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "longtext",
-                oldNullable: true)
-                .Annotation("MySql:CharSet", "utf8mb4")
-                .OldAnnotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "HitLocationReference",
-                table: "EFACSnapshot",
-                type: "longtext CHARACTER SET utf8mb4",
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "longtext",
-                oldNullable: true)
-                .Annotation("MySql:CharSet", "utf8mb4")
-                .OldAnnotation("MySql:CharSet", "utf8mb4");
-        }
-    }
-}

Data/Migrations/MySql/20220222230049_MakeEFPenaltyLinkIdNullable.cs

@@ -1,56 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Data.Migrations.MySql
-{
-    public partial class MakeEFPenaltyLinkIdNullable : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_EFPenalties_EFAliasLinks_LinkId",
-                table: "EFPenalties");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "LinkId",
-                table: "EFPenalties",
-                type: "int",
-                nullable: true,
-                oldClrType: typeof(int),
-                oldType: "int");
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_EFPenalties_EFAliasLinks_LinkId",
-                table: "EFPenalties",
-                column: "LinkId",
-                principalTable: "EFAliasLinks",
-                principalColumn: "AliasLinkId");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_EFPenalties_EFAliasLinks_LinkId",
-                table: "EFPenalties");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "LinkId",
-                table: "EFPenalties",
-                type: "int",
-                nullable: false,
-                defaultValue: 0,
-                oldClrType: typeof(int),
-                oldType: "int",
-                oldNullable: true);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_EFPenalties_EFAliasLinks_LinkId",
-                table: "EFPenalties",
-                column: "LinkId",
-                principalTable: "EFAliasLinks",
-                principalColumn: "AliasLinkId",
-                onDelete: ReferentialAction.Cascade);
-        }
-    }
-}

Data/Migrations/MySql/20220223150028_AddAuditFieldsToEFPenaltyIdentifier.cs

@@ -1,48 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Data.Migrations.MySql
-{
-    public partial class AddAuditFieldsToEFPenaltyIdentifier : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "Active",
-                table: "EFPenaltyIdentifiers");
-
-            migrationBuilder.AddColumn<DateTime>(
-                name: "CreatedDateTime",
-                table: "EFPenaltyIdentifiers",
-                type: "datetime(6)",
-                nullable: false,
-                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
-
-            migrationBuilder.AddColumn<DateTime>(
-                name: "UpdatedDateTime",
-                table: "EFPenaltyIdentifiers",
-                type: "datetime(6)",
-                nullable: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "CreatedDateTime",
-                table: "EFPenaltyIdentifiers");
-
-            migrationBuilder.DropColumn(
-                name: "UpdatedDateTime",
-                table: "EFPenaltyIdentifiers");
-
-            migrationBuilder.AddColumn<bool>(
-                name: "Active",
-                table: "EFPenaltyIdentifiers",
-                type: "tinyint(1)",
-                nullable: false,
-                defaultValue: false);
-        }
-    }
-}

Data/Migrations/MySql/20220329213440_AddConnectionInterruptedToEFServerSnapshot.cs

@@ -1,25 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Data.Migrations.MySql
-{
-    public partial class AddConnectionInterruptedToEFServerSnapshot : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "ConnectionInterrupted",
-                table: "EFServerSnapshot",
-                type: "tinyint(1)",
-                nullable: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "ConnectionInterrupted",
-                table: "EFServerSnapshot");
-        }
-    }
-}

Data/Migrations/MySql/20220404151444_AddSearchableIPToEFAlias.cs

@@ -1,28 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Data.Migrations.MySql
-{
-    public partial class AddSearchableIPToEFAlias : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "SearchableIPAddress",
-                table: "EFAlias",
-                type: "longtext",
-                nullable: true,
-                computedColumnSql: "CONCAT((IPAddress & 255), \".\", ((IPAddress >> 8) & 255), \".\", ((IPAddress >> 16) & 255), \".\", ((IPAddress >> 24) & 255))",
-                stored: true)
-                .Annotation("MySql:CharSet", "utf8mb4");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "SearchableIPAddress",
-                table: "EFAlias");
-        }
-    }
-}

Data/Migrations/MySql/20220404192417_AddIndexToSearchableIPToEFAlias.cs

@@ -1,24 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Data.Migrations.MySql
-{
-    public partial class AddIndexToSearchableIPToEFAlias : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateIndex(
-                name: "IX_EFAlias_SearchableIPAddress",
-                table: "EFAlias",
-                column: "SearchableIPAddress");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_EFAlias_SearchableIPAddress",
-                table: "EFAlias");
-        }
-    }
-}

Data/Migrations/MySql/20220422202702_AddGameToEFClient.cs

@@ -1,25 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Data.Migrations.MySql
-{
-    public partial class AddGameToEFClient : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<int>(
-                name: "GameName",
-                table: "EFClients",
-                type: "int",
-                nullable: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "GameName",
-                table: "EFClients");
-        }
-    }
-}

Data/Migrations/MySql/20220609135128_AddIndexToEFRankingHistoryCreatedDatetime.cs

@@ -1,24 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Data.Migrations.MySql
-{
-    public partial class AddIndexToEFRankingHistoryCreatedDatetime : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateIndex(
-                name: "IX_EFClientRankingHistory_CreatedDateTime",
-                table: "EFClientRankingHistory",
-                column: "CreatedDateTime");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_EFClientRankingHistory_CreatedDateTime",
-                table: "EFClientRankingHistory");
-        }
-    }
-}

Data/Migrations/MySql/20220613192602_AddAlternateKeyToEFClients.cs

@@ -1,63 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Data.Migrations.MySql
-{
-    public partial class AddAlternateKeyToEFClients : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_EFClients_NetworkId",
-                table: "EFClients");
-            
-            migrationBuilder.Sql("UPDATE `EFClients` set `GameName` = 0 WHERE `GameName` IS NULL");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "GameName",
-                table: "EFClients",
-                type: "int",
-                nullable: false,
-                defaultValue: 0,
-                oldClrType: typeof(int),
-                oldType: "int",
-                oldNullable: true);
-
-            migrationBuilder.AddUniqueConstraint(
-                name: "AK_EFClients_NetworkId_GameName",
-                table: "EFClients",
-                columns: new[] { "NetworkId", "GameName" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_EFClients_NetworkId",
-                table: "EFClients",
-                column: "NetworkId");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropUniqueConstraint(
-                name: "AK_EFClients_NetworkId_GameName",
-                table: "EFClients");
-
-            migrationBuilder.DropIndex(
-                name: "IX_EFClients_NetworkId",
-                table: "EFClients");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "GameName",
-                table: "EFClients",
-                type: "int",
-                nullable: true,
-                oldClrType: typeof(int),
-                oldType: "int");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_EFClients_NetworkId",
-                table: "EFClients",
-                column: "NetworkId",
-                unique: true);
-        }
-    }
-}

Data/Migrations/MySql/20220616224602_AddDescendingTimeSentIndexEFClientMessages.cs

@@ -1,27 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Data.Migrations.MySql
-{
-    public partial class AddDescendingTimeSentIndexEFClientMessages : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            try
-            {
-                migrationBuilder.Sql(@"create index IX_EFClientMessages_TimeSentDesc on EFClientMessages (TimeSent desc);");
-            }
-            catch
-            {
-                migrationBuilder.Sql(@"create index IX_EFClientMessages_TimeSentDesc on efclientmessages (TimeSent desc);");
-            }
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql(@"drop index IX_EFClientMessages_TimeSentDesc on EFClientMessages;");
-        }
-    }
-}

Data/Migrations/MySql/MySqlDatabaseContextModelSnapshot.cs

@@ -5,8 +5,6 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
-#nullable disable
-
 namespace Data.Migrations.MySql
 {
     [DbContext(typeof(MySqlDatabaseContext))]
@@ -16,7 +14,7 @@ namespace Data.Migrations.MySql
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.1")
+                .HasAnnotation("ProductVersion", "3.1.10")
                 .HasAnnotation("Relational:MaxIdentifierLength", 64);
 
             modelBuilder.Entity("Data.Models.Client.EFACSnapshotVector3", b =>
@@ -40,7 +38,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("Vector3Id");
 
-                    b.ToTable("EFACSnapshotVector3", (string)null);
+                    b.ToTable("EFACSnapshotVector3");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClient", b =>
@@ -64,9 +62,6 @@ namespace Data.Migrations.MySql
                     b.Property<DateTime>("FirstConnection")
                         .HasColumnType("datetime(6)");
 
-                    b.Property<int>("GameName")
-                        .HasColumnType("int");
-
                     b.Property<DateTime>("LastConnection")
                         .HasColumnType("datetime(6)");
 
@@ -80,25 +75,24 @@ namespace Data.Migrations.MySql
                         .HasColumnType("bigint");
 
                     b.Property<string>("Password")
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<string>("PasswordSalt")
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<int>("TotalConnectionTime")
                         .HasColumnType("int");
 
                     b.HasKey("ClientId");
 
-                    b.HasAlternateKey("NetworkId", "GameName");
-
                     b.HasIndex("AliasLinkId");
 
                     b.HasIndex("CurrentAliasId");
 
-                    b.HasIndex("NetworkId");
+                    b.HasIndex("NetworkId")
+                        .IsUnique();
 
-                    b.ToTable("EFClients", (string)null);
+                    b.ToTable("EFClients");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientConnectionHistory", b =>
@@ -130,7 +124,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFClientConnectionHistory", (string)null);
+                    b.ToTable("EFClientConnectionHistory");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientKill", b =>
@@ -185,7 +179,7 @@ namespace Data.Migrations.MySql
                         .HasColumnType("int");
 
                     b.Property<string>("WeaponReference")
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<DateTime>("When")
                         .HasColumnType("datetime(6)");
@@ -204,7 +198,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ViewAnglesVector3Id");
 
-                    b.ToTable("EFClientKills", (string)null);
+                    b.ToTable("EFClientKills");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientMessage", b =>
@@ -220,7 +214,7 @@ namespace Data.Migrations.MySql
                         .HasColumnType("int");
 
                     b.Property<string>("Message")
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<bool>("SentIngame")
                         .HasColumnType("tinyint(1)");
@@ -239,7 +233,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("TimeSent");
 
-                    b.ToTable("EFClientMessages", (string)null);
+                    b.ToTable("EFClientMessages");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFACSnapshot", b =>
@@ -279,7 +273,7 @@ namespace Data.Migrations.MySql
                         .HasColumnType("int");
 
                     b.Property<string>("HitLocationReference")
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<int>("HitOriginId")
                         .HasColumnType("int");
@@ -327,7 +321,7 @@ namespace Data.Migrations.MySql
                         .HasColumnType("int");
 
                     b.Property<string>("WeaponReference")
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<DateTime>("When")
                         .HasColumnType("datetime(6)");
@@ -346,7 +340,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFACSnapshot", (string)null);
+                    b.ToTable("EFACSnapshot");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientHitStatistic", b =>
@@ -420,7 +414,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("WeaponId");
 
-                    b.ToTable("EFClientHitStatistics", (string)null);
+                    b.ToTable("EFClientHitStatistics");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientRankingHistory", b =>
@@ -457,8 +451,6 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ClientId");
 
-                    b.HasIndex("CreatedDateTime");
-
                     b.HasIndex("Ranking");
 
                     b.HasIndex("ServerId");
@@ -467,7 +459,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ZScore");
 
-                    b.ToTable("EFClientRankingHistory", (string)null);
+                    b.ToTable("EFClientRankingHistory");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientRatingHistory", b =>
@@ -486,7 +478,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ClientId");
 
-                    b.ToTable("EFClientRatingHistory", (string)null);
+                    b.ToTable("EFClientRatingHistory");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientStatistics", b =>
@@ -544,7 +536,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ClientId", "TimePlayed", "ZScore");
 
-                    b.ToTable("EFClientStatistics", (string)null);
+                    b.ToTable("EFClientStatistics");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFHitLocationCount", b =>
@@ -557,12 +549,12 @@ namespace Data.Migrations.MySql
                         .HasColumnType("tinyint(1)");
 
                     b.Property<int>("EFClientStatisticsClientId")
-                        .HasColumnType("int")
+                        .HasColumnName("EFClientStatisticsClientId")
-                        .HasColumnName("EFClientStatisticsClientId");
+                        .HasColumnType("int");
 
                     b.Property<long>("EFClientStatisticsServerId")
-                        .HasColumnType("bigint")
+                        .HasColumnName("EFClientStatisticsServerId")
-                        .HasColumnName("EFClientStatisticsServerId");
+                        .HasColumnType("bigint");
 
                     b.Property<int>("HitCount")
                         .HasColumnType("int");
@@ -582,7 +574,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("EFClientStatisticsClientId", "EFClientStatisticsServerId");
 
-                    b.ToTable("EFHitLocationCounts", (string)null);
+                    b.ToTable("EFHitLocationCounts");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFRating", b =>
@@ -625,7 +617,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("When", "ServerId", "Performance", "ActivityAmount");
 
-                    b.ToTable("EFRating", (string)null);
+                    b.ToTable("EFRating");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFHitLocation", b =>
@@ -642,7 +634,7 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasColumnType("varchar(255)");
+                        .HasColumnType("varchar(255) CHARACTER SET utf8mb4");
 
                     b.Property<DateTime?>("UpdatedDateTime")
                         .HasColumnType("datetime(6)");
@@ -651,7 +643,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("Name");
 
-                    b.ToTable("EFHitLocations", (string)null);
+                    b.ToTable("EFHitLocations");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFMap", b =>
@@ -668,14 +660,14 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<DateTime?>("UpdatedDateTime")
                         .HasColumnType("datetime(6)");
 
                     b.HasKey("MapId");
 
-                    b.ToTable("EFMaps", (string)null);
+                    b.ToTable("EFMaps");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFMeansOfDeath", b =>
@@ -692,14 +684,14 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<DateTime?>("UpdatedDateTime")
                         .HasColumnType("datetime(6)");
 
                     b.HasKey("MeansOfDeathId");
 
-                    b.ToTable("EFMeansOfDeath", (string)null);
+                    b.ToTable("EFMeansOfDeath");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFWeapon", b =>
@@ -716,7 +708,7 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasColumnType("varchar(255)");
+                        .HasColumnType("varchar(255) CHARACTER SET utf8mb4");
 
                     b.Property<DateTime?>("UpdatedDateTime")
                         .HasColumnType("datetime(6)");
@@ -725,7 +717,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("Name");
 
-                    b.ToTable("EFWeapons", (string)null);
+                    b.ToTable("EFWeapons");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFWeaponAttachment", b =>
@@ -742,14 +734,14 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<DateTime?>("UpdatedDateTime")
                         .HasColumnType("datetime(6)");
 
                     b.HasKey("WeaponAttachmentId");
 
-                    b.ToTable("EFWeaponAttachments", (string)null);
+                    b.ToTable("EFWeaponAttachments");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFWeaponAttachmentCombo", b =>
@@ -784,7 +776,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("Attachment3Id");
 
-                    b.ToTable("EFWeaponAttachmentCombos", (string)null);
+                    b.ToTable("EFWeaponAttachmentCombos");
                 });
 
             modelBuilder.Entity("Data.Models.EFAlias", b =>
@@ -807,17 +799,12 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasMaxLength(24)
+                        .HasColumnType("varchar(24) CHARACTER SET utf8mb4")
-                        .HasColumnType("varchar(24)");
+                        .HasMaxLength(24);
-
-                    b.Property<string>("SearchableIPAddress")
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("varchar(255)")
-                        .HasComputedColumnSql("((IPAddress & 255) || '.' || ((IPAddress >> 8) & 255)) || '.' || ((IPAddress >> 16) & 255) || '.' || ((IPAddress >> 24) & 255)", true);
 
                     b.Property<string>("SearchableName")
-                        .HasMaxLength(24)
+                        .HasColumnType("varchar(24) CHARACTER SET utf8mb4")
-                        .HasColumnType("varchar(24)");
+                        .HasMaxLength(24);
 
                     b.HasKey("AliasId");
 
@@ -827,13 +814,11 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("Name");
 
-                    b.HasIndex("SearchableIPAddress");
-
                     b.HasIndex("SearchableName");
 
                     b.HasIndex("Name", "IPAddress");
 
-                    b.ToTable("EFAlias", (string)null);
+                    b.ToTable("EFAlias");
                 });
 
             modelBuilder.Entity("Data.Models.EFAliasLink", b =>
@@ -847,7 +832,7 @@ namespace Data.Migrations.MySql
 
                     b.HasKey("AliasLinkId");
 
-                    b.ToTable("EFAliasLinks", (string)null);
+                    b.ToTable("EFAliasLinks");
                 });
 
             modelBuilder.Entity("Data.Models.EFChangeHistory", b =>
@@ -860,11 +845,11 @@ namespace Data.Migrations.MySql
                         .HasColumnType("tinyint(1)");
 
                     b.Property<string>("Comment")
-                        .HasMaxLength(128)
+                        .HasColumnType("varchar(128) CHARACTER SET utf8mb4")
-                        .HasColumnType("varchar(128)");
+                        .HasMaxLength(128);
 
                     b.Property<string>("CurrentValue")
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<int?>("ImpersonationEntityId")
                         .HasColumnType("int");
@@ -873,7 +858,7 @@ namespace Data.Migrations.MySql
                         .HasColumnType("int");
 
                     b.Property<string>("PreviousValue")
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<int>("TargetEntityId")
                         .HasColumnType("int");
@@ -905,12 +890,12 @@ namespace Data.Migrations.MySql
                         .HasColumnType("datetime(6)");
 
                     b.Property<string>("Extra")
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<string>("Key")
                         .IsRequired()
-                        .HasMaxLength(32)
+                        .HasColumnType("varchar(32) CHARACTER SET utf8mb4")
-                        .HasColumnType("varchar(32)");
+                        .HasMaxLength(32);
 
                     b.Property<int?>("LinkedMetaId")
                         .HasColumnType("int");
@@ -920,7 +905,7 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("Value")
                         .IsRequired()
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.HasKey("MetaId");
 
@@ -943,7 +928,7 @@ namespace Data.Migrations.MySql
                         .HasColumnType("tinyint(1)");
 
                     b.Property<string>("AutomatedOffense")
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<DateTime?>("Expires")
                         .HasColumnType("datetime(6)");
@@ -951,7 +936,7 @@ namespace Data.Migrations.MySql
                     b.Property<bool>("IsEvadedOffense")
                         .HasColumnType("tinyint(1)");
 
-                    b.Property<int?>("LinkId")
+                    b.Property<int>("LinkId")
                         .HasColumnType("int");
 
                     b.Property<int>("OffenderId")
@@ -959,7 +944,7 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("Offense")
                         .IsRequired()
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<int>("PunisherId")
                         .HasColumnType("int");
@@ -978,39 +963,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("PunisherId");
 
-                    b.ToTable("EFPenalties", (string)null);
+                    b.ToTable("EFPenalties");
-                });
-
-            modelBuilder.Entity("Data.Models.EFPenaltyIdentifier", b =>
-                {
-                    b.Property<int>("PenaltyIdentifierId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("CreatedDateTime")
-                        .HasColumnType("datetime(6)");
-
-                    b.Property<int?>("IPv4Address")
-                        .HasColumnType("int");
-
-                    b.Property<long>("NetworkId")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("PenaltyId")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime?>("UpdatedDateTime")
-                        .HasColumnType("datetime(6)");
-
-                    b.HasKey("PenaltyIdentifierId");
-
-                    b.HasIndex("IPv4Address");
-
-                    b.HasIndex("NetworkId");
-
-                    b.HasIndex("PenaltyId");
-
-                    b.ToTable("EFPenaltyIdentifiers", (string)null);
                 });
 
             modelBuilder.Entity("Data.Models.Misc.EFInboxMessage", b =>
@@ -1029,7 +982,7 @@ namespace Data.Migrations.MySql
                         .HasColumnType("tinyint(1)");
 
                     b.Property<string>("Message")
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<long?>("ServerId")
                         .HasColumnType("bigint");
@@ -1060,13 +1013,13 @@ namespace Data.Migrations.MySql
                         .HasColumnType("tinyint(1)");
 
                     b.Property<string>("EndPoint")
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<int?>("GameName")
                         .HasColumnType("int");
 
                     b.Property<string>("HostName")
-                        .HasColumnType("longtext");
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
 
                     b.Property<bool>("IsPasswordProtected")
                         .HasColumnType("tinyint(1)");
@@ -1076,7 +1029,7 @@ namespace Data.Migrations.MySql
 
                     b.HasKey("ServerId");
 
-                    b.ToTable("EFServers", (string)null);
+                    b.ToTable("EFServers");
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerSnapshot", b =>
@@ -1094,9 +1047,6 @@ namespace Data.Migrations.MySql
                     b.Property<int>("ClientCount")
                         .HasColumnType("int");
 
-                    b.Property<bool?>("ConnectionInterrupted")
-                        .HasColumnType("tinyint(1)");
-
                     b.Property<int>("MapId")
                         .HasColumnType("int");
 
@@ -1112,7 +1062,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFServerSnapshot", (string)null);
+                    b.ToTable("EFServerSnapshot");
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerStatistics", b =>
@@ -1137,7 +1087,7 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ServerId");
 
-                    b.ToTable("EFServerStatistics", (string)null);
+                    b.ToTable("EFServerStatistics");
                 });
 
             modelBuilder.Entity("Data.Models.Vector3", b =>
@@ -1157,7 +1107,7 @@ namespace Data.Migrations.MySql
 
                     b.HasKey("Vector3Id");
 
-                    b.ToTable("Vector3", (string)null);
+                    b.ToTable("Vector3");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFACSnapshotVector3", b =>
@@ -1173,10 +1123,6 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("Vector3Id")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Snapshot");
-
-                    b.Navigation("Vector");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClient", b =>
@@ -1192,10 +1138,6 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("CurrentAliasId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("AliasLink");
-
-                    b.Navigation("CurrentAlias");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientConnectionHistory", b =>
@@ -1211,10 +1153,6 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientKill", b =>
@@ -1248,18 +1186,6 @@ namespace Data.Migrations.MySql
                     b.HasOne("Data.Models.Vector3", "ViewAngles")
                         .WithMany()
                         .HasForeignKey("ViewAnglesVector3Id");
-
-                    b.Navigation("Attacker");
-
-                    b.Navigation("DeathOrigin");
-
-                    b.Navigation("KillOrigin");
-
-                    b.Navigation("Server");
-
-                    b.Navigation("Victim");
-
-                    b.Navigation("ViewAngles");
                 });
 
             modelBuilder.Entity("Data.Models.Client.EFClientMessage", b =>
@@ -1275,10 +1201,6 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFACSnapshot", b =>
@@ -1316,18 +1238,6 @@ namespace Data.Migrations.MySql
                     b.HasOne("Data.Models.Server.EFServer", "Server")
                         .WithMany()
                         .HasForeignKey("ServerId");
-
-                    b.Navigation("Client");
-
-                    b.Navigation("CurrentViewAngle");
-
-                    b.Navigation("HitDestination");
-
-                    b.Navigation("HitOrigin");
-
-                    b.Navigation("LastStrainAngle");
-
-                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientHitStatistic", b =>
@@ -1357,18 +1267,6 @@ namespace Data.Migrations.MySql
                     b.HasOne("Data.Models.Client.Stats.Reference.EFWeapon", "Weapon")
                         .WithMany()
                         .HasForeignKey("WeaponId");
-
-                    b.Navigation("Client");
-
-                    b.Navigation("HitLocation");
-
-                    b.Navigation("MeansOfDeath");
-
-                    b.Navigation("Server");
-
-                    b.Navigation("Weapon");
-
-                    b.Navigation("WeaponAttachmentCombo");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientRankingHistory", b =>
@@ -1382,10 +1280,6 @@ namespace Data.Migrations.MySql
                     b.HasOne("Data.Models.Server.EFServer", "Server")
                         .WithMany()
                         .HasForeignKey("ServerId");
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientRatingHistory", b =>
@@ -1395,8 +1289,6 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("ClientId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Client");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFClientStatistics", b =>
@@ -1412,10 +1304,6 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFHitLocationCount", b =>
@@ -1437,10 +1325,6 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("EFClientStatisticsClientId", "EFClientStatisticsServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.EFRating", b =>
@@ -1454,10 +1338,6 @@ namespace Data.Migrations.MySql
                     b.HasOne("Data.Models.Server.EFServer", "Server")
                         .WithMany()
                         .HasForeignKey("ServerId");
-
-                    b.Navigation("RatingHistory");
-
-                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Client.Stats.Reference.EFWeaponAttachmentCombo", b =>
@@ -1475,12 +1355,6 @@ namespace Data.Migrations.MySql
                     b.HasOne("Data.Models.Client.Stats.Reference.EFWeaponAttachment", "Attachment3")
                         .WithMany()
                         .HasForeignKey("Attachment3Id");
-
-                    b.Navigation("Attachment1");
-
-                    b.Navigation("Attachment2");
-
-                    b.Navigation("Attachment3");
                 });
 
             modelBuilder.Entity("Data.Models.EFAlias", b =>
@@ -1490,8 +1364,6 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("LinkId")
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
-
-                    b.Navigation("Link");
                 });
 
             modelBuilder.Entity("Data.Models.EFMeta", b =>
@@ -1504,17 +1376,15 @@ namespace Data.Migrations.MySql
                         .WithMany()
                         .HasForeignKey("LinkedMetaId")
                         .OnDelete(DeleteBehavior.SetNull);
-
-                    b.Navigation("Client");
-
-                    b.Navigation("LinkedMeta");
                 });
 
             modelBuilder.Entity("Data.Models.EFPenalty", b =>
                 {
                     b.HasOne("Data.Models.EFAliasLink", "Link")
                         .WithMany("ReceivedPenalties")
-                        .HasForeignKey("LinkId");
+                        .HasForeignKey("LinkId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
 
                     b.HasOne("Data.Models.Client.EFClient", "Offender")
                         .WithMany("ReceivedPenalties")
@@ -1527,23 +1397,6 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("PunisherId")
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
-
-                    b.Navigation("Link");
-
-                    b.Navigation("Offender");
-
-                    b.Navigation("Punisher");
-                });
-
-            modelBuilder.Entity("Data.Models.EFPenaltyIdentifier", b =>
-                {
-                    b.HasOne("Data.Models.EFPenalty", "Penalty")
-                        .WithMany()
-                        .HasForeignKey("PenaltyId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Penalty");
                 });
 
             modelBuilder.Entity("Data.Models.Misc.EFInboxMessage", b =>
@@ -1563,12 +1416,6 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("SourceClientId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("DestinationClient");
-
-                    b.Navigation("Server");
-
-                    b.Navigation("SourceClient");
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerSnapshot", b =>
@@ -1584,10 +1431,6 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Map");
-
-                    b.Navigation("Server");
                 });
 
             modelBuilder.Entity("Data.Models.Server.EFServerStatistics", b =>
@@ -1597,39 +1440,6 @@ namespace Data.Migrations.MySql
                         .HasForeignKey("ServerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Server");
-                });
-
-            modelBuilder.Entity("Data.Models.Client.EFClient", b =>
-                {
-                    b.Navigation("AdministeredPenalties");
-
-                    b.Navigation("Meta");
-
-                    b.Navigation("ReceivedPenalties");
-                });
-
-            modelBuilder.Entity("Data.Models.Client.Stats.EFACSnapshot", b =>
-                {
-                    b.Navigation("PredictedViewAngles");
-                });
-
-            modelBuilder.Entity("Data.Models.Client.Stats.EFClientRatingHistory", b =>
-                {
-                    b.Navigation("Ratings");
-                });
-
-            modelBuilder.Entity("Data.Models.Client.Stats.EFClientStatistics", b =>
-                {
-                    b.Navigation("HitLocations");
-                });
-
-            modelBuilder.Entity("Data.Models.EFAliasLink", b =>
-                {
-                    b.Navigation("Children");
-
-                    b.Navigation("ReceivedPenalties");
                 });
 #pragma warning restore 612, 618
         }

Data/Migrations/Postgresql/20220222222045_AddEFPenaltyIdentifier.cs

@@ -1,56 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace Data.Migrations.Postgresql
-{
-    public partial class AddEFPenaltyIdentifier : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "EFPenaltyIdentifiers",
-                columns: table => new
-                {
-                    PenaltyIdentifierId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    IPv4Address = table.Column<int>(type: "integer", nullable: true),
-                    NetworkId = table.Column<long>(type: "bigint", nullable: false),
-                    PenaltyId = table.Column<int>(type: "integer", nullable: false),
-                    Active = table.Column<bool>(type: "boolean", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_EFPenaltyIdentifiers", x => x.PenaltyIdentifierId);
-                    table.ForeignKey(
-                        name: "FK_EFPenaltyIdentifiers_EFPenalties_PenaltyId",
-                        column: x => x.PenaltyId,
-                        principalTable: "EFPenalties",
-                        principalColumn: "PenaltyId",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_EFPenaltyIdentifiers_IPv4Address",
-                table: "EFPenaltyIdentifiers",
-                column: "IPv4Address");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_EFPenaltyIdentifiers_NetworkId",
-                table: "EFPenaltyIdentifiers",
-                column: "NetworkId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_EFPenaltyIdentifiers_PenaltyId",
-                table: "EFPenaltyIdentifiers",
-                column: "PenaltyId");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "EFPenaltyIdentifiers");
-        }
-    }
-}

Data/Migrations/Postgresql/20220222230153_MakeEFPenaltyLinkIdNullable.cs

@@ -1,56 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Data.Migrations.Postgresql
-{
-    public partial class MakeEFPenaltyLinkIdNullable : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_EFPenalties_EFAliasLinks_LinkId",
-                table: "EFPenalties");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "LinkId",
-                table: "EFPenalties",
-                type: "integer",
-                nullable: true,
-                oldClrType: typeof(int),
-                oldType: "integer");
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_EFPenalties_EFAliasLinks_LinkId",
-                table: "EFPenalties",
-                column: "LinkId",
-                principalTable: "EFAliasLinks",
-                principalColumn: "AliasLinkId");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_EFPenalties_EFAliasLinks_LinkId",
-                table: "EFPenalties");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "LinkId",
-                table: "EFPenalties",
-                type: "integer",
-                nullable: false,
-                defaultValue: 0,
-                oldClrType: typeof(int),
-                oldType: "integer",
-                oldNullable: true);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_EFPenalties_EFAliasLinks_LinkId",
-                table: "EFPenalties",
-                column: "LinkId",
-                principalTable: "EFAliasLinks",
-                principalColumn: "AliasLinkId",
-                onDelete: ReferentialAction.Cascade);
-        }
-    }
-}

Data/Migrations/Postgresql/20220223150106_AddAuditFieldsToEFPenaltyIdentifier.cs

@@ -1,48 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Data.Migrations.Postgresql
-{
-    public partial class AddAuditFieldsToEFPenaltyIdentifier : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "Active",
-                table: "EFPenaltyIdentifiers");
-
-            migrationBuilder.AddColumn<DateTime>(
-                name: "CreatedDateTime",
-                table: "EFPenaltyIdentifiers",
-                type: "timestamp without time zone",
-                nullable: false,
-                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
-
-            migrationBuilder.AddColumn<DateTime>(
-                name: "UpdatedDateTime",
-                table: "EFPenaltyIdentifiers",
-                type: "timestamp without time zone",
-                nullable: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "CreatedDateTime",
-                table: "EFPenaltyIdentifiers");
-
-            migrationBuilder.DropColumn(
-                name: "UpdatedDateTime",
-                table: "EFPenaltyIdentifiers");
-
-            migrationBuilder.AddColumn<bool>(
-                name: "Active",
-                table: "EFPenaltyIdentifiers",
-                type: "boolean",
-                nullable: false,
-                defaultValue: false);
-        }
-    }
-}

Data/Migrations/Postgresql/20220329213521_AddConnectionInterruptedToEFServerSnapshot.cs

@@ -1,25 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Data.Migrations.Postgresql
-{
-    public partial class AddConnectionInterruptedToEFServerSnapshot : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "ConnectionInterrupted",
-                table: "EFServerSnapshot",
-                type: "boolean",
-                nullable: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "ConnectionInterrupted",
-                table: "EFServerSnapshot");
-        }
-    }
-}

Data/Migrations/Postgresql/20220404185627_AddSearchableIPToEFAlias.cs

@@ -1,27 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Data.Migrations.Postgresql
-{
-    public partial class AddSearchableIPToEFAlias : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "SearchableIPAddress",
-                table: "EFAlias",
-                type: "text",
-                nullable: true,
-                computedColumnSql: "CASE WHEN \"IPAddress\" IS NULL THEN 'NULL'::text ELSE (\"IPAddress\" & 255)::text || '.'::text || ((\"IPAddress\" >> 8) & 255)::text || '.'::text || ((\"IPAddress\" >> 16) & 255)::text || '.'::text || ((\"IPAddress\" >> 24) & 255)::text END",
-                stored: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "SearchableIPAddress",
-                table: "EFAlias");
-        }
-    }
-}

Data/Migrations/Postgresql/20220404192553_AddIndexToSearchableIPToEFAlias.cs

@@ -1,24 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Data.Migrations.Postgresql
-{
-    public partial class AddIndexToSearchableIPToEFAlias : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateIndex(
-                name: "IX_EFAlias_SearchableIPAddress",
-                table: "EFAlias",
-                column: "SearchableIPAddress");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_EFAlias_SearchableIPAddress",
-                table: "EFAlias");
-        }
-    }
-}

Data/Migrations/Postgresql/20220422203121_AddGameToEFClient.cs

@@ -1,25 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Data.Migrations.Postgresql
-{
-    public partial class AddGameToEFClient : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<int>(
-                name: "GameName",
-                table: "EFClients",
-                type: "integer",
-                nullable: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "GameName",
-                table: "EFClients");
-        }
-    }
-}

Data/Migrations/Postgresql/20220609135210_AddIndexToEFRankingHistoryCreatedDatetime.cs

@@ -1,24 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Data.Migrations.Postgresql
-{
-    public partial class AddIndexToEFRankingHistoryCreatedDatetime : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateIndex(
-                name: "IX_EFClientRankingHistory_CreatedDateTime",
-                table: "EFClientRankingHistory",
-                column: "CreatedDateTime");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_EFClientRankingHistory_CreatedDateTime",
-                table: "EFClientRankingHistory");
-        }
-    }
-}

Data/Migrations/Postgresql/20220613181913_AddAlternateKeyToEFClients.cs

@@ -1,63 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Data.Migrations.Postgresql
-{
-    public partial class AddAlternateKeyToEFClients : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_EFClients_NetworkId",
-                table: "EFClients");
-
-            migrationBuilder.Sql("UPDATE \"EFClients\" SET \"GameName\" = 0 WHERE \"GameName\" IS NULL");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "GameName",
-                table: "EFClients",
-                type: "integer",
-                nullable: false,
-                defaultValue: 0,
-                oldClrType: typeof(int),
-                oldType: "integer",
-                oldNullable: true);
-
-            migrationBuilder.AddUniqueConstraint(
-                name: "AK_EFClients_NetworkId_GameName",
-                table: "EFClients",
-                columns: new[] { "NetworkId", "GameName" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_EFClients_NetworkId",
-                table: "EFClients",
-                column: "NetworkId");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropUniqueConstraint(
-                name: "AK_EFClients_NetworkId_GameName",
-                table: "EFClients");
-
-            migrationBuilder.DropIndex(
-                name: "IX_EFClients_NetworkId",
-                table: "EFClients");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "GameName",
-                table: "EFClients",
-                type: "integer",
-                nullable: true,
-                oldClrType: typeof(int),
-                oldType: "integer");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_EFClients_NetworkId",
-                table: "EFClients",
-                column: "NetworkId",
-                unique: true);
-        }
-    }
-}

Data/Migrations/Postgresql/20220616224145_AddDescendingTimeSentIndexEFClientMessages.cs

@@ -1,24 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Data.Migrations.Postgresql
-{
-    public partial class AddDescendingTimeSentIndexEFClientMessages : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql(
-                @"CREATE INDEX""IX_EFClientMessages_TimeSentDesc""
-                ON public.""EFClientMessages"" USING btree
-                (""TimeSent"" DESC NULLS LAST)
-                TABLESPACE pg_default;"
-            );
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql(@"DROP INDEX public.""IX_EFClientMessages_TimeSentDesc""");
-        }
-    }
-}