Initial .net 6 upgrades

Application/Application.csproj

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

Application/ApplicationManager.cs

@@ -551,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, ServerInstance.ToString());
+                        _logger.LogInformation("Finishing initialization and now monitoring [{Server}]", ServerInstance.Hostname);
                     }
 
                     // add the start event for this server

Application/Extensions/StartupExtensions.cs

@@ -78,8 +78,10 @@ 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(appConfig.ConnectionString + (appendTimeout ? ";default command timeout=0" : ""),
+                        .UseMySql(connectionString, ServerVersion.AutoDetect(connectionString),
                             mysqlOptions => mysqlOptions.EnableRetryOnFailure())
                         .UseLoggerFactory(sp.GetRequiredService<ILoggerFactory>()).Options);
                     return services;

Application/IW4MServer.cs

@@ -53,7 +53,9 @@ namespace IW4MAdmin
             IServiceProvider serviceProvider,
             IClientNoticeMessageFormatter messageFormatter,
             ILookupCache<EFServer> serverCache) : base(serviceProvider.GetRequiredService<ILogger<Server>>(), 
+#pragma warning disable CS0612
             serviceProvider.GetRequiredService<SharedLibraryCore.Interfaces.ILogger>(), 
+#pragma warning restore CS0612
             serverConfiguration,
             serviceProvider.GetRequiredService<IManager>(), 
             serviceProvider.GetRequiredService<IRConConnectionFactory>(),

Application/Main.cs

@@ -412,7 +412,9 @@ namespace IW4MAdmin.Application
                 .AddSingleton<IRemoteAssemblyHandler, RemoteAssemblyHandler>()
                 .AddSingleton<IMasterCommunication, MasterCommunication>()
                 .AddSingleton<IManager, ApplicationManager>()
+#pragma warning disable CS0612
                 .AddSingleton<SharedLibraryCore.Interfaces.ILogger, Logger>()
+#pragma warning restore CS0612
                 .AddSingleton<IClientNoticeMessageFormatter, ClientNoticeMessageFormatter>()
                 .AddSingleton<IClientStatisticCalculator, HitCalculator>()
                 .AddSingleton<IServerDistributionCalculator, ServerDistributionCalculator>()

Application/Misc/BaseConfigurationHandler.cs

@@ -52,7 +52,7 @@ namespace IW4MAdmin.Application.Misc
             }
         }
 
-        public Task Save()
+        public async Task Save()
         {
             var settings = new JsonSerializerSettings()
             {
@@ -60,8 +60,8 @@ namespace IW4MAdmin.Application.Misc
             };
             settings.Converters.Add(new Newtonsoft.Json.Converters.StringEnumConverter());
 
-            var appConfigJSON = JsonConvert.SerializeObject(_configuration, settings);
+            var appConfigJson = JsonConvert.SerializeObject(_configuration, settings);
-            return File.WriteAllTextAsync(FileName, appConfigJSON);
+            await File.WriteAllTextAsync(FileName, appConfigJson);
         }
 
         public T Configuration()

Application/Misc/MasterCommunication.cs

@@ -93,9 +93,6 @@ namespace IW4MAdmin.Application.Misc
 
         public async Task RunUploadStatus(CancellationToken token)
         {
-            // todo: clean up this logic
-            bool connected;
-
             while (!token.IsCancellationRequested)
             {
                 try
@@ -103,40 +100,11 @@ namespace IW4MAdmin.Application.Misc
                     await UploadStatus();
                 }
 
-                catch (System.Net.Http.HttpRequestException e)
+                catch (Exception ex)
                 {
-                    _logger.LogWarning(e, "Could not send heartbeat");
+                    _logger.LogWarning(ex, "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)
-                    {
-                        if (((ApiException)ex).StatusCode == System.Net.HttpStatusCode.Unauthorized)
-                        {
-                            connected = false;
-                        }
-                    }
-                }
-
-                catch (ApiException e)
-                {
-                    _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(30000, token);

Application/Misc/PluginImporter.cs

@@ -83,19 +83,47 @@ namespace IW4MAdmin.Application.Misc
                         .GroupBy(_assembly => _assembly.FullName).Select(_assembly => _assembly.OrderByDescending(_assembly => _assembly.GetName().Version).First());
 
                     pluginTypes = assemblies
-                        .SelectMany(_asm => _asm.GetTypes())
+                        .SelectMany(_asm =>
+                        {
+                            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 => _asm.GetTypes())
+                        .SelectMany(_asm =>{
+                            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 => asm.GetTypes())
+                        .SelectMany(asm => {
+                            try
+                            {
+                                return asm.GetTypes();
+                            }
+                            catch
+                            {
+                                return Enumerable.Empty<Type>();
+                            }
+                        })
                         .Where(asmType =>
                             asmType.IsClass && asmType.GetInterface(nameof(IBaseConfiguration), false) != null);
 

Application/Misc/TokenAuthentication.cs

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

Data/Data.csproj

@@ -1,30 +1,27 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</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.1.0</PackageVersion>
+    <PackageVersion>1.2.0</PackageVersion>
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.10">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Npgsql" Version="4.1.7" />
+    <PackageReference Include="Npgsql" Version="6.0.2" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.4" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.2" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.2.4" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.1" />
-  </ItemGroup>
-  
-  <ItemGroup Condition="'$(Configuration)'=='Debug'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.10" />
   </ItemGroup>
   
 </Project>

Data/MigrationContext/MySqlDatabaseContext.cs

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

Data/Models/Vector3.cs

@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.Text.RegularExpressions;
+// ReSharper disable CompareOfFloatsByEqualityOperator
 
 namespace Data.Models
 {
@@ -28,7 +29,9 @@ namespace Data.Models
             return $"({X}, {Y}, {Z})";
         }
 
+#pragma warning disable CS0659
         public override bool Equals(object obj)
+#pragma warning restore CS0659
         {
             if (obj is Vector3 vec)
             {

Integrations/Cod/Integrations.Cod.csproj

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

Integrations/Source/Integrations.Source.csproj

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

Plugins/AutomessageFeed/AutomessageFeed.csproj

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

Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj

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

Plugins/LiveRadar/LiveRadar.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RazorCompileOnBuild Condition="'$(CONFIG)'!='Debug'">true</RazorCompileOnBuild>
     <RazorCompiledOnPublish Condition="'$(CONFIG)'!='Debug'">true</RazorCompiledOnPublish>
     <PreserveCompilationContext Condition="'$(CONFIG)'!='Debug'">false</PreserveCompilationContext>
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.20.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.25.2" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/LiveRadar/RadarEvent.cs

@@ -2,6 +2,7 @@
 using SharedLibraryCore;
 using System;
 using System.Linq;
+// ReSharper disable CompareOfFloatsByEqualityOperator
 
 namespace LiveRadar
 {
@@ -22,7 +23,9 @@ namespace LiveRadar
         public Vector3 RadianAngles => new Vector3(ViewAngles.X.ToRadians(), ViewAngles.Y.ToRadians(), ViewAngles.Z.ToRadians());
         public int Id => GetHashCode();
 
+#pragma warning disable CS0659
         public override bool Equals(object obj)
+#pragma warning restore CS0659
         {
             if (obj is RadarEvent re)
             {

Plugins/Login/Login.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.20.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.25.2" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/ProfanityDeterment/ProfanityDeterment.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
     <PackageId>RaidMax.IW4MAdmin.Plugins.ProfanityDeterment</PackageId>
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.20.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.25.2" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/Stats/Client/HitCalculator.cs

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

Plugins/Stats/Commands/MostKillsCommand.cs

@@ -17,7 +17,6 @@ namespace IW4MAdmin.Plugins.Stats.Commands
     class MostKillsCommand : Command
     {
         private readonly IDatabaseContextFactory _contextFactory;
-        private readonly CommandConfiguration _config;
 
         public MostKillsCommand(CommandConfiguration config, ITranslationLookup translationLookup,
             IDatabaseContextFactory contextFactory) : base(config, translationLookup)
@@ -28,7 +27,6 @@ namespace IW4MAdmin.Plugins.Stats.Commands
             Permission = EFClient.Permission.User;
 
             _contextFactory = contextFactory;
-            _config = config;
         }
 
         public override async Task ExecuteAsync(GameEvent E)

Plugins/Stats/Commands/MostPlayedCommand.cs

@@ -56,7 +56,6 @@ namespace IW4MAdmin.Plugins.Stats.Commands
             return mostPlayed;
         }
 
-        private readonly CommandConfiguration _config;
         private readonly IDatabaseContextFactory _contextFactory;
 
         public MostPlayedCommand(CommandConfiguration config, ITranslationLookup translationLookup,
@@ -68,7 +67,6 @@ namespace IW4MAdmin.Plugins.Stats.Commands
             Permission = EFClient.Permission.User;
             RequiresTarget = false;
 
-            _config = config;
             _contextFactory = contextFactory;
         }
 

Plugins/Stats/Helpers/StatManager.cs

@@ -21,7 +21,7 @@ using Data.Models.Server;
 using Humanizer.Localisation;
 using Microsoft.Data.Sqlite;
 using Microsoft.Extensions.Logging;
-using MySql.Data.MySqlClient;
+using MySqlConnector;
 using Npgsql;
 using Stats.Client.Abstractions;
 using Stats.Config;

Plugins/Stats/Stats.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
     <PackageId>RaidMax.IW4MAdmin.Plugins.Stats</PackageId>
@@ -17,7 +17,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.20.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.25.2" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/Welcome/Plugin.cs

@@ -6,6 +6,7 @@ using SharedLibraryCore.Database.Models;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using System.Net;
+using System.Net.Http;
 using Newtonsoft.Json.Linq;
 using Humanizer;
 using Data.Abstractions;
@@ -105,11 +106,11 @@ namespace IW4MAdmin.Plugins.Welcome
         /// <returns></returns>
         private async Task<string> GetCountryName(string ip)
         {
-            using var wc = new WebClient();
+            using var wc = new HttpClient();
             try
             {
                 var response =
-                    await wc.DownloadStringTaskAsync(new Uri($"http://extreme-ip-lookup.com/json/{ip}?key=demo"));
+                    await wc.GetStringAsync(new Uri($"http://extreme-ip-lookup.com/json/{ip}?key=demo"));
                 var responseObj = JObject.Parse(response);
                 response = responseObj["country"]?.ToString();
 

Plugins/Welcome/Welcome.csproj

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

SharedLibraryCore/BaseController.cs

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

SharedLibraryCore/Command.cs

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

SharedLibraryCore/Commands/AddClientTagCommand.cs

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

SharedLibraryCore/Commands/CommandArgument.cs

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

SharedLibraryCore/Commands/CommandExtensions.cs

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

SharedLibraryCore/Commands/CommandProcessing.cs

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

SharedLibraryCore/Commands/ListClientTags.cs

@@ -1,20 +1,18 @@
-using SharedLibraryCore.Configuration;
+using System.Linq;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Interfaces;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using Data.Models;
+using Data.Models.Client;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
 
 namespace SharedLibraryCore.Commands
 {
-
     public class ListClientTags : Command
     {
         private readonly IMetaService _metaService;
 
-        public ListClientTags(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(config, layout)
+        public ListClientTags(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(
+            config, layout)
         {
             Name = "listclienttags";
             Description = layout["COMMANDS_LIST_CLIENT_TAGS_DESC"];

SharedLibraryCore/Commands/PrivateMessageAdminsCommand.cs

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

SharedLibraryCore/Commands/RemoveClientTagCommand.cs

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

SharedLibraryCore/Commands/RequestTokenCommand.cs

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

SharedLibraryCore/Commands/RunAsCommand.cs

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

SharedLibraryCore/Commands/SetClientTagCommand.cs

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

SharedLibraryCore/Commands/UnlinkClientCommand.cs

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

SharedLibraryCore/Commands/UnsetClientTagCommand.cs

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

SharedLibraryCore/Configuration/ApplicationConfiguration.cs

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

SharedLibraryCore/Configuration/Attributes/ConfigurationIgnore.cs

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

SharedLibraryCore/Configuration/Attributes/ConfigurationLinked.cs

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

SharedLibraryCore/Configuration/Attributes/ConfigurationOptional.cs

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

SharedLibraryCore/Configuration/Attributes/LocalizedDisplayName.cs

@@ -1,13 +1,11 @@
-using System;
+using System.ComponentModel;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Text;
 
 namespace SharedLibraryCore.Configuration.Attributes
 {
-    class LocalizedDisplayName : DisplayNameAttribute
+    internal class LocalizedDisplayName : DisplayNameAttribute
     {
         private readonly string _localizationKey;
+
         public LocalizedDisplayName(string localizationKey)
         {
             _localizationKey = localizationKey;

SharedLibraryCore/Configuration/CommandConfiguration.cs

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

SharedLibraryCore/Configuration/CommandProperties.cs

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

SharedLibraryCore/Configuration/CommunityInformationConfiguration.cs

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

SharedLibraryCore/Configuration/DefaultSettings.cs

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

SharedLibraryCore/Configuration/Extensions/ConfigurationExtensions.cs

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

SharedLibraryCore/Configuration/QuickMessageConfiguration.cs

@@ -1,6 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Text;
 using static SharedLibraryCore.Server;
 
 namespace SharedLibraryCore.Configuration

SharedLibraryCore/Configuration/ServerConfiguration.cs

@@ -1,14 +1,24 @@
-using SharedLibraryCore.Configuration.Attributes;
+using System;
-using SharedLibraryCore.Interfaces;
-using System;
 using System.Collections.Generic;
 using System.Linq;
+using SharedLibraryCore.Configuration.Attributes;
 using SharedLibraryCore.Configuration.Extensions;
+using SharedLibraryCore.Interfaces;
 
 namespace SharedLibraryCore.Configuration
 {
     public class ServerConfiguration : IBaseConfiguration
     {
+        private readonly IList<IRConParser> _rconParsers;
+        private IRConParser _selectedParser;
+
+        public ServerConfiguration()
+        {
+            _rconParsers = new List<IRConParser>();
+            Rules = new string[0];
+            AutoMessages = new string[0];
+        }
+
         [LocalizedDisplayName("WEBFRONT_CONFIGURATION_SERVER_IP")]
         public string IPAddress { get; set; }
 
@@ -45,14 +55,74 @@ namespace SharedLibraryCore.Configuration
         [ConfigurationOptional]
         public string CustomHostname { get; set; }
 
-        private readonly IList<IRConParser> _rconParsers;
+        public IBaseConfiguration Generate()
-        private IRConParser _selectedParser;
-
-        public ServerConfiguration()
         {
-            _rconParsers = new List<IRConParser>();
+            ModifyParsers();
-            Rules = new string[0];
+            var loc = Utilities.CurrentLocalization.LocalizationIndex;
+            var shouldTryFindIp = loc["SETUP_SERVER_IP_AUTO"].PromptBool(defaultValue: true);
+
+            if (shouldTryFindIp)
+            {
+                this.TrySetIpAddress();
+                Console.WriteLine(loc["SETUP_SERVER_IP_AUTO_RESULT"].FormatExt(IPAddress));
+            }
+
+            else
+            {
+                while (string.IsNullOrEmpty(IPAddress))
+                {
+                    var input = loc["SETUP_SERVER_IP"].PromptString();
+                    IPAddress = input;
+                }
+            }
+
+            var defaultPort = _selectedParser.Configuration.DefaultRConPort;
+            Port = loc["SETUP_SERVER_PORT"].PromptInt(null, 1, ushort.MaxValue, defaultPort);
+
+            if (!string.IsNullOrEmpty(_selectedParser.Configuration.DefaultInstallationDirectoryHint))
+            {
+                var shouldTryFindPassword = loc["SETUP_RCON_PASSWORD_AUTO"].PromptBool(defaultValue: true);
+
+                if (shouldTryFindPassword)
+                {
+                    var passwords = _selectedParser.TryGetRConPasswords();
+                    if (passwords.Length > 1)
+                    {
+                        var (index, value) =
+                            loc["SETUP_RCON_PASSWORD_PROMPT"].PromptSelection(loc["SETUP_RCON_PASSWORD_MANUAL"], null,
+                                passwords.Select(pw =>
+                                        $"{pw.Item1}{(string.IsNullOrEmpty(pw.Item2) ? "" : "        " + pw.Item2)}")
+                                    .ToArray());
+
+                        if (index > 0)
+                        {
+                            Password = passwords[index - 1].Item1;
+                        }
+                    }
+
+                    else if (passwords.Length > 0)
+                    {
+                        Password = passwords[0].Item1;
+                        Console.WriteLine(loc["SETUP_RCON_PASSWORD_RESULT"].FormatExt(Password));
+                    }
+                }
+            }
+
+            if (string.IsNullOrEmpty(Password))
+            {
+                Password = loc["SETUP_SERVER_RCON"].PromptString();
+            }
+
             AutoMessages = new string[0];
+            Rules = new string[0];
+            ManualLogPath = null;
+
+            return this;
+        }
+
+        public string Name()
+        {
+            return "ServerConfiguration";
         }
 
         public void AddRConParser(IRConParser parser)
@@ -88,74 +158,5 @@ namespace SharedLibraryCore.Configuration
             Console.WriteLine(loc["SETUP_SERVER_NO_LOG"]);
             ManualLogPath = loc["SETUP_SERVER_LOG_PATH"].PromptString();
         }
-
-        public IBaseConfiguration Generate()
-        {
-            ModifyParsers();
-            var loc = Utilities.CurrentLocalization.LocalizationIndex;
-            var shouldTryFindIp = loc["SETUP_SERVER_IP_AUTO"].PromptBool(defaultValue: true);
-
-            if (shouldTryFindIp)
-            {
-                this.TrySetIpAddress();
-                Console.WriteLine(loc["SETUP_SERVER_IP_AUTO_RESULT"].FormatExt(IPAddress));
-            }
-
-            else
-            {
-                while (string.IsNullOrEmpty(IPAddress))
-                {
-                    var input = loc["SETUP_SERVER_IP"].PromptString();
-                    IPAddress = input;
-                }
-            }
-
-            var defaultPort = _selectedParser.Configuration.DefaultRConPort;
-            Port = loc["SETUP_SERVER_PORT"].PromptInt(null, 1, ushort.MaxValue, defaultValue:defaultPort);
-
-            if (!string.IsNullOrEmpty(_selectedParser.Configuration.DefaultInstallationDirectoryHint))
-            {
-                var shouldTryFindPassword = loc["SETUP_RCON_PASSWORD_AUTO"].PromptBool(defaultValue: true);
-
-                if (shouldTryFindPassword)
-                {
-                    var passwords = _selectedParser.TryGetRConPasswords();
-                    if (passwords.Length > 1)
-                    {
-                        var (index, value) =
-                            loc["SETUP_RCON_PASSWORD_PROMPT"].PromptSelection(loc["SETUP_RCON_PASSWORD_MANUAL"], null,
-                                passwords.Select(pw =>
-                                    $"{pw.Item1}{(string.IsNullOrEmpty(pw.Item2) ? "" : "        " + pw.Item2)}").ToArray());
-
-                        if (index > 0)
-                        {
-                            Password = passwords[index - 1].Item1;
-                        }
-                    }
-
-                    else if (passwords.Length > 0)
-                    {
-                        Password = passwords[0].Item1;
-                        Console.WriteLine(loc["SETUP_RCON_PASSWORD_RESULT"].FormatExt(Password));
-                    }
-                }
-            }
-  
-            if (string.IsNullOrEmpty(Password))
-            {
-                Password = loc["SETUP_SERVER_RCON"].PromptString();
-            }
-
-            AutoMessages = new string[0];
-            Rules = new string[0];
-            ManualLogPath = null;
-
-            return this;
-        }
-
-        public string Name()
-        {
-            return "ServerConfiguration";
-        }
     }
 }

SharedLibraryCore/Configuration/Validation/ApplicationConfigurationValidator.cs

@@ -1,11 +1,12 @@
-using FluentValidation;
+using System;
-using System;
 using System.Linq;
+using System.Net;
+using FluentValidation;
 
 namespace SharedLibraryCore.Configuration.Validation
 {
     /// <summary>
-    /// Validation class for main application configuration
+    ///     Validation class for main application configuration
     /// </summary>
     public class ApplicationConfigurationValidator : AbstractValidator<ApplicationConfiguration>
     {
@@ -23,27 +24,27 @@ namespace SharedLibraryCore.Configuration.Validation
                 .When(_app => _app.EnableSocialLink);
 
             RuleFor(_app => _app.SocialLinkTitle)
-               .NotEmpty()
+                .NotEmpty()
-               .When(_app => _app.EnableSocialLink);
+                .When(_app => _app.EnableSocialLink);
 
             RuleFor(_app => _app.CustomParserEncoding)
-              .NotEmpty()
+                .NotEmpty()
-              .When(_app => _app.EnableCustomParserEncoding);
+                .When(_app => _app.EnableCustomParserEncoding);
 
             RuleFor(_app => _app.WebfrontConnectionWhitelist)
                 .NotEmpty()
                 .When(_app => _app.EnableWebfrontConnectionWhitelist);
 
             RuleForEach(_app => _app.WebfrontConnectionWhitelist)
-                .Must(_address => System.Net.IPAddress.TryParse(_address, out _));
+                .Must(_address => IPAddress.TryParse(_address, out _));
 
             RuleFor(_app => _app.CustomLocale)
-              .NotEmpty()
+                .NotEmpty()
-              .When(_app => _app.EnableCustomLocale);
+                .When(_app => _app.EnableCustomLocale);
 
             RuleFor(_app => _app.DatabaseProvider)
-                  .NotEmpty()
+                .NotEmpty()
-                  .Must(_provider => new[] { "sqlite", "mysql", "postgresql" }.Contains(_provider));
+                .Must(_provider => new[] { "sqlite", "mysql", "postgresql" }.Contains(_provider));
 
             RuleFor(_app => _app.ConnectionString)
                 .NotEmpty()

SharedLibraryCore/Configuration/Validation/ServerConfigurationValidator.cs

@@ -1,10 +1,9 @@
 using FluentValidation;
-using System.Net;
 
 namespace SharedLibraryCore.Configuration.Validation
 {
     /// <summary>
-    /// Validation class for server configuration
+    ///     Validation class for server configuration
     /// </summary>
     public class ServerConfigurationValidator : AbstractValidator<ServerConfiguration>
     {

SharedLibraryCore/Dtos/AuditInfo.cs

@@ -3,55 +3,65 @@
 namespace SharedLibraryCore.Dtos
 {
     /// <summary>
-    /// data transfer class for audit information
+    ///     data transfer class for audit information
     /// </summary>
     public class AuditInfo
     {
+        private string newValue;
+
+        private string oldValue;
+
         /// <summary>
-        /// name of the origin entity
+        ///     name of the origin entity
         /// </summary>
         public string OriginName { get; set; }
 
         /// <summary>
-        /// id of the origin entity
+        ///     id of the origin entity
         /// </summary>
         public int OriginId { get; set; }
 
         /// <summary>
-        /// name of the target entity
+        ///     name of the target entity
         /// </summary>
         public string TargetName { get; set; }
 
         /// <summary>
-        /// id of the target entity
+        ///     id of the target entity
         /// </summary>
         public int? TargetId { get; set; }
 
         /// <summary>
-        /// when the audit event occured
+        ///     when the audit event occured
         /// </summary>
         public DateTime When { get; set; }
 
         /// <summary>
-        /// what audit action occured
+        ///     what audit action occured
         /// </summary>
         public string Action { get; set; }
 
         /// <summary>
-        /// additional comment data about the audit event
+        ///     additional comment data about the audit event
         /// </summary>
         public string Data { get; set; }
 
-        private string oldValue;
         /// <summary>
-        /// previous value
+        ///     previous value
         /// </summary>
-        public string OldValue { get => oldValue ?? "--"; set => oldValue = value; }
+        public string OldValue
+        {
+            get => oldValue ?? "--";
+            set => oldValue = value;
+        }
 
-        private string newValue;
         /// <summary>
-        /// new value
+        ///     new value
         /// </summary>
-        public string NewValue { get => newValue ?? "--"; set => newValue = value; }
+        public string NewValue
+        {
+            get => newValue ?? "--";
+            set => newValue = value;
+        }
     }
 }

SharedLibraryCore/Dtos/ClientInfo.cs

@@ -1,10 +1,12 @@
-namespace SharedLibraryCore.Dtos
+using Data.Models.Client;
+
+namespace SharedLibraryCore.Dtos
 {
     public class ClientInfo
     {
         public string Name { get; set; }
         public int ClientId { get; set; }
         public int LinkId { get; set; }
-        public Database.Models.EFClient.Permission Level { get; set; }
+        public EFClient.Permission Level { get; set; }
     }
 }

SharedLibraryCore/Dtos/CommandResponseInfo.cs

@@ -1,10 +1,4 @@
-using System;
+namespace SharedLibraryCore.Dtos
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SharedLibraryCore.Dtos
 {
     public class CommandResponseInfo
     {

SharedLibraryCore/Dtos/EntityInfo.cs

@@ -1,11 +1,7 @@
-using System;
+namespace SharedLibraryCore.Dtos
-using System.Collections.Generic;
-using System.Text;
-
-namespace SharedLibraryCore.Dtos
 {
     /// <summary>
-    /// This class holds the basic info for api entities
+    ///     This class holds the basic info for api entities
     /// </summary>
     public class EntityInfo
     {

SharedLibraryCore/Dtos/ErrorResponse.cs

@@ -3,12 +3,12 @@
     public class ErrorResponse
     {
         /// <summary>
-        /// todo: type of error
+        ///     todo: type of error
         /// </summary>
         public string Type { get; set; }
 
         /// <summary>
-        /// relevant error messages
+        ///     relevant error messages
         /// </summary>
         public string[] Messages { get; set; }
     }

SharedLibraryCore/Dtos/EventInfo.cs

@@ -1,10 +1,9 @@
 using System;
-using static SharedLibraryCore.GameEvent;
 
 namespace SharedLibraryCore.Dtos
 {
     /// <summary>
-    /// This class wraps the information related to a generated event for the API
+    ///     This class wraps the information related to a generated event for the API
     /// </summary>
     public class EventInfo
     {
@@ -15,6 +14,6 @@ namespace SharedLibraryCore.Dtos
         public EntityInfo OwnerEntity { get; set; }
         public DateTime EventTime { get; set; }
         public string ExtraInfo { get; set; }
-        public string Id { get; private set; } = Guid.NewGuid().ToString();
+        public string Id { get; } = Guid.NewGuid().ToString();
     }
 }

SharedLibraryCore/Dtos/FindClientRequest.cs

@@ -3,15 +3,18 @@
     public class FindClientRequest : PaginationRequest
     {
         /// <summary>
-        /// name of client
+        ///     name of client
         /// </summary>
         public string Name { get; set; }
 
         /// <summary>
-        /// network id of client
+        ///     network id of client
         /// </summary>
         public string Xuid { get; set; }
 
-        public string ToDebugString() => $"[Name={Name}, Xuid={Xuid}]";
+        public string ToDebugString()
+        {
+            return $"[Name={Name}, Xuid={Xuid}]";
+        }
     }
 }

SharedLibraryCore/Dtos/FindClientResult.cs

@@ -3,17 +3,17 @@
     public class FindClientResult
     {
         /// <summary>
-        /// client identifier
+        ///     client identifier
         /// </summary>
         public int ClientId { get; set; }
 
         /// <summary>
-        /// networkid of client
+        ///     networkid of client
         /// </summary>
         public string Xuid { get; set; }
 
         /// <summary>
-        /// name of client
+        ///     name of client
         /// </summary>
         public string Name { get; set; }
     }

SharedLibraryCore/Dtos/IW4MAdminInfo.cs

@@ -13,12 +13,12 @@ namespace SharedLibraryCore.Dtos
         public DateTime MaxConcurrentClientsTime { get; set; }
 
         /// <summary>
-        /// specifies the game name filter
+        ///     specifies the game name filter
         /// </summary>
         public Game? Game { get; set; }
 
         /// <summary>
-        /// collection of unique game names being monitored
+        ///     collection of unique game names being monitored
         /// </summary>
         public Game[] ActiveServerGames { get; set; }
     }

SharedLibraryCore/Dtos/Meta/Requests/BaseClientMetaRequest.cs

@@ -1,8 +1,4 @@
-using System;
+namespace SharedLibraryCore.Dtos.Meta.Requests
-using System.Collections.Generic;
-using System.Text;
-
-namespace SharedLibraryCore.Dtos.Meta.Requests
 {
     public class BaseClientMetaRequest : PaginationRequest
     {

SharedLibraryCore/Dtos/Meta/Requests/ReceivedPenaltyRequest.cs

@@ -1,9 +1,4 @@
-using SharedLibraryCore.QueryHelper;
+namespace SharedLibraryCore.Dtos.Meta.Requests
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace SharedLibraryCore.Dtos.Meta.Requests
 {
     public class ReceivedPenaltyRequest : BaseClientMetaRequest
     {

SharedLibraryCore/Dtos/Meta/Responses/AdministeredPenaltyResponse.cs

@@ -1,8 +1,4 @@
-using System;
+namespace SharedLibraryCore.Dtos.Meta.Responses
-using System.Collections.Generic;
-using System.Text;
-
-namespace SharedLibraryCore.Dtos.Meta.Responses
 {
     public class AdministeredPenaltyResponse : ReceivedPenaltyResponse
     {

SharedLibraryCore/Dtos/Meta/Responses/BaseMetaResponse.cs

@@ -1,17 +1,17 @@
-using SharedLibraryCore.Interfaces;
+using System;
-using System;
+using SharedLibraryCore.Interfaces;
 
 namespace SharedLibraryCore.Dtos.Meta.Responses
 {
     public class BaseMetaResponse : IClientMeta, IClientMetaResponse
     {
-        public long MetaId { get; set; }
-        public int ClientId { get; set; }
         public MetaType Type { get; set; }
         public DateTime When { get; set; }
         public bool IsSensitive { get; set; }
         public bool ShouldDisplay { get; set; }
         public int? Column { get; set; }
         public int? Order { get; set; }
+        public long MetaId { get; set; }
+        public int ClientId { get; set; }
     }
 }

SharedLibraryCore/Dtos/Meta/Responses/InformationResponse.cs

@@ -1,9 +1,4 @@
-using SharedLibraryCore.Interfaces;
+namespace SharedLibraryCore.Dtos.Meta.Responses
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace SharedLibraryCore.Dtos.Meta.Responses
 {
     public class InformationResponse : BaseMetaResponse
     {

SharedLibraryCore/Dtos/Meta/Responses/MessageResponse.cs

@@ -9,27 +9,27 @@ namespace SharedLibraryCore.Dtos.Meta.Responses
         public bool IsHidden { get; set; }
 
         /// <summary>
-        /// name of the client
+        ///     name of the client
         /// </summary>
         public string ClientName { get; set; }
 
         /// <summary>
-        /// hostname of the server
+        ///     hostname of the server
         /// </summary>
         public string ServerName { get; set; }
 
         /// <summary>
-        /// specifies the game the chat occured on
+        ///     specifies the game the chat occured on
         /// </summary>
         public Server.Game GameName { get; set; }
 
         /// <summary>
-        /// indicates if the chat message is a quick message phrase
+        ///     indicates if the chat message is a quick message phrase
         /// </summary>
         public bool IsQuickMessage { get; set; }
 
         /// <summary>
-        /// indicates if the message was sent ingame
+        ///     indicates if the message was sent ingame
         /// </summary>
         public bool SentIngame { get; set; }
 

SharedLibraryCore/Dtos/Meta/Responses/ReceivedPenaltyResponse.cs

@@ -14,8 +14,15 @@ namespace SharedLibraryCore.Dtos.Meta.Responses
         public string Offense { get; set; }
         public string AutomatedOffense { get; set; }
         public DateTime? ExpirationDate { get; set; }
-        public string ExpiresInText => ExpirationDate.HasValue && ExpirationDate.Value > DateTime.UtcNow ? (ExpirationDate - DateTime.UtcNow).Value.HumanizeForCurrentCulture() : "";
+
-        public string LengthText => ExpirationDate.HasValue ? (ExpirationDate.Value.AddMinutes(1) - When).HumanizeForCurrentCulture() : "";
+        public string ExpiresInText => ExpirationDate.HasValue && ExpirationDate.Value > DateTime.UtcNow
+            ? (ExpirationDate - DateTime.UtcNow).Value.HumanizeForCurrentCulture()
+            : "";
+
+        public string LengthText => ExpirationDate.HasValue
+            ? (ExpirationDate.Value.AddMinutes(1) - When).HumanizeForCurrentCulture()
+            : "";
+
         public bool IsLinked { get; set; }
         public int LinkedClientId { get; set; }
     }

SharedLibraryCore/Dtos/Meta/Responses/UpdatedAliasResponse.cs

@@ -15,6 +15,9 @@
             return false;
         }
 
-        public override int GetHashCode() => $"{Name.StripColors()}{IPAddress}".GetStableHashCode();
+        public override int GetHashCode()
+        {
+            return $"{Name.StripColors()}{IPAddress}".GetStableHashCode();
+        }
     }
 }

SharedLibraryCore/Dtos/Meta/WebfrontTranslationHelper.cs

@@ -1,8 +1,4 @@
-using System;
+namespace SharedLibraryCore.Dtos.Meta
-using System.Collections.Generic;
-using System.Text;
-
-namespace SharedLibraryCore.Dtos.Meta
 {
     public class WebfrontTranslationHelper
     {

SharedLibraryCore/Dtos/PaginationRequest.cs

@@ -3,27 +3,27 @@
 namespace SharedLibraryCore.Dtos
 {
     /// <summary>
-    /// pagination information holder class
+    ///     pagination information holder class
     /// </summary>
     public class PaginationRequest
     {
         /// <summary>
-        /// how many items to skip
+        ///     how many items to skip
         /// </summary>
         public int Offset { get; set; }
 
         /// <summary>
-        /// how many itesm to take
+        ///     how many itesm to take
         /// </summary>
         public int Count { get; set; } = 100;
 
         /// <summary>
-        /// filter query
+        ///     filter query
         /// </summary>
         public string Filter { get; set; }
 
         /// <summary>
-        /// direction of ordering
+        ///     direction of ordering
         /// </summary>
         public SortDirection Direction { get; set; } = SortDirection.Descending;
 

SharedLibraryCore/Dtos/PenaltyInfo.cs

@@ -22,11 +22,20 @@ namespace SharedLibraryCore.Dtos
         public string PenaltyTypeText => PenaltyType.ToString();
         public DateTime TimePunished { get; set; }
         public string TimePunishedString => TimePunished.HumanizeForCurrentCulture();
-        public string TimeRemaining => DateTime.UtcNow > Expires ? "" : $"{((Expires ?? DateTime.MaxValue).Year == DateTime.MaxValue.Year ? TimePunishedString : ((Expires ?? DateTime.MaxValue) - DateTime.UtcNow).HumanizeForCurrentCulture())}";
+
+        public string TimeRemaining => DateTime.UtcNow > Expires
+            ? ""
+            : $"{((Expires ?? DateTime.MaxValue).Year == DateTime.MaxValue.Year ? TimePunishedString : ((Expires ?? DateTime.MaxValue) - DateTime.UtcNow).HumanizeForCurrentCulture())}";
+
         public bool Expired => Expires.HasValue && Expires <= DateTime.UtcNow;
         public DateTime? Expires { get; set; }
-        public override bool Sensitive => PenaltyType == EFPenalty.PenaltyType.Flag || PenaltyType == EFPenalty.PenaltyType.Unflag;
+
+        public override bool Sensitive =>
+            PenaltyType == EFPenalty.PenaltyType.Flag || PenaltyType == EFPenalty.PenaltyType.Unflag;
+
         public bool IsEvade { get; set; }
-        public string AdditionalPenaltyInformation => $"{(!string.IsNullOrEmpty(AutomatedOffense) ? $" ({AutomatedOffense})" : "")}{(IsEvade ? $" ({Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_PENALTY_EVADE"]})" : "")}";
+
+        public string AdditionalPenaltyInformation =>
+            $"{(!string.IsNullOrEmpty(AutomatedOffense) ? $" ({AutomatedOffense})" : "")}{(IsEvade ? $" ({Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_PENALTY_EVADE"]})" : "")}";
     }
 }

SharedLibraryCore/Dtos/PlayerInfo.cs

@@ -1,8 +1,8 @@
-using SharedLibraryCore.Dtos.Meta.Responses;
+using System;
-using SharedLibraryCore.Interfaces;
-using System;
 using System.Collections.Generic;
 using Data.Models;
+using SharedLibraryCore.Dtos.Meta.Responses;
+using SharedLibraryCore.Interfaces;
 
 namespace SharedLibraryCore.Dtos
 {

SharedLibraryCore/Dtos/ServerInfo.cs

@@ -1,8 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
+using SharedLibraryCore.Helpers;
-using System.Threading.Tasks;
 
 namespace SharedLibraryCore.Dtos
 {
@@ -16,7 +15,7 @@ namespace SharedLibraryCore.Dtos
         public int MaxClients { get; set; }
         public List<ChatInfo> ChatHistory { get; set; }
         public List<PlayerInfo> Players { get; set; }
-        public Helpers.PlayerHistory[] PlayerHistory { get; set; }
+        public PlayerHistory[] PlayerHistory { get; set; }
         public List<ClientCountSnapshot> ClientCountHistory { get; set; }
         public long ID { get; set; }
         public bool Online { get; set; }

SharedLibraryCore/Dtos/SharedInfo.cs

@@ -1,5 +1,4 @@
-
+namespace SharedLibraryCore.Dtos
-namespace SharedLibraryCore.Dtos
 {
     public class SharedInfo
     {

SharedLibraryCore/Events/EventAPI.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Collections.Concurrent;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using SharedLibraryCore.Dtos;
 
@@ -7,8 +6,8 @@ namespace SharedLibraryCore.Events
 {
     public class EventApi
     {
-        const int MaxEvents = 25;
+        private const int MaxEvents = 25;
-        static ConcurrentQueue<EventInfo> RecentEvents = new ConcurrentQueue<EventInfo>();
+        private static readonly ConcurrentQueue<EventInfo> RecentEvents = new ConcurrentQueue<EventInfo>();
 
         public static IEnumerable<EventInfo> GetEvents(bool shouldConsume)
         {
@@ -28,32 +27,38 @@ namespace SharedLibraryCore.Events
             var E = gameEvent;
             // don't want to clog up the api with unknown events
             if (E.Type == GameEvent.EventType.Unknown)
+            {
                 return;
+            }
 
-            var apiEvent = new EventInfo()
+            var apiEvent = new EventInfo
             {
                 ExtraInfo = E.Extra?.ToString() ?? E.Data,
-                GameInfo = new EntityInfo()
+                GameInfo = new EntityInfo
                 {
                     Name = E.Owner.GameName.ToString(),
                     Id = (int)E.Owner.GameName
                 },
-                OwnerEntity = new EntityInfo()
+                OwnerEntity = new EntityInfo
                 {
                     Name = E.Owner.Hostname,
                     Id = E.Owner.EndPoint
                 },
-                OriginEntity = E.Origin == null ? null : new EntityInfo()
+                OriginEntity = E.Origin == null
-                {
+                    ? null
-                    Id = E.Origin.ClientId,
+                    : new EntityInfo
-                    Name = E.Origin.Name
+                    {
-                },
+                        Id = E.Origin.ClientId,
-                TargetEntity = E.Target == null ? null : new EntityInfo()
+                        Name = E.Origin.Name
-                {
+                    },
-                    Id = E.Target.ClientId,
+                TargetEntity = E.Target == null
-                    Name = E.Target.Name
+                    ? null
-                },
+                    : new EntityInfo
-                EventType = new EntityInfo()
+                    {
+                        Id = E.Target.ClientId,
+                        Name = E.Target.Name
+                    },
+                EventType = new EntityInfo
                 {
                     Id = (int)E.Type,
                     Name = E.Type.ToString()
@@ -66,14 +71,16 @@ namespace SharedLibraryCore.Events
         }
 
         /// <summary>
-        /// Adds event to the list and removes first added if reached max capacity
+        ///     Adds event to the list and removes first added if reached max capacity
         /// </summary>
         /// <param name="info">EventInfo to add</param>
         private static void AddNewEvent(EventInfo info)
         {
             // remove the first added event
             if (RecentEvents.Count >= MaxEvents)
+            {
                 RecentEvents.TryDequeue(out _);
+            }
 
             RecentEvents.Enqueue(info);
         }

SharedLibraryCore/Events/GameEvent.cs

@@ -1,11 +1,10 @@
-using SharedLibraryCore.Database.Models;
+using System;
-using SharedLibraryCore.Events;
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Serilog.Context;
+using SharedLibraryCore.Database.Models;
 
 namespace SharedLibraryCore
 {
@@ -14,189 +13,38 @@ namespace SharedLibraryCore
         public enum EventFailReason
         {
             /// <summary>
-            /// event execution did not fail
+            ///     event execution did not fail
             /// </summary>
             None,
+
             /// <summary>
-            /// an internal exception prevented the event
+            ///     an internal exception prevented the event
-            /// from executing
+            ///     from executing
             /// </summary>
             Exception,
+
             /// <summary>
-            /// event origin didn't have the necessary privileges
+            ///     event origin didn't have the necessary privileges
-            /// to execute the command
+            ///     to execute the command
             /// </summary>
             Permission,
+
             /// <summary>
-            /// executing the event would cause an invalid state
+            ///     executing the event would cause an invalid state
             /// </summary>
             Invalid,
+
             /// <summary>
-            /// client is doing too much of something
+            ///     client is doing too much of something
             /// </summary>
             Throttle,
+
             /// <summary>
-            /// the event timed out before completion
+            ///     the event timed out before completion
             /// </summary>
             Timeout
         }
 
-        public enum EventType
-        {
-            /// <summary>
-            /// the event wasn't parsed properly
-            /// </summary>
-            Unknown,
-
-            // events "generated" by the server
-            /// <summary>
-            /// a server started being monitored
-            /// </summary>
-            Start,
-            /// <summary>
-            /// a server stopped being monitored
-            /// </summary>
-            Stop,
-            /// <summary>
-            /// a client was detecting as connecting via log
-            /// </summary>
-            Connect,
-            /// <summary>
-            /// a client was detecting joining by RCon
-            /// </summary>
-            Join,
-            /// <summary>
-            /// a client was detected leaving via log
-            /// </summary>
-            Quit,
-            /// <summary>
-            /// a client was detected leaving by RCon
-            /// </summary>
-            Disconnect,
-            /// <summary>
-            /// the current map ended
-            /// </summary>
-            MapEnd,
-            /// <summary>
-            /// the current map changed
-            /// </summary>
-            MapChange,
-            /// <summary>
-            /// a client was detected as starting to connect
-            /// </summary>
-            PreConnect,
-            /// <summary>
-            /// a client was detecting as starting to disconnect
-            /// </summary>
-            PreDisconnect,
-            /// <summary>
-            /// a client's information was updated
-            /// </summary>
-            Update,
-            /// <summary>
-            /// connection was lost to a server (the server has not responded after a number of attempts)
-            /// </summary>
-            ConnectionLost,
-            /// <summary>
-            /// connection was restored to a server (the server began responding again)
-            /// </summary>
-            ConnectionRestored,
-
-            // events "generated" by clients  
-            /// <summary>
-            /// a client sent a message
-            /// </summary>
-            Say = 100,
-            /// <summary>
-            /// a client was warned
-            /// </summary>
-            Warn = 101,
-            /// <summary>
-            /// all warnings for a client were cleared
-            /// </summary>
-            WarnClear = 102,
-            /// <summary>
-            /// a client was reported
-            /// </summary>
-            Report = 103,
-            /// <summary>
-            /// a client was flagged
-            /// </summary>
-            Flag = 104,
-            /// <summary>
-            /// a client was unflagged
-            /// </summary>
-            Unflag = 105,
-            /// <summary>
-            /// a client was kicked
-            /// </summary>
-            Kick = 106,
-            /// <summary>
-            /// a client was tempbanned
-            /// </summary>
-            TempBan = 107,
-            /// <summary>
-            /// a client was banned
-            /// </summary>
-            Ban = 108,
-            /// <summary>
-            /// a client was unbanned
-            /// </summary>
-            Unban = 109,
-            /// <summary>
-            /// a client entered a command
-            /// </summary>
-            Command = 110,
-            /// <summary>
-            /// a client's permission was changed
-            /// </summary>
-            ChangePermission = 111,
-            /// <summary>
-            /// client logged in to webfront
-            /// </summary>
-            Login = 112,
-            /// <summary>
-            /// client logged out of webfront
-            /// </summary>
-            Logout = 113,
-
-            // events "generated" by IW4MAdmin
-            /// <summary>
-            /// a message is sent to all clients
-            /// </summary>
-            Broadcast = 200,
-            /// <summary>
-            /// a message is sent to a specific client
-            /// </summary>
-            Tell = 201,
-
-            // events "generated" by script/log
-            /// <summary>
-            /// AC Damage Log
-            /// </summary>
-            ScriptDamage = 300,
-            /// <summary>
-            /// AC Kill Log
-            /// </summary>
-            ScriptKill = 301,
-            /// <summary>
-            /// damage info printed out by game script
-            /// </summary>
-            Damage = 302,
-            /// <summary>
-            /// kill info printed out by game script
-            /// </summary>
-            Kill = 303,
-            /// <summary>
-            /// team info printed out by game script
-            /// </summary>
-            JoinTeam = 304,
-            /// <summary>
-            /// used for community generated plugin events
-            /// </summary>
-            Other
-        }
-
         [Flags]
         public enum EventRequiredEntity
         {
@@ -213,12 +61,203 @@ namespace SharedLibraryCore
             Internal
         }
 
-        static long NextEventId;
+        public enum EventType
-        static long GetNextEventId()
         {
-            return Interlocked.Increment(ref NextEventId);
+            /// <summary>
+            ///     the event wasn't parsed properly
+            /// </summary>
+            Unknown,
+
+            // events "generated" by the server
+            /// <summary>
+            ///     a server started being monitored
+            /// </summary>
+            Start,
+
+            /// <summary>
+            ///     a server stopped being monitored
+            /// </summary>
+            Stop,
+
+            /// <summary>
+            ///     a client was detecting as connecting via log
+            /// </summary>
+            Connect,
+
+            /// <summary>
+            ///     a client was detecting joining by RCon
+            /// </summary>
+            Join,
+
+            /// <summary>
+            ///     a client was detected leaving via log
+            /// </summary>
+            Quit,
+
+            /// <summary>
+            ///     a client was detected leaving by RCon
+            /// </summary>
+            Disconnect,
+
+            /// <summary>
+            ///     the current map ended
+            /// </summary>
+            MapEnd,
+
+            /// <summary>
+            ///     the current map changed
+            /// </summary>
+            MapChange,
+
+            /// <summary>
+            ///     a client was detected as starting to connect
+            /// </summary>
+            PreConnect,
+
+            /// <summary>
+            ///     a client was detecting as starting to disconnect
+            /// </summary>
+            PreDisconnect,
+
+            /// <summary>
+            ///     a client's information was updated
+            /// </summary>
+            Update,
+
+            /// <summary>
+            ///     connection was lost to a server (the server has not responded after a number of attempts)
+            /// </summary>
+            ConnectionLost,
+
+            /// <summary>
+            ///     connection was restored to a server (the server began responding again)
+            /// </summary>
+            ConnectionRestored,
+
+            // events "generated" by clients  
+            /// <summary>
+            ///     a client sent a message
+            /// </summary>
+            Say = 100,
+
+            /// <summary>
+            ///     a client was warned
+            /// </summary>
+            Warn = 101,
+
+            /// <summary>
+            ///     all warnings for a client were cleared
+            /// </summary>
+            WarnClear = 102,
+
+            /// <summary>
+            ///     a client was reported
+            /// </summary>
+            Report = 103,
+
+            /// <summary>
+            ///     a client was flagged
+            /// </summary>
+            Flag = 104,
+
+            /// <summary>
+            ///     a client was unflagged
+            /// </summary>
+            Unflag = 105,
+
+            /// <summary>
+            ///     a client was kicked
+            /// </summary>
+            Kick = 106,
+
+            /// <summary>
+            ///     a client was tempbanned
+            /// </summary>
+            TempBan = 107,
+
+            /// <summary>
+            ///     a client was banned
+            /// </summary>
+            Ban = 108,
+
+            /// <summary>
+            ///     a client was unbanned
+            /// </summary>
+            Unban = 109,
+
+            /// <summary>
+            ///     a client entered a command
+            /// </summary>
+            Command = 110,
+
+            /// <summary>
+            ///     a client's permission was changed
+            /// </summary>
+            ChangePermission = 111,
+
+            /// <summary>
+            ///     client logged in to webfront
+            /// </summary>
+            Login = 112,
+
+            /// <summary>
+            ///     client logged out of webfront
+            /// </summary>
+            Logout = 113,
+
+            // events "generated" by IW4MAdmin
+            /// <summary>
+            ///     a message is sent to all clients
+            /// </summary>
+            Broadcast = 200,
+
+            /// <summary>
+            ///     a message is sent to a specific client
+            /// </summary>
+            Tell = 201,
+
+            // events "generated" by script/log
+            /// <summary>
+            ///     AC Damage Log
+            /// </summary>
+            ScriptDamage = 300,
+
+            /// <summary>
+            ///     AC Kill Log
+            /// </summary>
+            ScriptKill = 301,
+
+            /// <summary>
+            ///     damage info printed out by game script
+            /// </summary>
+            Damage = 302,
+
+            /// <summary>
+            ///     kill info printed out by game script
+            /// </summary>
+            Kill = 303,
+
+            /// <summary>
+            ///     team info printed out by game script
+            /// </summary>
+            JoinTeam = 304,
+
+            /// <summary>
+            ///     used for community generated plugin events
+            /// </summary>
+            Other
         }
 
+        private static long NextEventId;
+        private readonly ManualResetEvent _eventFinishedWaiter;
+        public string Data; // Data is usually the message sent by player
+        public string Message;
+        public EFClient Origin;
+        public Server Owner;
+        public EFClient Target;
+
+        public EventType Type;
+
         public GameEvent()
         {
             _eventFinishedWaiter = new ManualResetEvent(false);
@@ -226,44 +265,46 @@ namespace SharedLibraryCore
             Id = GetNextEventId();
         }
 
-        ~GameEvent()
-        {
-            _eventFinishedWaiter.Set();
-            _eventFinishedWaiter.Dispose();
-        }
-
-        public EventType Type;
         public EventSource Source { get; set; }
+
         /// <summary>
-        /// suptype of the event for more detailed classification
+        ///     suptype of the event for more detailed classification
         /// </summary>
         public string Subtype { get; set; }
+
         public EventRequiredEntity RequiredEntity { get; set; }
-        public string Data; // Data is usually the message sent by player
+
-        public string Message;
         /// <summary>
-        /// Specifies the game time offset as printed in the log
+        ///     Specifies the game time offset as printed in the log
         /// </summary>
         public long? GameTime { get; set; }
-        public EFClient Origin;
+
-        public EFClient Target;
         public EFClient ImpersonationOrigin { get; set; }
-        public Server Owner;
         public bool IsRemote { get; set; }
         public object Extra { get; set; }
-        private readonly ManualResetEvent _eventFinishedWaiter;
         public DateTime Time { get; set; }
-        public long Id { get; private set; }
+        public long Id { get; }
         public EventFailReason FailReason { get; set; }
         public bool Failed => FailReason != EventFailReason.None;
         public Guid CorrelationId { get; set; } = Guid.NewGuid();
         public List<string> Output { get; set; } = new List<string>();
 
         /// <summary>
-        /// Indicates if the event should block until it is complete
+        ///     Indicates if the event should block until it is complete
         /// </summary>
         public bool IsBlocking { get; set; }
 
+        private static long GetNextEventId()
+        {
+            return Interlocked.Increment(ref NextEventId);
+        }
+
+        ~GameEvent()
+        {
+            _eventFinishedWaiter.Set();
+            _eventFinishedWaiter.Dispose();
+        }
+
         public void Complete()
         {
             _eventFinishedWaiter.Set();
@@ -275,12 +316,12 @@ namespace SharedLibraryCore
         }
 
         /// <summary>
-        /// asynchronously wait for GameEvent to be processed
+        ///     asynchronously wait for GameEvent to be processed
         /// </summary>
         /// <returns>waitable task </returns>
         public async Task<GameEvent> WaitAsync(TimeSpan timeSpan, CancellationToken token)
         {
-            bool processed = false;
+            var processed = false;
             Utilities.DefaultLogger.LogDebug("Begin wait for event {Id}", Id);
             try
             {
@@ -294,9 +335,10 @@ namespace SharedLibraryCore
 
             if (!processed)
             {
-                using(LogContext.PushProperty("Server", Owner?.ToString()))
+                using (LogContext.PushProperty("Server", Owner?.ToString()))
                 {
-                    Utilities.DefaultLogger.LogError("Waiting for event to complete timed out {@eventData}", new { Event = this, Message, Origin = Origin?.ToString(), Target = Target?.ToString()});
+                    Utilities.DefaultLogger.LogError("Waiting for event to complete timed out {@eventData}",
+                        new { Event = this, Message, Origin = Origin?.ToString(), Target = Target?.ToString() });
                 }
             }
 

SharedLibraryCore/Events/GameEventArgs.cs

@@ -1,22 +1,20 @@
 using System;
-using System.Collections.Generic;
+using System.ComponentModel;
-using System.Text;
 
 namespace SharedLibraryCore.Events
 {
     /// <summary>
-    /// represents the state of a game event for event processing
+    ///     represents the state of a game event for event processing
     /// </summary>
-    public class GameEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+    public class GameEventArgs : AsyncCompletedEventArgs
     {
-
         public GameEventArgs(Exception error, bool cancelled, GameEvent userState) : base(error, cancelled, userState)
         {
             Event = userState;
         }
 
         /// <summary>
-        /// Game event that occured on a server
+        ///     Game event that occured on a server
         /// </summary>
         public GameEvent Event { get; }
     }

SharedLibraryCore/Exceptions/AuthorizationException.cs

@@ -1,11 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace SharedLibraryCore.Exceptions
 {
     public class AuthorizationException : Exception
     {
-        public AuthorizationException(string message) : base (message) { }
+        public AuthorizationException(string message) : base(message)
+        {
+        }
     }
 }

SharedLibraryCore/Exceptions/CommandException.cs

@@ -1,14 +1,11 @@
-using System;
+namespace SharedLibraryCore.Exceptions
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SharedLibraryCore.Exceptions
 {
     public class CommandException : ServerException
     {
-        public CommandException(string msg) : base(msg) { }
+        public CommandException(string msg) : base(msg)
+        {
+        }
+
         // .data contains
         // "command_name"
     }

SharedLibraryCore/Exceptions/ConfigurationException.cs

@@ -4,9 +4,11 @@ namespace SharedLibraryCore.Exceptions
 {
     public class ConfigurationException : Exception
     {
+        public ConfigurationException(string message) : base(message)
+        {
+        }
+
         public string[] Errors { get; set; }
         public string ConfigurationFileName { get; set; }
-
-        public ConfigurationException(string message) : base(message) { }
     }
 }

SharedLibraryCore/Exceptions/DatabaseException.cs

@@ -1,13 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SharedLibraryCore.Exceptions
 {
     public class DatabaseException : Exception
     {
-        public DatabaseException(string msg) : base(msg) { }
+        public DatabaseException(string msg) : base(msg)
+        {
+        }
     }
 }

SharedLibraryCore/Exceptions/DvarException.cs

@@ -1,13 +1,9 @@
-using System;
+namespace SharedLibraryCore.Exceptions
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SharedLibraryCore.Exceptions
 {
     public class DvarException : ServerException
     {
-        public DvarException(string msg) : base(msg) { }
+        public DvarException(string msg) : base(msg)
+        {
+        }
     }
 }

SharedLibraryCore/Exceptions/NetworkException.cs

@@ -1,18 +1,16 @@
-using System;
+using System.Net.Sockets;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SharedLibraryCore.Exceptions
 {
     public class NetworkException : ServerException
     {
-        public NetworkException(string msg) : base(msg) { }
+        public NetworkException(string msg) : base(msg)
+        {
+        }
+
         public NetworkException(string msg, Socket s) : base(msg)
         {
-            this.Data.Add("socket", s);
+            Data.Add("socket", s);
         }
     }
 }

SharedLibraryCore/Exceptions/PluginException.cs

@@ -4,7 +4,9 @@ namespace SharedLibraryCore.Exceptions
 {
     public class PluginException : Exception
     {
-        public PluginException(string message) : base(message) { }
+        public PluginException(string message) : base(message)
+        {
+        }
 
         public string PluginFile { get; set; }
     }

SharedLibraryCore/Exceptions/SerializationException.cs

@@ -1,13 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SharedLibraryCore.Exceptions
 {
     public class SerializeException : Exception
     {
-        public SerializeException(string msg) : base(msg) { }
+        public SerializeException(string msg) : base(msg)
+        {
+        }
     }
 }

SharedLibraryCore/Exceptions/ServerException.cs

@@ -1,13 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SharedLibraryCore.Exceptions
 {
     public class ServerException : Exception
     {
-        public ServerException(string msg) : base(msg) { }
+        public ServerException(string msg) : base(msg)
+        {
+        }
     }
 }

SharedLibraryCore/Formatting/ColorCodes.cs

@@ -21,6 +21,5 @@ namespace SharedLibraryCore.Formatting
 
     public class ColorCodeMapping : Dictionary<string, string>
     {
-        
     }
 }

SharedLibraryCore/Game/Map.cs

@@ -5,6 +5,9 @@
         public string Name { get; set; }
         public string Alias { get; set; }
 
-        public override string ToString() => Alias;
+        public override string ToString()
+        {
+            return Alias;
+        }
     }
 }

SharedLibraryCore/Helpers/BuildNumber.cs

@@ -6,12 +6,41 @@ namespace SharedLibraryCore.Helpers
 {
     public class BuildNumber : IComparable
     {
+        private BuildNumber()
+        {
+        }
+
         public int Major { get; private set; }
         public int Minor { get; private set; }
         public int Build { get; private set; }
         public int Revision { get; private set; }
 
-        private BuildNumber() { }
+        public int CompareTo(object obj)
+        {
+            if (obj == null)
+            {
+                return 1;
+            }
+
+            var buildNumber = obj as BuildNumber;
+            if (buildNumber == null)
+            {
+                return 1;
+            }
+
+            if (ReferenceEquals(this, buildNumber))
+            {
+                return 0;
+            }
+
+            return Major == buildNumber.Major
+                ? Minor == buildNumber.Minor
+                    ? Build == buildNumber.Build
+                        ? Revision.CompareTo(buildNumber.Revision)
+                        : Build.CompareTo(buildNumber.Build)
+                    : Minor.CompareTo(buildNumber.Minor)
+                : Major.CompareTo(buildNumber.Major);
+        }
 
         public static bool TryParse(string input, out BuildNumber buildNumber)
         {
@@ -28,23 +57,32 @@ namespace SharedLibraryCore.Helpers
         }
 
         /// <summary>
-        /// Parses a build number string into a BuildNumber class
+        ///     Parses a build number string into a BuildNumber class
         /// </summary>
         /// <param name="buildNumber">The build number string to parse</param>
         /// <returns>A new BuildNumber class set from the buildNumber string</returns>
-        /// <exception cref="ArgumentException">Thrown if there are less than 2 or 
+        /// <exception cref="ArgumentException">
-        /// more than 4 version parts to the build number</exception>
+        ///     Thrown if there are less than 2 or
-        /// <exception cref="FormatException">Thrown if string cannot be parsed 
+        ///     more than 4 version parts to the build number
-        /// to a series of integers</exception>
+        /// </exception>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if any version 
+        /// <exception cref="FormatException">
-        /// integer is less than zero</exception>
+        ///     Thrown if string cannot be parsed
+        ///     to a series of integers
+        /// </exception>
+        /// <exception cref="ArgumentOutOfRangeException">
+        ///     Thrown if any version
+        ///     integer is less than zero
+        /// </exception>
         public static BuildNumber Parse(string buildNumber)
         {
-            if (buildNumber == null) throw new ArgumentNullException("buildNumber");
+            if (buildNumber == null)
+            {
+                throw new ArgumentNullException("buildNumber");
+            }
 
             var versions = buildNumber
                 .Split(new[] { '.' },
-                       StringSplitOptions.RemoveEmptyEntries)
+                    StringSplitOptions.RemoveEmptyEntries)
                 .Select(v => v.Trim())
                 .ToList();
 
@@ -90,39 +128,23 @@ namespace SharedLibraryCore.Helpers
         public override string ToString()
         {
             return string.Format("{0}.{1}{2}{3}", Major, Minor,
-                                 Build < 0 ? "" : "." + Build,
+                Build < 0 ? "" : "." + Build,
-                                 Revision < 0 ? "" : "." + Revision);
+                Revision < 0 ? "" : "." + Revision);
-        }
-
-        public int CompareTo(object obj)
-        {
-            if (obj == null) return 1;
-            var buildNumber = obj as BuildNumber;
-            if (buildNumber == null) return 1;
-            if (ReferenceEquals(this, buildNumber)) return 0;
-
-            return (Major == buildNumber.Major)
-                       ? (Minor == buildNumber.Minor)
-                             ? (Build == buildNumber.Build)
-                                   ? Revision.CompareTo(buildNumber.Revision)
-                                   : Build.CompareTo(buildNumber.Build)
-                             : Minor.CompareTo(buildNumber.Minor)
-                       : Major.CompareTo(buildNumber.Major);
         }
 
         public static bool operator >(BuildNumber first, BuildNumber second)
         {
-            return (first.CompareTo(second) > 0);
+            return first.CompareTo(second) > 0;
         }
 
         public static bool operator <(BuildNumber first, BuildNumber second)
         {
-            return (first.CompareTo(second) < 0);
+            return first.CompareTo(second) < 0;
         }
 
         public override bool Equals(object obj)
         {
-            return (CompareTo(obj) == 0);
+            return CompareTo(obj) == 0;
         }
 
         public override int GetHashCode()

SharedLibraryCore/Helpers/BuildNumberJsonConverter.cs

@@ -1,10 +1,10 @@
-using Newtonsoft.Json;
+using System;
-using System;
+using Newtonsoft.Json;
 
 namespace SharedLibraryCore.Helpers
 {
     /// <summary>
-    /// JSON converter for the build number
+    ///     JSON converter for the build number
     /// </summary>
     public class BuildNumberJsonConverter : JsonConverter
     {
@@ -13,7 +13,8 @@ namespace SharedLibraryCore.Helpers
             return objectType == typeof(string);
         }
 
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue,
+            JsonSerializer serializer)
         {
             return BuildNumber.Parse(reader.Value.ToString());
         }

SharedLibraryCore/Helpers/ChangeTracking.cs

@@ -1,37 +1,36 @@
-using SharedLibraryCore.Interfaces;
+using System.Collections.Concurrent;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Text;
 
 namespace SharedLibraryCore.Helpers
 {
     /// <summary>
-    /// This class provides a way to keep track of changes to an entity
+    ///     This class provides a way to keep track of changes to an entity
     /// </summary>
     /// <typeparam name="T">Type of entity to keep track of changes to</typeparam>
     public class ChangeTracking<T>
     {
-        ConcurrentQueue<T> Values;
+        private readonly ConcurrentQueue<T> Values;
 
         public ChangeTracking()
         {
             Values = new ConcurrentQueue<T>();
         }
 
+        public bool HasChanges => Values.Count > 0;
+
         public void OnChange(T value)
         {
             if (Values.Count > 30)
-                Values.TryDequeue(out T throwAway);
+            {
+                Values.TryDequeue(out var throwAway);
+            }
+
             Values.Enqueue(value);
         }
 
         public T GetNextChange()
         {
-            bool itemDequeued = Values.TryDequeue(out T val);
+            var itemDequeued = Values.TryDequeue(out var val);
-            return itemDequeued ? val : default(T);
+            return itemDequeued ? val : default;
         }
-
-        public bool HasChanges => Values.Count > 0;
     }
 }

SharedLibraryCore/Helpers/Hashing.cs

@@ -5,13 +5,12 @@ namespace SharedLibraryCore.Helpers
     public class Hashing
     {
         /// <summary>
-        /// Generate password hash and salt
+        ///     Generate password hash and salt
         /// </summary>
         /// <param name="password">plaintext password</param>
         /// <returns></returns>
         public static string[] Hash(string password, string saltStr = null)
         {
-
             string hash;
             string salt;
             var CryptoSvc = new PBKDF2();
@@ -21,22 +20,19 @@ namespace SharedLibraryCore.Helpers
             {
                 hash = CryptoSvc.Compute(password);
                 salt = CryptoSvc.Salt;
-                return new string[]
+                return new[]
                 {
                     hash,
                     salt
                 };
             }
 
-            else
+            hash = CryptoSvc.Compute(password, saltStr);
+            return new[]
             {
-                hash = CryptoSvc.Compute(password, saltStr);
+                hash,
-                return new string[]
+                ""
-                {
+            };
-                    hash,
-                    ""
-                };
-            }
         }
     }
 }

SharedLibraryCore/Helpers/MessageToken.cs

@@ -1,12 +1,10 @@
 using System;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace SharedLibraryCore.Helpers
 {
     public class MessageToken
     {
-        public string Name { get; private set; }
         private readonly Func<Server, Task<string>> _asyncValue;
 
 
@@ -16,9 +14,11 @@ namespace SharedLibraryCore.Helpers
             _asyncValue = Value;
         }
 
+        public string Name { get; }
+
         public async Task<string> ProcessAsync(Server server)
         {
-            string result = await _asyncValue(server);
+            var result = await _asyncValue(server);
             return result;
         }
     }

SharedLibraryCore/Helpers/ParseEnum.cs

@@ -13,7 +13,7 @@ namespace SharedLibraryCore.Helpers
 
             catch (Exception)
             {
-                return (T)(Enum.GetValues(type).GetValue(0));
+                return (T)Enum.GetValues(type).GetValue(0);
             }
         }
     }

SharedLibraryCore/Helpers/ParserRegex.cs

@@ -6,8 +6,8 @@ namespace SharedLibraryCore.Interfaces
     public sealed class ParserRegex
     {
         /// <summary>
-        /// represents the logical mapping of information provided by 
+        ///     represents the logical mapping of information provided by
-        /// game logs, get status, and get dvar information
+        ///     game logs, get status, and get dvar information
         /// </summary>
         public enum GroupType
         {
@@ -43,11 +43,18 @@ namespace SharedLibraryCore.Interfaces
             AdditionalGroup = 200
         }
 
-        public IParserPatternMatcher PatternMatcher { get; private set; }
-
         private string pattern;
+
+        public ParserRegex(IParserPatternMatcher pattern)
+        {
+            GroupMapping = new Dictionary<GroupType, int>();
+            PatternMatcher = pattern;
+        }
+
+        public IParserPatternMatcher PatternMatcher { get; }
+
         /// <summary>
-        /// stores the regular expression groups that will be mapped to group types
+        ///     stores the regular expression groups that will be mapped to group types
         /// </summary>
         public string Pattern
         {
@@ -60,20 +67,20 @@ namespace SharedLibraryCore.Interfaces
         }
 
         /// <summary>
-        /// stores the mapping from group type to group index in the regular expression
+        ///     stores the mapping from group type to group index in the regular expression
         /// </summary>
-        public Dictionary<GroupType, int> GroupMapping { get; private set; }
+        public Dictionary<GroupType, int> GroupMapping { get; }
 
         /// <summary>
-        /// helper method to enable script parsers to app regex mapping
+        ///     helper method to enable script parsers to app regex mapping
-        /// the first parameter specifies the group type contained in the regex pattern
+        ///     the first parameter specifies the group type contained in the regex pattern
-        /// the second parameter specifies the group index to retrieve in the matched regex pattern
+        ///     the second parameter specifies the group index to retrieve in the matched regex pattern
         /// </summary>
         /// <param name="mapKey">group type</param>
         /// <param name="mapValue">group index</param>
         public void AddMapping(object mapKey, object mapValue)
         {
-            if (int.TryParse(mapKey.ToString(), out int key) && int.TryParse(mapValue.ToString(), out int value))
+            if (int.TryParse(mapKey.ToString(), out var key) && int.TryParse(mapValue.ToString(), out var value))
             {
                 if (GroupMapping.ContainsKey((GroupType)key))
                 {
@@ -88,8 +95,8 @@ namespace SharedLibraryCore.Interfaces
 
             if (mapKey.GetType() == typeof(GroupType) && mapValue.GetType().ToString() == "System.Int32")
             {
-                GroupType k = (GroupType)Enum.Parse(typeof(GroupType), mapKey.ToString());
+                var k = (GroupType)Enum.Parse(typeof(GroupType), mapKey.ToString());
-                int v = int.Parse(mapValue.ToString());
+                var v = int.Parse(mapValue.ToString());
 
                 if (GroupMapping.ContainsKey(k))
                 {
@@ -102,11 +109,5 @@ namespace SharedLibraryCore.Interfaces
                 }
             }
         }
-
-        public ParserRegex(IParserPatternMatcher pattern)
-        {
-            GroupMapping = new Dictionary<GroupType, int>();
-            PatternMatcher = pattern;
-        }
     }
 }