Rim/IW4M-Admin
Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

Initial .net 6 upgrades

Browse Source
This commit is contained in:
RaidMax 2022-01-26 10:32:16 -06:00
parent e4cb3abb20
commit a602e8caed
170 changed files with 2805 additions and 2577 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Application/Application.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish> <MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
<PackageId>RaidMax.IW4MAdmin.Application</PackageId> <PackageId>RaidMax.IW4MAdmin.Application</PackageId>
<Version>2020.0.0.0</Version> <Version>2020.0.0.0</Version>
@ -25,13 +25,13 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Jint" Version="3.0.0-beta-1632" /> <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> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </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> </ItemGroup>
<PropertyGroup> <PropertyGroup>

2
Application/ApplicationManager.cs
View File

@ -551,7 +551,7 @@ namespace IW4MAdmin.Application
_servers.Add(ServerInstance); _servers.Add(ServerInstance);
Console.WriteLine(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_MONITORING_TEXT"].FormatExt(ServerInstance.Hostname.StripColors())); 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 // add the start event for this server

4
Application/Extensions/StartupExtensions.cs
View File

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

2
Application/IW4MServer.cs
View File

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

2
Application/Main.cs
View File

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

6
Application/Misc/BaseConfigurationHandler.cs
View File

@ -52,7 +52,7 @@ namespace IW4MAdmin.Application.Misc
} }
} }
public Task Save() public async Task Save()
{ {
var settings = new JsonSerializerSettings() var settings = new JsonSerializerSettings()
{ {
@ -60,8 +60,8 @@ namespace IW4MAdmin.Application.Misc
}; };
settings.Converters.Add(new Newtonsoft.Json.Converters.StringEnumConverter()); 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() public T Configuration()

36
Application/Misc/MasterCommunication.cs
View File

@ -93,9 +93,6 @@ namespace IW4MAdmin.Application.Misc
public async Task RunUploadStatus(CancellationToken token) public async Task RunUploadStatus(CancellationToken token)
{ {
// todo: clean up this logic
bool connected;
while (!token.IsCancellationRequested) while (!token.IsCancellationRequested)
{ {
try try
@ -103,40 +100,11 @@ namespace IW4MAdmin.Application.Misc
await UploadStatus(); 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 try
{ {
await Task.Delay(30000, token); await Task.Delay(30000, token);

34
Application/Misc/PluginImporter.cs
View File

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

40
Application/Misc/TokenAuthentication.cs
View File

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

21
Data/Data.csproj
View File

@ -1,30 +1,27 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<Configurations>Debug;Release;Prerelease</Configurations> <Configurations>Debug;Release;Prerelease</Configurations>
<Platforms>AnyCPU</Platforms> <Platforms>AnyCPU</Platforms>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageId>RaidMax.IW4MAdmin.Data</PackageId> <PackageId>RaidMax.IW4MAdmin.Data</PackageId>
<Title>RaidMax.IW4MAdmin.Data</Title> <Title>RaidMax.IW4MAdmin.Data</Title>
<Authors /> <Authors />
<PackageVersion>1.1.0</PackageVersion> <PackageVersion>1.2.0</PackageVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <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> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles</IncludeAssets>
</PackageReference> </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> </ItemGroup>
</Project> </Project>

6
Data/MigrationContext/MySqlDatabaseContext.cs
View File

@ -24,9 +24,9 @@ namespace Data.MigrationContext
{ {
if (MigrationExtensions.IsMigration) 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();
} }
} }
} }

3
Data/Models/Vector3.cs
View File

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

2
Integrations/Cod/Integrations.Cod.csproj
View File

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

2
Integrations/Source/Integrations.Source.csproj
View File

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

4
Plugins/AutomessageFeed/AutomessageFeed.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch> <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<LangVersion>Latest</LangVersion> <LangVersion>Latest</LangVersion>
<Configurations>Debug;Release;Prerelease</Configurations> <Configurations>Debug;Release;Prerelease</Configurations>
@ -10,7 +10,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.SyndicationFeed.ReaderWriter" Version="1.0.2" /> <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> </ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent"> <Target Name="PostBuild" AfterTargets="PostBuildEvent">

4
Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<ApplicationIcon /> <ApplicationIcon />
<StartupObject /> <StartupObject />
<Configurations>Debug;Release;Prerelease</Configurations> <Configurations>Debug;Release;Prerelease</Configurations>
@ -10,7 +10,7 @@
</PropertyGroup> </PropertyGroup>
<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> </ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent"> <Target Name="PostBuild" AfterTargets="PostBuildEvent">

4
Plugins/LiveRadar/LiveRadar.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<RazorCompileOnBuild Condition="'$(CONFIG)'!='Debug'">true</RazorCompileOnBuild> <RazorCompileOnBuild Condition="'$(CONFIG)'!='Debug'">true</RazorCompileOnBuild>
<RazorCompiledOnPublish Condition="'$(CONFIG)'!='Debug'">true</RazorCompiledOnPublish> <RazorCompiledOnPublish Condition="'$(CONFIG)'!='Debug'">true</RazorCompiledOnPublish>
<PreserveCompilationContext Condition="'$(CONFIG)'!='Debug'">false</PreserveCompilationContext> <PreserveCompilationContext Condition="'$(CONFIG)'!='Debug'">false</PreserveCompilationContext>
@ -23,7 +23,7 @@
</ItemGroup> </ItemGroup>
<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> </ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent"> <Target Name="PostBuild" AfterTargets="PostBuildEvent">

3
Plugins/LiveRadar/RadarEvent.cs
View File

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

4
Plugins/Login/Login.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<ApplicationIcon /> <ApplicationIcon />
<StartupObject /> <StartupObject />
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies> <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
@ -19,7 +19,7 @@
</PropertyGroup> </PropertyGroup>
<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> </ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent"> <Target Name="PostBuild" AfterTargets="PostBuildEvent">

4
Plugins/ProfanityDeterment/ProfanityDeterment.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<ApplicationIcon /> <ApplicationIcon />
<StartupObject /> <StartupObject />
<PackageId>RaidMax.IW4MAdmin.Plugins.ProfanityDeterment</PackageId> <PackageId>RaidMax.IW4MAdmin.Plugins.ProfanityDeterment</PackageId>
@ -16,7 +16,7 @@
</PropertyGroup> </PropertyGroup>
<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> </ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent"> <Target Name="PostBuild" AfterTargets="PostBuildEvent">

2
Plugins/Stats/Client/HitCalculator.cs
View File

@ -201,7 +201,7 @@ namespace IW4MAdmin.Plugins.Stats.Client
} }
catch (Exception ex) 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; continue;
} }

2
Plugins/Stats/Commands/MostKillsCommand.cs
View File

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

2
Plugins/Stats/Commands/MostPlayedCommand.cs
View File

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

2
Plugins/Stats/Helpers/StatManager.cs
View File

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

4
Plugins/Stats/Stats.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<ApplicationIcon /> <ApplicationIcon />
<StartupObject /> <StartupObject />
<PackageId>RaidMax.IW4MAdmin.Plugins.Stats</PackageId> <PackageId>RaidMax.IW4MAdmin.Plugins.Stats</PackageId>
@ -17,7 +17,7 @@
</PropertyGroup> </PropertyGroup>
<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> </ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent"> <Target Name="PostBuild" AfterTargets="PostBuildEvent">

5
Plugins/Welcome/Plugin.cs
View File

@ -6,6 +6,7 @@ using SharedLibraryCore.Database.Models;
using System.Linq; using System.Linq;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using System.Net; using System.Net;
using System.Net.Http;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using Humanizer; using Humanizer;
using Data.Abstractions; using Data.Abstractions;
@ -105,11 +106,11 @@ namespace IW4MAdmin.Plugins.Welcome
/// <returns></returns> /// <returns></returns>
private async Task<string> GetCountryName(string ip) private async Task<string> GetCountryName(string ip)
{ {
using var wc = new WebClient(); using var wc = new HttpClient();
try try
{ {
var response = 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); var responseObj = JObject.Parse(response);
response = responseObj["country"]?.ToString(); response = responseObj["country"]?.ToString();

4
Plugins/Welcome/Welcome.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<ApplicationIcon /> <ApplicationIcon />
<StartupObject /> <StartupObject />
<PackageId>RaidMax.IW4MAdmin.Plugins.Welcome</PackageId> <PackageId>RaidMax.IW4MAdmin.Plugins.Welcome</PackageId>
@ -20,7 +20,7 @@
</Target> </Target>
<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> </ItemGroup>
</Project> </Project>

60
SharedLibraryCore/BaseController.cs
View File

@ -1,18 +1,20 @@
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.Collections.Generic;
using System.Globalization;
using System.Linq; using System.Linq;
using System.Security.Claims; using System.Security.Claims;
using System.Threading.Tasks; using System.Threading.Tasks;
using Data.Context; using Data.Context;
using Data.Models; 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.Configuration;
using SharedLibraryCore.Database.Models;
using SharedLibraryCore.Dtos;
using SharedLibraryCore.Interfaces;
using SharedLibraryCore.Localization;
namespace SharedLibraryCore namespace SharedLibraryCore
{ {
@ -23,16 +25,11 @@ namespace SharedLibraryCore
/// </summary> /// </summary>
private const int COOKIE_LIFESPAN = 3; 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 readonly byte[] LocalHost = { 127, 0, 0, 1 };
private static string SocialLink; private static string SocialLink;
private static string SocialTitle; private static string SocialTitle;
protected readonly DatabaseContext Context;
protected List<Page> Pages; protected List<Page> Pages;
protected ApplicationConfiguration AppConfig { get; }
public BaseController(IManager manager) public BaseController(IManager manager)
{ {
@ -59,17 +56,24 @@ namespace SharedLibraryCore
ViewBag.EnableColorCodes = AppConfig.EnableColorCodes; ViewBag.EnableColorCodes = AppConfig.EnableColorCodes;
ViewBag.Language = Utilities.CurrentLocalization.Culture.TwoLetterISOLanguageName; ViewBag.Language = Utilities.CurrentLocalization.Culture.TwoLetterISOLanguageName;
Client ??= new EFClient() Client ??= new EFClient
{ {
ClientId = -1, 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) protected async Task SignInAsync(ClaimsPrincipal claimsPrinciple)
{ {
await HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, claimsPrinciple, new AuthenticationProperties() await HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, claimsPrinciple,
new AuthenticationProperties
{ {
AllowRefresh = true, AllowRefresh = true,
ExpiresUtc = DateTime.UtcNow.AddMonths(COOKIE_LIFESPAN), ExpiresUtc = DateTime.UtcNow.AddMonths(COOKIE_LIFESPAN),
@ -84,21 +88,27 @@ namespace SharedLibraryCore
{ {
try 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) if (clientId > 0)
{ {
Client.ClientId = clientId; 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; Authorized = Client.ClientId >= 0;
} }
} }
catch (InvalidOperationException) catch (InvalidOperationException)
{ {
} }
catch (KeyNotFoundException) catch (KeyNotFoundException)
@ -112,8 +122,8 @@ namespace SharedLibraryCore
else if (!HttpContext.Request.Headers.ContainsKey("X-Forwarded-For")) else if (!HttpContext.Request.Headers.ContainsKey("X-Forwarded-For"))
{ {
Client.ClientId = 1; 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; Authorized = true;
var claims = new[] var claims = new[]
{ {

37
SharedLibraryCore/Command.cs
View File

@ -1,9 +1,9 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Data.Models.Client;
using SharedLibraryCore.Commands; using SharedLibraryCore.Commands;
using SharedLibraryCore.Configuration; using SharedLibraryCore.Configuration;
using SharedLibraryCore.Database.Models;
using SharedLibraryCore.Interfaces; using SharedLibraryCore.Interfaces;
using static SharedLibraryCore.Server; using static SharedLibraryCore.Server;
using ILogger = Microsoft.Extensions.Logging.ILogger; using ILogger = Microsoft.Extensions.Logging.ILogger;
@ -17,7 +17,11 @@ namespace SharedLibraryCore
{ {
protected readonly CommandConfiguration _config; protected readonly CommandConfiguration _config;
protected readonly ITranslationLookup _translationLookup; protected readonly ITranslationLookup _translationLookup;
private string alias;
protected ILogger logger; protected ILogger logger;
private string name;
private EFClient.Permission permission;
private Game[] supportedGames;
public Command(CommandConfiguration config, ITranslationLookup layout) public Command(CommandConfiguration config, ITranslationLookup layout)
{ {
@ -26,12 +30,23 @@ namespace SharedLibraryCore
SupportedGames = new Game[0]; SupportedGames = new Game[0];
} }
/// <summary>
/// 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> /// <summary>
/// Executes the command /// Executes the command
/// </summary> /// </summary>
/// <param name="gameEvent"></param> /// <param name="gameEvent"></param>
/// <returns></returns> /// <returns></returns>
abstract public Task ExecuteAsync(GameEvent gameEvent); public abstract Task ExecuteAsync(GameEvent gameEvent);
/// <summary> /// <summary>
/// Specifies the name and string that triggers the command /// Specifies the name and string that triggers the command
@ -52,7 +67,6 @@ namespace SharedLibraryCore
} }
} }
} }
private string name;
/// <summary> /// <summary>
/// Specifies the command description /// Specifies the command description
@ -62,7 +76,8 @@ namespace SharedLibraryCore
/// <summary> /// <summary>
/// Helper property to provide the syntax of the command /// Helper property to provide the syntax of the command
/// </summary> /// </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> /// <summary>
/// Alternate name for this command to be executed by /// Alternate name for this command to be executed by
@ -83,12 +98,6 @@ namespace SharedLibraryCore
} }
} }
} }
private string alias;
/// <summary>
/// Helper property to determine the number of required args
/// </summary>
public int RequiredArgumentCount => Arguments.Count(c => c.Required);
/// <summary> /// <summary>
/// Indicates if the command requires a target to execute on /// Indicates if the command requires a target to execute on
@ -114,7 +123,6 @@ namespace SharedLibraryCore
} }
} }
} }
private EFClient.Permission permission;
public Game[] SupportedGames public Game[] SupportedGames
{ {
@ -133,13 +141,6 @@ namespace SharedLibraryCore
} }
} }
} }
private Game[] supportedGames;
/// <summary>
/// Argument list for the command
/// </summary>
public CommandArgument[] Arguments { get; protected set; } = new CommandArgument[0];
/// <summary> /// <summary>
/// indicates if this command allows impersonation (run as) /// indicates if this command allows impersonation (run as)

13
SharedLibraryCore/Commands/AddClientTagCommand.cs
View File

@ -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;
using Data.Models.Client;
using SharedLibraryCore.Configuration;
using SharedLibraryCore.Interfaces;
namespace SharedLibraryCore.Commands namespace SharedLibraryCore.Commands
{ {
@ -10,7 +10,8 @@ namespace SharedLibraryCore.Commands
{ {
private readonly IMetaService _metaService; 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"; Name = "addclienttag";
Description = layout["COMMANDS_ADD_CLIENT_TAG_DESC"]; Description = layout["COMMANDS_ADD_CLIENT_TAG_DESC"];
@ -19,7 +20,7 @@ namespace SharedLibraryCore.Commands
RequiresTarget = false; RequiresTarget = false;
Arguments = new[] Arguments = new[]
{ {
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGUMENT_TAG"], Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
Required = true Required = true

16
SharedLibraryCore/Commands/CommandExtensions.cs
View File

@ -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 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;
}
} }
} }

46
SharedLibraryCore/Commands/CommandProcessing.cs
View File

@ -1,36 +1,35 @@
using SharedLibraryCore.Configuration; using System;
using SharedLibraryCore.Database.Models;
using SharedLibraryCore.Exceptions;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using SharedLibraryCore.Configuration;
using SharedLibraryCore.Database.Models;
using SharedLibraryCore.Exceptions;
namespace SharedLibraryCore.Commands namespace SharedLibraryCore.Commands
{ {
public class CommandProcessing 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 loc = Utilities.CurrentLocalization.LocalizationIndex;
var Manager = E.Owner.Manager; 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; E.Message = E.Data;
Command C = null; Command C = null;
foreach (Command cmd in Manager.GetCommands() foreach (Command cmd in Manager.GetCommands()
.Where(c => c.Name != null)) .Where(c => c.Name != null))
{
if (cmd.Name.Equals(CommandString, StringComparison.OrdinalIgnoreCase) || if (cmd.Name.Equals(CommandString, StringComparison.OrdinalIgnoreCase) ||
(cmd.Alias ?? "").Equals(CommandString, StringComparison.OrdinalIgnoreCase)) (cmd.Alias ?? "").Equals(CommandString, StringComparison.OrdinalIgnoreCase))
{ {
C = cmd; C = cmd;
} }
}
if (C == null) if (C == null)
{ {
@ -51,7 +50,7 @@ namespace SharedLibraryCore.Commands
} }
E.Data = E.Data.RemoveWords(1); 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 // todo: the code below can be cleaned up
if (E.Origin.Level < C.Permission) 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}\""); 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(loc["COMMAND_MISSINGARGS"]);
E.Origin.Tell(C.Syntax); E.Origin.Tell(C.Syntax);
@ -71,14 +70,14 @@ namespace SharedLibraryCore.Commands
{ {
if (Args.Length > 0) if (Args.Length > 0)
{ {
if (!Int32.TryParse(Args[0], out int cNum)) if (!int.TryParse(Args[0], out var cNum))
{ {
cNum = -1; cNum = -1;
} }
if (Args[0][0] == '@') // user specifying target by database ID 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); var found = await Manager.GetClientService().Get(dbID);
if (found != null) 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) if (E.Owner.Clients[cNum] != null)
{ {
E.Target = E.Owner.Clients[cNum]; 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}"); 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(); 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); var reg = new Regex($"(\"{escapedName}\")|({escapedName})", RegexOptions.IgnoreCase);
E.Data = reg.Replace(E.Data, "", 1).Trim(); E.Data = reg.Replace(E.Data, "", 1).Trim();
@ -135,23 +135,21 @@ namespace SharedLibraryCore.Commands
{ {
E.Origin.Tell(loc["COMMAND_TARGET_MULTI"]); E.Origin.Tell(loc["COMMAND_TARGET_MULTI"]);
foreach (var p in matchingPlayers) foreach (var p in matchingPlayers)
{
E.Origin.Tell($"[(Color::Yellow){p.ClientNumber}(Color::White)] {p.Name}"); E.Origin.Tell($"[(Color::Yellow){p.ClientNumber}(Color::White)] {p.Name}");
}
throw new CommandException($"{E.Origin} had multiple players found for {C.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(); 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); var reg = new Regex($"({escapedName})|({escapedArg})", RegexOptions.IgnoreCase);
E.Data = reg.Replace(E.Data, "", 1).Trim(); E.Data = reg.Replace(E.Data, "", 1).Trim();
if ((E.Data.Trim() == E.Target.CleanedName.ToLower().Trim() || if ((E.Data.Trim() == E.Target.CleanedName.ToLower().Trim() ||
E.Data == String.Empty) && E.Data == string.Empty) &&
C.RequiresTarget) C.RequiresTarget)
{ {
E.Origin.Tell(loc["COMMAND_MISSINGARGS"]); E.Origin.Tell(loc["COMMAND_MISSINGARGS"]);

14
SharedLibraryCore/Commands/ListClientTags.cs
View File

@ -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 System.Threading.Tasks;
using Data.Models; using Data.Models;
using Data.Models.Client;
using SharedLibraryCore.Configuration;
using SharedLibraryCore.Interfaces;
namespace SharedLibraryCore.Commands namespace SharedLibraryCore.Commands
{ {
public class ListClientTags : Command public class ListClientTags : Command
{ {
private readonly IMetaService _metaService; 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"; Name = "listclienttags";
Description = layout["COMMANDS_LIST_CLIENT_TAGS_DESC"]; Description = layout["COMMANDS_LIST_CLIENT_TAGS_DESC"];

324
SharedLibraryCore/Commands/NativeCommands.cs
View File

@ -1,20 +1,19 @@
using Microsoft.EntityFrameworkCore; using System;
using SharedLibraryCore.Configuration;
using SharedLibraryCore.Database.Models;
using SharedLibraryCore.Helpers;
using SharedLibraryCore.Interfaces;
using SharedLibraryCore.Services;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Security.Cryptography; using System.Security.Cryptography;
using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using Data.Abstractions; using Data.Abstractions;
using Data.Models; using Data.Models;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Serilog.Context; using Serilog.Context;
using SharedLibraryCore.Configuration;
using SharedLibraryCore.Database.Models;
using SharedLibraryCore.Helpers;
using SharedLibraryCore.Interfaces;
using static Data.Models.Client.EFClient; using static Data.Models.Client.EFClient;
namespace SharedLibraryCore.Commands namespace SharedLibraryCore.Commands
@ -24,7 +23,8 @@ namespace SharedLibraryCore.Commands
/// </summary> /// </summary>
public class QuitCommand : Command public class QuitCommand : Command
{ {
public QuitCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup) public QuitCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
translationLookup)
{ {
Name = "quit"; Name = "quit";
Description = _translationLookup["COMMANDS_QUIT_DESC"]; Description = _translationLookup["COMMANDS_QUIT_DESC"];
@ -45,7 +45,8 @@ namespace SharedLibraryCore.Commands
/// </summary> /// </summary>
public class RestartCommand : Command public class RestartCommand : Command
{ {
public RestartCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup) public RestartCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
translationLookup)
{ {
Name = "restart"; Name = "restart";
Description = _translationLookup["COMMANDS_RESTART_DESC"]; Description = _translationLookup["COMMANDS_RESTART_DESC"];
@ -67,7 +68,8 @@ namespace SharedLibraryCore.Commands
/// </summary> /// </summary>
public class OwnerCommand : Command public class OwnerCommand : Command
{ {
public OwnerCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup) public OwnerCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
translationLookup)
{ {
Name = "owner"; Name = "owner";
Description = _translationLookup["COMMANDS_OWNER_DESC"]; Description = _translationLookup["COMMANDS_OWNER_DESC"];
@ -85,8 +87,8 @@ namespace SharedLibraryCore.Commands
return; return;
} }
if (await (E.Owner.Manager.GetClientService() as ClientService).GetOwnerCount() == 0 && if (await E.Owner.Manager.GetClientService().GetOwnerCount() == 0 &&
!E.Origin.SetLevel(EFClient.Permission.Owner, Utilities.IW4MAdminClient(E.Owner)).Failed) !E.Origin.SetLevel(Permission.Owner, Utilities.IW4MAdminClient(E.Owner)).Failed)
{ {
E.Origin.Tell(_translationLookup["COMMANDS_OWNER_SUCCESS"]); E.Origin.Tell(_translationLookup["COMMANDS_OWNER_SUCCESS"]);
} }
@ -103,7 +105,9 @@ namespace SharedLibraryCore.Commands
public class WarnCommand : Command public class WarnCommand : Command
{ {
private readonly ApplicationConfiguration _appConfig; private readonly ApplicationConfiguration _appConfig;
public WarnCommand(ApplicationConfiguration appConfig, CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
public WarnCommand(ApplicationConfiguration appConfig, CommandConfiguration config,
ITranslationLookup translationLookup) : base(config, translationLookup)
{ {
Name = "warn"; Name = "warn";
Description = _translationLookup["COMMANDS_WARN_DESC"]; Description = _translationLookup["COMMANDS_WARN_DESC"];
@ -112,12 +116,12 @@ namespace SharedLibraryCore.Commands
RequiresTarget = true; RequiresTarget = true;
Arguments = new[] Arguments = new[]
{ {
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGS_PLAYER"], Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
Required = true Required = true
}, },
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGS_REASON"], Name = _translationLookup["COMMANDS_ARGS_REASON"],
Required = true Required = true
@ -143,7 +147,8 @@ namespace SharedLibraryCore.Commands
/// </summary> /// </summary>
public class WarnClearCommand : Command public class WarnClearCommand : Command
{ {
public WarnClearCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup) public WarnClearCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
translationLookup)
{ {
Name = "warnclear"; Name = "warnclear";
Description = _translationLookup["COMMANDS_WARNCLEAR_DESC"]; Description = _translationLookup["COMMANDS_WARNCLEAR_DESC"];
@ -152,7 +157,7 @@ namespace SharedLibraryCore.Commands
RequiresTarget = true; RequiresTarget = true;
Arguments = new[] Arguments = new[]
{ {
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGS_PLAYER"], Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
Required = true Required = true
@ -178,7 +183,8 @@ namespace SharedLibraryCore.Commands
{ {
private readonly ApplicationConfiguration _appConfig; private readonly ApplicationConfiguration _appConfig;
public KickCommand(ApplicationConfiguration appConfig, CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup) public KickCommand(ApplicationConfiguration appConfig, CommandConfiguration config,
ITranslationLookup translationLookup) : base(config, translationLookup)
{ {
Name = "kick"; Name = "kick";
Description = _translationLookup["COMMANDS_KICK_DESC"]; Description = _translationLookup["COMMANDS_KICK_DESC"];
@ -187,12 +193,12 @@ namespace SharedLibraryCore.Commands
RequiresTarget = true; RequiresTarget = true;
Arguments = new[] Arguments = new[]
{ {
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGS_PLAYER"], Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
Required = true Required = true
}, },
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGS_REASON"], Name = _translationLookup["COMMANDS_ARGS_REASON"],
Required = true Required = true
@ -204,7 +210,8 @@ namespace SharedLibraryCore.Commands
public override async Task ExecuteAsync(GameEvent gameEvent) public override async Task ExecuteAsync(GameEvent gameEvent)
{ {
var reason = gameEvent.Data.FindRuleForReason(_appConfig, gameEvent.Owner); var reason = gameEvent.Data.FindRuleForReason(_appConfig, gameEvent.Owner);
switch ((await gameEvent.Target.Kick(reason, gameEvent.Origin).WaitAsync(Utilities.DefaultCommandTimeout, gameEvent.Owner.Manager.CancellationToken)).FailReason) switch ((await gameEvent.Target.Kick(reason, gameEvent.Origin).WaitAsync(Utilities.DefaultCommandTimeout,
gameEvent.Owner.Manager.CancellationToken)).FailReason)
{ {
case GameEvent.EventFailReason.None: case GameEvent.EventFailReason.None:
gameEvent.Origin.Tell(_translationLookup["COMMANDS_KICK_SUCCESS"].FormatExt(gameEvent.Target.Name)); gameEvent.Origin.Tell(_translationLookup["COMMANDS_KICK_SUCCESS"].FormatExt(gameEvent.Target.Name));
@ -224,9 +231,11 @@ namespace SharedLibraryCore.Commands
/// </summary> /// </summary>
public class TempBanCommand : Command public class TempBanCommand : Command
{ {
private static readonly string TempBanRegex = @"([0-9]+\w+)\ (.+)";
private readonly ApplicationConfiguration _appConfig; private readonly ApplicationConfiguration _appConfig;
public TempBanCommand(ApplicationConfiguration appConfig, CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup) public TempBanCommand(ApplicationConfiguration appConfig, CommandConfiguration config,
ITranslationLookup translationLookup) : base(config, translationLookup)
{ {
Name = "tempban"; Name = "tempban";
Description = _translationLookup["COMMANDS_TEMPBAN_DESC"]; Description = _translationLookup["COMMANDS_TEMPBAN_DESC"];
@ -235,17 +244,17 @@ namespace SharedLibraryCore.Commands
RequiresTarget = true; RequiresTarget = true;
Arguments = new[] Arguments = new[]
{ {
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGS_PLAYER"], Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
Required = true Required = true
}, },
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGS_DURATION"], Name = _translationLookup["COMMANDS_ARGS_DURATION"],
Required = true, Required = true
}, },
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGS_REASON"], Name = _translationLookup["COMMANDS_ARGS_REASON"],
Required = true Required = true
@ -254,8 +263,6 @@ namespace SharedLibraryCore.Commands
_appConfig = appConfig; _appConfig = appConfig;
} }
private static readonly string TempBanRegex = @"([0-9]+\w+)\ (.+)";
public override async Task ExecuteAsync(GameEvent gameEvent) public override async Task ExecuteAsync(GameEvent gameEvent)
{ {
var match = Regex.Match(gameEvent.Data, TempBanRegex); var match = Regex.Match(gameEvent.Data, TempBanRegex);
@ -271,16 +278,20 @@ namespace SharedLibraryCore.Commands
else else
{ {
switch ((await gameEvent.Target.TempBan(tempbanReason, length, gameEvent.Origin).WaitAsync(Utilities.DefaultCommandTimeout, gameEvent.Owner.Manager.CancellationToken)).FailReason) switch ((await gameEvent.Target.TempBan(tempbanReason, length, gameEvent.Origin)
.WaitAsync(Utilities.DefaultCommandTimeout, gameEvent.Owner.Manager.CancellationToken))
.FailReason)
{ {
case GameEvent.EventFailReason.None: case GameEvent.EventFailReason.None:
gameEvent.Origin.Tell(_translationLookup["COMMANDS_TEMPBAN_SUCCESS"].FormatExt(gameEvent.Target, length.HumanizeForCurrentCulture())); gameEvent.Origin.Tell(_translationLookup["COMMANDS_TEMPBAN_SUCCESS"]
.FormatExt(gameEvent.Target, length.HumanizeForCurrentCulture()));
break; break;
case GameEvent.EventFailReason.Exception: case GameEvent.EventFailReason.Exception:
gameEvent.Origin.Tell(_translationLookup["SERVER_ERROR_COMMAND_INGAME"]); gameEvent.Origin.Tell(_translationLookup["SERVER_ERROR_COMMAND_INGAME"]);
break; break;
default: default:
gameEvent.Origin.Tell(_translationLookup["COMMANDS_TEMPBAN_FAIL"].FormatExt(gameEvent.Target.Name)); gameEvent.Origin.Tell(_translationLookup["COMMANDS_TEMPBAN_FAIL"]
.FormatExt(gameEvent.Target.Name));
break; break;
} }
} }
@ -294,7 +305,9 @@ namespace SharedLibraryCore.Commands
public class BanCommand : Command public class BanCommand : Command
{ {
private readonly ApplicationConfiguration _appConfig; private readonly ApplicationConfiguration _appConfig;
public BanCommand(ApplicationConfiguration appConfig, CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
public BanCommand(ApplicationConfiguration appConfig, CommandConfiguration config,
ITranslationLookup translationLookup) : base(config, translationLookup)
{ {
Name = "ban"; Name = "ban";
Description = _translationLookup["COMMANDS_BAN_DESC"]; Description = _translationLookup["COMMANDS_BAN_DESC"];
@ -303,12 +316,12 @@ namespace SharedLibraryCore.Commands
RequiresTarget = true; RequiresTarget = true;
Arguments = new[] Arguments = new[]
{ {
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGS_PLAYER"], Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
Required = true Required = true
}, },
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGS_REASON"], Name = _translationLookup["COMMANDS_ARGS_REASON"],
Required = true Required = true
@ -320,7 +333,9 @@ namespace SharedLibraryCore.Commands
public override async Task ExecuteAsync(GameEvent gameEvent) public override async Task ExecuteAsync(GameEvent gameEvent)
{ {
var reason = gameEvent.Data.FindRuleForReason(_appConfig, gameEvent.Owner); var reason = gameEvent.Data.FindRuleForReason(_appConfig, gameEvent.Owner);
switch ((await gameEvent.Target.Ban(reason, gameEvent.Origin, false).WaitAsync(Utilities.DefaultCommandTimeout, gameEvent.Owner.Manager.CancellationToken)).FailReason) switch ((await gameEvent.Target.Ban(reason, gameEvent.Origin, false)
.WaitAsync(Utilities.DefaultCommandTimeout, gameEvent.Owner.Manager.CancellationToken))
.FailReason)
{ {
case GameEvent.EventFailReason.None: case GameEvent.EventFailReason.None:
gameEvent.Origin.Tell(_translationLookup["COMMANDS_BAN_SUCCESS"].FormatExt(gameEvent.Target.Name)); gameEvent.Origin.Tell(_translationLookup["COMMANDS_BAN_SUCCESS"].FormatExt(gameEvent.Target.Name));
@ -340,7 +355,8 @@ namespace SharedLibraryCore.Commands
/// </summary> /// </summary>
public class UnbanCommand : Command public class UnbanCommand : Command
{ {
public UnbanCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup) public UnbanCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
translationLookup)
{ {
Name = "unban"; Name = "unban";
Description = _translationLookup["COMMANDS_UNBAN_DESC"]; Description = _translationLookup["COMMANDS_UNBAN_DESC"];
@ -349,12 +365,12 @@ namespace SharedLibraryCore.Commands
RequiresTarget = true; RequiresTarget = true;
Arguments = new[] Arguments = new[]
{ {
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGS_CLIENTID"], Name = _translationLookup["COMMANDS_ARGS_CLIENTID"],
Required = true, Required = true
}, },
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGS_REASON"], Name = _translationLookup["COMMANDS_ARGS_REASON"],
Required = true Required = true
@ -366,9 +382,11 @@ namespace SharedLibraryCore.Commands
{ {
// todo: don't do the lookup here // todo: don't do the lookup here
var penalties = await E.Owner.Manager.GetPenaltyService().GetActivePenaltiesAsync(E.Target.AliasLinkId); var penalties = await E.Owner.Manager.GetPenaltyService().GetActivePenaltiesAsync(E.Target.AliasLinkId);
if (penalties.Where(p => p.Type == EFPenalty.PenaltyType.Ban || p.Type == EFPenalty.PenaltyType.TempBan).FirstOrDefault() != null) if (penalties.Where(p => p.Type == EFPenalty.PenaltyType.Ban || p.Type == EFPenalty.PenaltyType.TempBan)
.FirstOrDefault() != null)
{ {
switch ((await E.Target.Unban(E.Data, E.Origin).WaitAsync(Utilities.DefaultCommandTimeout, E.Owner.Manager.CancellationToken)).FailReason) switch ((await E.Target.Unban(E.Data, E.Origin)
.WaitAsync(Utilities.DefaultCommandTimeout, E.Owner.Manager.CancellationToken)).FailReason)
{ {
case GameEvent.EventFailReason.None: case GameEvent.EventFailReason.None:
E.Origin.Tell(_translationLookup["COMMANDS_UNBAN_SUCCESS"].FormatExt(E.Target)); E.Origin.Tell(_translationLookup["COMMANDS_UNBAN_SUCCESS"].FormatExt(E.Target));
@ -391,7 +409,8 @@ namespace SharedLibraryCore.Commands
/// </summary> /// </summary>
public class FastRestartCommand : Command public class FastRestartCommand : Command
{ {
public FastRestartCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup) public FastRestartCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
translationLookup)
{ {
Name = "fastrestart"; Name = "fastrestart";
Description = _translationLookup["COMMANDS_FASTRESTART_DESC"]; Description = _translationLookup["COMMANDS_FASTRESTART_DESC"];
@ -404,9 +423,10 @@ namespace SharedLibraryCore.Commands
{ {
await E.Owner.ExecuteCommandAsync("fast_restart"); await E.Owner.ExecuteCommandAsync("fast_restart");
var _ = !E.Origin.Masked ? var _ = !E.Origin.Masked
E.Owner.Broadcast($"(Color::Accent){E.Origin.Name} (Color::White){_translationLookup["COMMANDS_FASTRESTART_UNMASKED"]}") : ? E.Owner.Broadcast(
E.Owner.Broadcast(_translationLookup["COMMANDS_FASTRESTART_MASKED"]); $"(Color::Accent){E.Origin.Name} (Color::White){_translationLookup["COMMANDS_FASTRESTART_UNMASKED"]}")
: E.Owner.Broadcast(_translationLookup["COMMANDS_FASTRESTART_MASKED"]);
} }
} }
@ -415,7 +435,8 @@ namespace SharedLibraryCore.Commands
/// </summary> /// </summary>
public class MapRotateCommand : Command public class MapRotateCommand : Command
{ {
public MapRotateCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup) public MapRotateCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
translationLookup)
{ {
Name = "maprotate"; Name = "maprotate";
Description = _translationLookup["COMMANDS_MAPROTATE_DESC"]; Description = _translationLookup["COMMANDS_MAPROTATE_DESC"];
@ -426,9 +447,11 @@ namespace SharedLibraryCore.Commands
public override async Task ExecuteAsync(GameEvent E) public override async Task ExecuteAsync(GameEvent E)
{ {
_ = !E.Origin.Masked ? _ = !E.Origin.Masked
E.Owner.Broadcast($"{_translationLookup["COMMANDS_MAPROTATE"]} [(Color::Accent){E.Origin.Name}(Color::White)]", E.Origin) : ? E.Owner.Broadcast(
E.Owner.Broadcast(_translationLookup["COMMANDS_MAPROTATE"], E.Origin); $"{_translationLookup["COMMANDS_MAPROTATE"]} [(Color::Accent){E.Origin.Name}(Color::White)]",
E.Origin)
: E.Owner.Broadcast(_translationLookup["COMMANDS_MAPROTATE"], E.Origin);
await Task.Delay(E.Owner.Manager.GetApplicationSettings().Configuration().MapChangeDelaySeconds * 1000); await Task.Delay(E.Owner.Manager.GetApplicationSettings().Configuration().MapChangeDelaySeconds * 1000);
await E.Owner.ExecuteCommandAsync("map_rotate"); await E.Owner.ExecuteCommandAsync("map_rotate");
@ -440,7 +463,8 @@ namespace SharedLibraryCore.Commands
/// </summary> /// </summary>
public class SetLevelCommand : Command public class SetLevelCommand : Command
{ {
public SetLevelCommand(CommandConfiguration config, ITranslationLookup translationLookup, ILogger<SetLevelCommand> logger) : base(config, translationLookup) public SetLevelCommand(CommandConfiguration config, ITranslationLookup translationLookup,
ILogger<SetLevelCommand> logger) : base(config, translationLookup)
{ {
Name = "setlevel"; Name = "setlevel";
Description = _translationLookup["COMMANDS_SETLEVEL_DESC"]; Description = _translationLookup["COMMANDS_SETLEVEL_DESC"];
@ -449,12 +473,12 @@ namespace SharedLibraryCore.Commands
RequiresTarget = true; RequiresTarget = true;
Arguments = new[] Arguments = new[]
{ {
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGS_PLAYER"], Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
Required = true Required = true
}, },
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGS_LEVEL"], Name = _translationLookup["COMMANDS_ARGS_LEVEL"],
Required = true Required = true
@ -465,28 +489,28 @@ namespace SharedLibraryCore.Commands
public override async Task ExecuteAsync(GameEvent gameEvent) public override async Task ExecuteAsync(GameEvent gameEvent)
{ {
Permission oldPerm = gameEvent.Target.Level; var oldPerm = gameEvent.Target.Level;
Permission newPerm = Utilities.MatchPermission(gameEvent.Data); var newPerm = Utilities.MatchPermission(gameEvent.Data);
bool allowMultiOwner = gameEvent.Owner.Manager.GetApplicationSettings().Configuration().EnableMultipleOwners; var allowMultiOwner = gameEvent.Owner.Manager.GetApplicationSettings().Configuration().EnableMultipleOwners;
bool steppedPrivileges = gameEvent.Owner.Manager.GetApplicationSettings().Configuration().EnableSteppedHierarchy; var steppedPrivileges =
gameEvent.Owner.Manager.GetApplicationSettings().Configuration().EnableSteppedHierarchy;
var targetClient = gameEvent.Target; var targetClient = gameEvent.Target;
// pre setup logic // pre setup logic
bool canPromoteSteppedPriv = gameEvent.Origin.Level > newPerm || gameEvent.Origin.Level == Permission.Owner; var canPromoteSteppedPriv = gameEvent.Origin.Level > newPerm || gameEvent.Origin.Level == Permission.Owner;
bool hasOwner = await gameEvent.Owner.Manager.GetClientService().GetOwnerCount() > 0; var hasOwner = await gameEvent.Owner.Manager.GetClientService().GetOwnerCount() > 0;
// trying to set self // trying to set self
if (gameEvent.Target == gameEvent.Origin) if (gameEvent.Target == gameEvent.Origin)
{ {
gameEvent.Origin.Tell(_translationLookup["COMMANDS_SETLEVEL_SELF"]); gameEvent.Origin.Tell(_translationLookup["COMMANDS_SETLEVEL_SELF"]);
return;
} }
// origin permission not high enough // origin permission not high enough
else if (gameEvent.Origin.Level < gameEvent.Target.Level) else if (gameEvent.Origin.Level < gameEvent.Target.Level)
{ {
gameEvent.Origin.Tell(_translationLookup["COMMANDS_SETLEVEL_PERMISSION"].FormatExt(gameEvent.Target.Name)); gameEvent.Origin.Tell(_translationLookup["COMMANDS_SETLEVEL_PERMISSION"]
return; .FormatExt(gameEvent.Target.Name));
} }
// trying to set owner without enabling multiple owners // trying to set owner without enabling multiple owners
@ -494,21 +518,20 @@ namespace SharedLibraryCore.Commands
{ {
// only one owner is allowed // only one owner is allowed
gameEvent.Origin.Tell(_translationLookup["COMMANDS_SETLEVEL_OWNER"]); gameEvent.Origin.Tell(_translationLookup["COMMANDS_SETLEVEL_OWNER"]);
return;
} }
// trying to set level when only owner is allowed to // trying to set level when only owner is allowed to
else if (gameEvent.Origin.Level < Permission.Owner && !steppedPrivileges) else if (gameEvent.Origin.Level < Permission.Owner && !steppedPrivileges)
{ {
// only the owner is allowed to set levels // only the owner is allowed to set levels
gameEvent.Origin.Tell($"{_translationLookup["COMMANDS_SETLEVEL_STEPPEDDISABLED"]} (Color::White){gameEvent.Target.Name}"); gameEvent.Origin.Tell(
return; $"{_translationLookup["COMMANDS_SETLEVEL_STEPPEDDISABLED"]} (Color::White){gameEvent.Target.Name}");
} }
else if (gameEvent.Target.Level == Permission.Flagged) else if (gameEvent.Target.Level == Permission.Flagged)
{ {
gameEvent.Origin.Tell(_translationLookup["COMMANDS_SETLEVEL_FLAGGED"].FormatExt(gameEvent.Target.Name + "(Color::White)")); gameEvent.Origin.Tell(_translationLookup["COMMANDS_SETLEVEL_FLAGGED"]
return; .FormatExt(gameEvent.Target.Name + "(Color::White)"));
} }
// stepped privilege is enabled, but the new level is too high // stepped privilege is enabled, but the new level is too high
@ -523,13 +546,16 @@ namespace SharedLibraryCore.Commands
// valid // valid
else if (newPerm > Permission.Banned) else if (newPerm > Permission.Banned)
{ {
targetClient = targetClient.ClientNumber < 0 ? targetClient = targetClient.ClientNumber < 0
gameEvent.Owner.Manager.GetActiveClients() ? gameEvent.Owner.Manager.GetActiveClients()
.FirstOrDefault(c => c.ClientId == targetClient?.ClientId) ?? targetClient : targetClient; .FirstOrDefault(c => c.ClientId == targetClient?.ClientId) ?? targetClient
: targetClient;
logger.LogDebug("Beginning set level of client {origin} to {newPermission}", gameEvent.Origin.ToString(), newPerm); logger.LogDebug("Beginning set level of client {origin} to {newPermission}",
gameEvent.Origin.ToString(), newPerm);
var result = await targetClient.SetLevel(newPerm, gameEvent.Origin).WaitAsync(Utilities.DefaultCommandTimeout, gameEvent.Owner.Manager.CancellationToken); var result = await targetClient.SetLevel(newPerm, gameEvent.Origin)
.WaitAsync(Utilities.DefaultCommandTimeout, gameEvent.Owner.Manager.CancellationToken);
if (result.Failed) if (result.Failed)
{ {
@ -547,6 +573,7 @@ namespace SharedLibraryCore.Commands
gameEvent.Origin.ToString(), gameEvent.Origin.ToString(),
result.FailReason); result.FailReason);
} }
gameEvent.Origin.Tell(_translationLookup["SERVER_ERROR_COMMAND_INGAME"]); gameEvent.Origin.Tell(_translationLookup["SERVER_ERROR_COMMAND_INGAME"]);
return; return;
} }
@ -559,9 +586,11 @@ namespace SharedLibraryCore.Commands
} }
// inform the origin that the client has been updated // inform the origin that the client has been updated
_ = newPerm < oldPerm ? _ = newPerm < oldPerm
gameEvent.Origin.Tell(_translationLookup["COMMANDS_SETLEVEL_DEMOTE_SUCCESS"].FormatExt(targetClient.Name)) : ? gameEvent.Origin.Tell(_translationLookup["COMMANDS_SETLEVEL_DEMOTE_SUCCESS"]
gameEvent.Origin.Tell(_translationLookup["COMMANDS_SETLEVEL_SUCCESS"].FormatExt(targetClient.Name)); .FormatExt(targetClient.Name))
: gameEvent.Origin.Tell(
_translationLookup["COMMANDS_SETLEVEL_SUCCESS"].FormatExt(targetClient.Name));
} }
// all other tests failed so it's invalid group // all other tests failed so it's invalid group
@ -577,7 +606,8 @@ namespace SharedLibraryCore.Commands
/// </summary> /// </summary>
public class MemoryUsageCommand : Command public class MemoryUsageCommand : Command
{ {
public MemoryUsageCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup) public MemoryUsageCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
translationLookup)
{ {
Name = "usage"; Name = "usage";
Description = _translationLookup["COMMANDS_USAGE_DESC"]; Description = _translationLookup["COMMANDS_USAGE_DESC"];
@ -588,7 +618,8 @@ namespace SharedLibraryCore.Commands
public override Task ExecuteAsync(GameEvent E) public override Task ExecuteAsync(GameEvent E)
{ {
E.Origin.Tell(_translationLookup["COMMANDS_USAGE_TEXT"].FormatExt(Math.Round(((System.Diagnostics.Process.GetCurrentProcess().PrivateMemorySize64 / 2048f) / 1200f), 1))); E.Origin.Tell(_translationLookup["COMMANDS_USAGE_TEXT"]
.FormatExt(Math.Round(Process.GetCurrentProcess().PrivateMemorySize64 / 2048f / 1200f, 1)));
return Task.CompletedTask; return Task.CompletedTask;
} }
} }
@ -598,7 +629,8 @@ namespace SharedLibraryCore.Commands
/// </summary> /// </summary>
public class UptimeCommand : Command public class UptimeCommand : Command
{ {
public UptimeCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup) public UptimeCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
translationLookup)
{ {
Name = "uptime"; Name = "uptime";
Description = _translationLookup["COMMANDS_UPTIME_DESC"]; Description = _translationLookup["COMMANDS_UPTIME_DESC"];
@ -609,7 +641,7 @@ namespace SharedLibraryCore.Commands
public override Task ExecuteAsync(GameEvent E) public override Task ExecuteAsync(GameEvent E)
{ {
var uptime = DateTime.Now - System.Diagnostics.Process.GetCurrentProcess().StartTime; var uptime = DateTime.Now - Process.GetCurrentProcess().StartTime;
var loc = _translationLookup; var loc = _translationLookup;
E.Origin.Tell(loc["COMMANDS_UPTIME_TEXT"].FormatExt(uptime.HumanizeForCurrentCulture(4))); E.Origin.Tell(loc["COMMANDS_UPTIME_TEXT"].FormatExt(uptime.HumanizeForCurrentCulture(4)));
return Task.CompletedTask; return Task.CompletedTask;
@ -622,7 +654,8 @@ namespace SharedLibraryCore.Commands
/// </summary> /// </summary>
public class LoadMapCommand : Command public class LoadMapCommand : Command
{ {
public LoadMapCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup) public LoadMapCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
translationLookup)
{ {
Name = "map"; Name = "map";
Description = _translationLookup["COMMANDS_MAP_DESC"]; Description = _translationLookup["COMMANDS_MAP_DESC"];
@ -631,7 +664,7 @@ namespace SharedLibraryCore.Commands
RequiresTarget = false; RequiresTarget = false;
Arguments = new[] Arguments = new[]
{ {
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGS_MAP"], Name = _translationLookup["COMMANDS_ARGS_MAP"],
Required = true Required = true
@ -641,15 +674,16 @@ namespace SharedLibraryCore.Commands
public override async Task ExecuteAsync(GameEvent E) public override async Task ExecuteAsync(GameEvent E)
{ {
string newMap = E.Data.Trim(); var newMap = E.Data.Trim();
int delay = E.Owner.Manager.GetApplicationSettings().Configuration().MapChangeDelaySeconds * 1000; var delay = E.Owner.Manager.GetApplicationSettings().Configuration().MapChangeDelaySeconds * 1000;
var foundMap = E.Owner.Maps.FirstOrDefault(_map => _map.Name.Equals(newMap, StringComparison.InvariantCultureIgnoreCase) || var foundMap = E.Owner.Maps.FirstOrDefault(_map =>
_map.Name.Equals(newMap, StringComparison.InvariantCultureIgnoreCase) ||
_map.Alias.Equals(newMap, StringComparison.InvariantCultureIgnoreCase)); _map.Alias.Equals(newMap, StringComparison.InvariantCultureIgnoreCase));
_ = foundMap == null ? _ = foundMap == null
E.Owner.Broadcast(_translationLookup["COMMANDS_MAP_UKN"].FormatExt(newMap)) : ? E.Owner.Broadcast(_translationLookup["COMMANDS_MAP_UKN"].FormatExt(newMap))
E.Owner.Broadcast(_translationLookup["COMMANDS_MAP_SUCCESS"].FormatExt(foundMap.Alias)); : E.Owner.Broadcast(_translationLookup["COMMANDS_MAP_SUCCESS"].FormatExt(foundMap.Alias));
await Task.Delay(delay); await Task.Delay(delay);
await E.Owner.LoadMap(foundMap?.Name ?? newMap); await E.Owner.LoadMap(foundMap?.Name ?? newMap);
@ -662,7 +696,8 @@ namespace SharedLibraryCore.Commands
/// </summary> /// </summary>
public class ListRulesCommands : Command public class ListRulesCommands : Command
{ {
public ListRulesCommands(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup) public ListRulesCommands(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
translationLookup)
{ {
Name = "rules"; Name = "rules";
Description = _translationLookup["COMMANDS_RULES_DESC"]; Description = _translationLookup["COMMANDS_RULES_DESC"];
@ -676,9 +711,9 @@ namespace SharedLibraryCore.Commands
if (E.Owner.Manager.GetApplicationSettings().Configuration().GlobalRules?.Length < 1 && if (E.Owner.Manager.GetApplicationSettings().Configuration().GlobalRules?.Length < 1 &&
E.Owner.ServerConfig.Rules?.Length < 1) E.Owner.ServerConfig.Rules?.Length < 1)
{ {
var _ = E.Message.IsBroadcastCommand(_config.BroadcastCommandPrefix) ? var _ = E.Message.IsBroadcastCommand(_config.BroadcastCommandPrefix)
E.Owner.Broadcast(_translationLookup["COMMANDS_RULES_NONE"]) : ? E.Owner.Broadcast(_translationLookup["COMMANDS_RULES_NONE"])
E.Origin.Tell(_translationLookup["COMMANDS_RULES_NONE"]); : E.Origin.Tell(_translationLookup["COMMANDS_RULES_NONE"]);
} }
else else
@ -706,13 +741,13 @@ namespace SharedLibraryCore.Commands
} }
/// <summary> /// <summary>
/// Flag given client for specified reason /// Flag given client for specified reason
/// </summary> /// </summary>
public class FlagClientCommand : Command public class FlagClientCommand : Command
{ {
public FlagClientCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup) public FlagClientCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
translationLookup)
{ {
Name = "flag"; Name = "flag";
Description = _translationLookup["COMMANDS_FLAG_DESC"]; Description = _translationLookup["COMMANDS_FLAG_DESC"];
@ -721,12 +756,12 @@ namespace SharedLibraryCore.Commands
RequiresTarget = true; RequiresTarget = true;
Arguments = new[] Arguments = new[]
{ {
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGS_PLAYER"], Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
Required = true Required = true
}, },
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGS_REASON"], Name = _translationLookup["COMMANDS_ARGS_REASON"],
Required = true Required = true
@ -736,7 +771,8 @@ namespace SharedLibraryCore.Commands
public override async Task ExecuteAsync(GameEvent E) public override async Task ExecuteAsync(GameEvent E)
{ {
switch ((await E.Target.Flag(E.Data, E.Origin).WaitAsync(Utilities.DefaultCommandTimeout, E.Owner.Manager.CancellationToken)).FailReason) switch ((await E.Target.Flag(E.Data, E.Origin)
.WaitAsync(Utilities.DefaultCommandTimeout, E.Owner.Manager.CancellationToken)).FailReason)
{ {
case GameEvent.EventFailReason.Permission: case GameEvent.EventFailReason.Permission:
E.Origin.Tell(_translationLookup["COMMANDS_FLAG_FAIL"].FormatExt(E.Target.Name)); E.Origin.Tell(_translationLookup["COMMANDS_FLAG_FAIL"].FormatExt(E.Target.Name));
@ -759,7 +795,8 @@ namespace SharedLibraryCore.Commands
/// </summary> /// </summary>
public class UnflagClientCommand : Command public class UnflagClientCommand : Command
{ {
public UnflagClientCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup) public UnflagClientCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
translationLookup)
{ {
Name = "unflag"; Name = "unflag";
Description = _translationLookup["COMMANDS_UNFLAG_DESC"]; Description = _translationLookup["COMMANDS_UNFLAG_DESC"];
@ -768,12 +805,12 @@ namespace SharedLibraryCore.Commands
RequiresTarget = true; RequiresTarget = true;
Arguments = new[] Arguments = new[]
{ {
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGS_PLAYER"], Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
Required = true Required = true
}, },
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGS_REASON"], Name = _translationLookup["COMMANDS_ARGS_REASON"],
Required = true Required = true
@ -783,7 +820,8 @@ namespace SharedLibraryCore.Commands
public override async Task ExecuteAsync(GameEvent E) public override async Task ExecuteAsync(GameEvent E)
{ {
switch ((await E.Target.Unflag(E.Data, E.Origin).WaitAsync(Utilities.DefaultCommandTimeout, E.Owner.Manager.CancellationToken)).FailReason) switch ((await E.Target.Unflag(E.Data, E.Origin)
.WaitAsync(Utilities.DefaultCommandTimeout, E.Owner.Manager.CancellationToken)).FailReason)
{ {
case GameEvent.EventFailReason.None: case GameEvent.EventFailReason.None:
E.Origin.Tell(_translationLookup["COMMANDS_FLAG_UNFLAG"].FormatExt(E.Target.Name)); E.Origin.Tell(_translationLookup["COMMANDS_FLAG_UNFLAG"].FormatExt(E.Target.Name));
@ -806,12 +844,13 @@ namespace SharedLibraryCore.Commands
/// </summary> /// </summary>
public class MaskCommand : Command public class MaskCommand : Command
{ {
public MaskCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup) public MaskCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
translationLookup)
{ {
Name = "mask"; Name = "mask";
Description = _translationLookup["COMMANDS_MASK_DESC"]; Description = _translationLookup["COMMANDS_MASK_DESC"];
Alias = "hide"; Alias = "hide";
Permission = EFClient.Permission.Moderator; Permission = Permission.Moderator;
RequiresTarget = false; RequiresTarget = false;
} }
@ -837,7 +876,8 @@ namespace SharedLibraryCore.Commands
/// </summary> /// </summary>
public class ListBanInfoCommand : Command public class ListBanInfoCommand : Command
{ {
public ListBanInfoCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup) public ListBanInfoCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
translationLookup)
{ {
Name = "baninfo"; Name = "baninfo";
Description = _translationLookup["COMMANDS_BANINFO_DESC"]; Description = _translationLookup["COMMANDS_BANINFO_DESC"];
@ -846,7 +886,7 @@ namespace SharedLibraryCore.Commands
RequiresTarget = true; RequiresTarget = true;
Arguments = new[] Arguments = new[]
{ {
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGS_PLAYER"], Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
Required = true Required = true
@ -856,7 +896,8 @@ namespace SharedLibraryCore.Commands
public override async Task ExecuteAsync(GameEvent E) public override async Task ExecuteAsync(GameEvent E)
{ {
var existingPenalties = await E.Owner.Manager.GetPenaltyService().GetActivePenaltiesAsync(E.Target.AliasLinkId, E.Target.IPAddress); var existingPenalties = await E.Owner.Manager.GetPenaltyService()
.GetActivePenaltiesAsync(E.Target.AliasLinkId, E.Target.IPAddress);
var penalty = existingPenalties.FirstOrDefault(b => b.Type > EFPenalty.PenaltyType.Kick); var penalty = existingPenalties.FirstOrDefault(b => b.Type > EFPenalty.PenaltyType.Kick);
if (penalty == null) if (penalty == null)
@ -872,8 +913,9 @@ namespace SharedLibraryCore.Commands
else else
{ {
string remainingTime = (penalty.Expires.Value - DateTime.UtcNow).HumanizeForCurrentCulture(); var remainingTime = (penalty.Expires.Value - DateTime.UtcNow).HumanizeForCurrentCulture();
E.Origin.Tell(_translationLookup["COMMANDS_BANINFO_TB_SUCCESS"].FormatExt(E.Target.Name, penalty.Offense, remainingTime)); E.Origin.Tell(_translationLookup["COMMANDS_BANINFO_TB_SUCCESS"]
.FormatExt(E.Target.Name, penalty.Offense, remainingTime));
} }
} }
} }
@ -883,7 +925,8 @@ namespace SharedLibraryCore.Commands
/// </summary> /// </summary>
public class ExecuteRConCommand : Command public class ExecuteRConCommand : Command
{ {
public ExecuteRConCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup) public ExecuteRConCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
translationLookup)
{ {
Name = "rcon"; Name = "rcon";
Description = _translationLookup["COMMANDS_RCON_DESC"]; Description = _translationLookup["COMMANDS_RCON_DESC"];
@ -892,7 +935,7 @@ namespace SharedLibraryCore.Commands
RequiresTarget = false; RequiresTarget = false;
Arguments = new[] Arguments = new[]
{ {
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGS_COMMANDS"], Name = _translationLookup["COMMANDS_ARGS_COMMANDS"],
Required = true Required = true
@ -904,9 +947,7 @@ namespace SharedLibraryCore.Commands
{ {
var response = await E.Owner.ExecuteCommandAsync(E.Data.Trim()); var response = await E.Owner.ExecuteCommandAsync(E.Data.Trim());
foreach (var item in response) foreach (var item in response)
{
E.Origin.Tell(item); E.Origin.Tell(item);
}
if (response.Length == 0) if (response.Length == 0)
{ {
@ -920,7 +961,8 @@ namespace SharedLibraryCore.Commands
/// </summary> /// </summary>
public class ListExternalIPCommand : Command public class ListExternalIPCommand : Command
{ {
public ListExternalIPCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup) public ListExternalIPCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
translationLookup)
{ {
Name = "getexternalip"; Name = "getexternalip";
Description = _translationLookup["COMMANDS_IP_DESC"]; Description = _translationLookup["COMMANDS_IP_DESC"];
@ -954,7 +996,7 @@ namespace SharedLibraryCore.Commands
_contextFactory = contextFactory; _contextFactory = contextFactory;
Arguments = new[] Arguments = new[]
{ {
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGS_INACTIVE"], Name = _translationLookup["COMMANDS_ARGS_INACTIVE"],
Required = false Required = false
@ -964,7 +1006,7 @@ namespace SharedLibraryCore.Commands
public override async Task ExecuteAsync(GameEvent E) public override async Task ExecuteAsync(GameEvent E)
{ {
int inactiveDays = 30; var inactiveDays = 30;
try try
{ {
@ -1007,7 +1049,8 @@ namespace SharedLibraryCore.Commands
/// </summary> /// </summary>
public class SetPasswordCommand : Command public class SetPasswordCommand : Command
{ {
public SetPasswordCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup) public SetPasswordCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
translationLookup)
{ {
Name = "setpassword"; Name = "setpassword";
Description = _translationLookup["COMMANDS_SETPASSWORD_DESC"]; Description = _translationLookup["COMMANDS_SETPASSWORD_DESC"];
@ -1017,7 +1060,7 @@ namespace SharedLibraryCore.Commands
AllowImpersonation = true; AllowImpersonation = true;
Arguments = new[] Arguments = new[]
{ {
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGS_PASSWORD"], Name = _translationLookup["COMMANDS_ARGS_PASSWORD"],
Required = true Required = true
@ -1033,7 +1076,7 @@ namespace SharedLibraryCore.Commands
return; return;
} }
string[] hashedPassword = Helpers.Hashing.Hash(E.Data); var hashedPassword = Hashing.Hash(E.Data);
E.Origin.Password = hashedPassword[0]; E.Origin.Password = hashedPassword[0];
E.Origin.PasswordSalt = hashedPassword[1]; E.Origin.PasswordSalt = hashedPassword[1];
@ -1048,7 +1091,8 @@ namespace SharedLibraryCore.Commands
/// </summary> /// </summary>
public class GetClientPingCommand : Command public class GetClientPingCommand : Command
{ {
public GetClientPingCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup) public GetClientPingCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
translationLookup)
{ {
Name = "ping"; Name = "ping";
Description = _translationLookup["COMMANDS_PING_DESC"]; Description = _translationLookup["COMMANDS_PING_DESC"];
@ -1057,7 +1101,7 @@ namespace SharedLibraryCore.Commands
RequiresTarget = false; RequiresTarget = false;
Arguments = new[] Arguments = new[]
{ {
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGS_PLAYER"], Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
Required = false Required = false
@ -1092,7 +1136,8 @@ namespace SharedLibraryCore.Commands
{ {
private readonly IMetaService _metaService; private readonly IMetaService _metaService;
public SetGravatarCommand(CommandConfiguration config, ITranslationLookup translationLookup, IMetaService metaService) : base(config, translationLookup) public SetGravatarCommand(CommandConfiguration config, ITranslationLookup translationLookup,
IMetaService metaService) : base(config, translationLookup)
{ {
Name = "setgravatar"; Name = "setgravatar";
Description = _translationLookup["COMMANDS_GRAVATAR_DESC"]; Description = _translationLookup["COMMANDS_GRAVATAR_DESC"];
@ -1101,7 +1146,7 @@ namespace SharedLibraryCore.Commands
RequiresTarget = false; RequiresTarget = false;
Arguments = new[] Arguments = new[]
{ {
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGS_GRAVATAR"], Name = _translationLookup["COMMANDS_ARGS_GRAVATAR"],
Required = true Required = true
@ -1115,7 +1160,8 @@ namespace SharedLibraryCore.Commands
{ {
using (var md5 = MD5.Create()) using (var md5 = MD5.Create())
{ {
string gravatarEmail = string.Concat(md5.ComputeHash(E.Data.ToLower().Select(d => Convert.ToByte(d)).ToArray()) var gravatarEmail = string.Concat(md5
.ComputeHash(E.Data.ToLower().Select(d => Convert.ToByte(d)).ToArray())
.Select(h => h.ToString("x2"))); .Select(h => h.ToString("x2")));
await _metaService.AddPersistentMeta("GravatarEmail", gravatarEmail, E.Origin); await _metaService.AddPersistentMeta("GravatarEmail", gravatarEmail, E.Origin);
} }
@ -1129,19 +1175,22 @@ namespace SharedLibraryCore.Commands
/// </summary> /// </summary>
public class NextMapCommand : Command public class NextMapCommand : Command
{ {
public NextMapCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup) public NextMapCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
translationLookup)
{ {
Name = "nextmap"; Name = "nextmap";
Description = _translationLookup["COMMANDS_NEXTMAP_DESC"]; Description = _translationLookup["COMMANDS_NEXTMAP_DESC"];
Alias = "nm"; Alias = "nm";
Permission = EFClient.Permission.User; Permission = Permission.User;
RequiresTarget = false; RequiresTarget = false;
} }
public static async Task<string> GetNextMap(Server s, ITranslationLookup lookup) public static async Task<string> GetNextMap(Server s, ITranslationLookup lookup)
{ {
string mapRotation = (await s.GetDvarAsync<string>("sv_mapRotation")).Value?.ToLower() ?? ""; var mapRotation = (await s.GetDvarAsync<string>("sv_mapRotation")).Value?.ToLower() ?? "";
var regexMatches = Regex.Matches(mapRotation, @"((?:gametype|exec) +(?:([a-z]{1,4})(?:.cfg)?))? *map ([a-z|_|\d]+)", RegexOptions.IgnoreCase).ToList(); var regexMatches = Regex.Matches(mapRotation,
@"((?:gametype|exec) +(?:([a-z]{1,4})(?:.cfg)?))? *map ([a-z|_|\d]+)", RegexOptions.IgnoreCase)
.ToList();
// find the current map in the rotation // find the current map in the rotation
var currentMap = regexMatches.Where(m => m.Groups[3].ToString() == s.CurrentMap.Name); var currentMap = regexMatches.Where(m => m.Groups[3].ToString() == s.CurrentMap.Name);
@ -1151,7 +1200,8 @@ namespace SharedLibraryCore.Commands
// no maprotation at all // no maprotation at all
if (regexMatches.Count() == 0) if (regexMatches.Count() == 0)
{ {
return lookup["COMMANDS_NEXTMAP_SUCCESS"].FormatExt(s.CurrentMap.Alias, Utilities.GetLocalizedGametype(s.Gametype)); return lookup["COMMANDS_NEXTMAP_SUCCESS"]
.FormatExt(s.CurrentMap.Alias, Utilities.GetLocalizedGametype(s.Gametype));
} }
// the current map is not in rotation // the current map is not in rotation
@ -1161,7 +1211,8 @@ namespace SharedLibraryCore.Commands
} }
// there's duplicate maps in rotation // there's duplicate maps in rotation
else if (currentMap.Count() > 1)
if (currentMap.Count() > 1)
{ {
// gametype has been manually specified // gametype has been manually specified
var duplicateMaps = currentMap.Where(m => !string.IsNullOrEmpty(m.Groups[1].ToString())); var duplicateMaps = currentMap.Where(m => !string.IsNullOrEmpty(m.Groups[1].ToString()));
@ -1176,16 +1227,17 @@ namespace SharedLibraryCore.Commands
} }
// if the current map is the last map, the next map is the first map // if the current map is the last map, the next map is the first map
var nextMapMatch = currentMap.First().Index != lastMap.Index ? var nextMapMatch = currentMap.First().Index != lastMap.Index
regexMatches[regexMatches.IndexOf(currentMap.First()) + 1] : ? regexMatches[regexMatches.IndexOf(currentMap.First()) + 1]
regexMatches.First(); : regexMatches.First();
string nextMapName = nextMapMatch.Groups[3].ToString(); var nextMapName = nextMapMatch.Groups[3].ToString();
nextMap = s.Maps.FirstOrDefault(m => m.Name == nextMapMatch.Groups[3].ToString()) ?? new Map() { Alias = nextMapName, Name = nextMapName }; nextMap = s.Maps.FirstOrDefault(m => m.Name == nextMapMatch.Groups[3].ToString()) ??
string nextGametype = nextMapMatch.Groups[2].ToString().Length == 0 ? new Map { Alias = nextMapName, Name = nextMapName };
Utilities.GetLocalizedGametype(s.Gametype) : var nextGametype = nextMapMatch.Groups[2].ToString().Length == 0
Utilities.GetLocalizedGametype(nextMapMatch.Groups[2].ToString()); ? Utilities.GetLocalizedGametype(s.Gametype)
: Utilities.GetLocalizedGametype(nextMapMatch.Groups[2].ToString());
return lookup["COMMANDS_NEXTMAP_SUCCESS"].FormatExt(nextMap.Alias, nextGametype); return lookup["COMMANDS_NEXTMAP_SUCCESS"].FormatExt(nextMap.Alias, nextGametype);
} }

20
SharedLibraryCore/Commands/PrivateMessageAdminsCommand.cs
View File

@ -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 System.Threading.Tasks;
using Data.Models.Client;
using SharedLibraryCore.Configuration;
using SharedLibraryCore.Interfaces;
using static SharedLibraryCore.Server; using static SharedLibraryCore.Server;
namespace SharedLibraryCore.Commands namespace SharedLibraryCore.Commands
{ {
public class PrivateMessageAdminsCommand : Command public class PrivateMessageAdminsCommand : Command
{ {
public PrivateMessageAdminsCommand(CommandConfiguration config, ITranslationLookup lookup) : base(config, lookup) public PrivateMessageAdminsCommand(CommandConfiguration config, ITranslationLookup lookup) : base(config,
lookup)
{ {
Name = "privatemessageadmin"; Name = "privatemessageadmin";
Description = lookup["COMMANDS_PMADMINS_DESC"]; Description = lookup["COMMANDS_PMADMINS_DESC"];
@ -21,12 +21,14 @@ namespace SharedLibraryCore.Commands
public override Task ExecuteAsync(GameEvent E) 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) 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; return Task.CompletedTask;
} }

13
SharedLibraryCore/Commands/RemoveClientTagCommand.cs
View File

@ -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;
using Data.Models.Client;
using SharedLibraryCore.Configuration;
using SharedLibraryCore.Interfaces;
namespace SharedLibraryCore.Commands namespace SharedLibraryCore.Commands
{ {
@ -10,7 +10,8 @@ namespace SharedLibraryCore.Commands
{ {
private readonly IMetaService _metaService; 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"; Name = "removeclienttag";
Description = layout["COMMANDS_REMOVE_CLIENT_TAG_DESC"]; Description = layout["COMMANDS_REMOVE_CLIENT_TAG_DESC"];
@ -19,7 +20,7 @@ namespace SharedLibraryCore.Commands
RequiresTarget = false; RequiresTarget = false;
Arguments = new[] Arguments = new[]
{ {
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGUMENT_TAG"], Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
Required = true Required = true

9
SharedLibraryCore/Commands/RequestTokenCommand.cs
View File

@ -1,7 +1,7 @@
using SharedLibraryCore.Configuration; using System.Threading.Tasks;
using SharedLibraryCore.Database.Models; using Data.Models.Client;
using SharedLibraryCore.Configuration;
using SharedLibraryCore.Interfaces; using SharedLibraryCore.Interfaces;
using System.Threading.Tasks;
namespace SharedLibraryCore.Commands namespace SharedLibraryCore.Commands
{ {
@ -22,7 +22,8 @@ namespace SharedLibraryCore.Commands
public override Task ExecuteAsync(GameEvent E) public override Task ExecuteAsync(GameEvent E)
{ {
var state = E.Owner.Manager.TokenAuthenticator.GenerateNextToken(E.Origin.NetworkId); 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; return Task.CompletedTask;
} }

20
SharedLibraryCore/Commands/RunAsCommand.cs
View File

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

13
SharedLibraryCore/Commands/SetClientTagCommand.cs
View File

@ -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 System.Threading.Tasks;
using Data.Models; using Data.Models;
using Data.Models.Client;
using SharedLibraryCore.Configuration;
using SharedLibraryCore.Interfaces;
namespace SharedLibraryCore.Commands namespace SharedLibraryCore.Commands
{ {
@ -12,7 +12,8 @@ namespace SharedLibraryCore.Commands
private readonly IMetaService _metaService; 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"; Name = "setclienttag";
Description = layout["COMMANDS_SET_CLIENT_TAG_DESC"]; Description = layout["COMMANDS_SET_CLIENT_TAG_DESC"];
@ -21,7 +22,7 @@ namespace SharedLibraryCore.Commands
RequiresTarget = true; RequiresTarget = true;
Arguments = new[] Arguments = new[]
{ {
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGUMENT_TAG"], Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
Required = true Required = true

6
SharedLibraryCore/Commands/UnlinkClientCommand.cs
View File

@ -1,7 +1,7 @@
using SharedLibraryCore.Configuration; using System.Threading.Tasks;
using SharedLibraryCore.Database.Models; using Data.Models.Client;
using SharedLibraryCore.Configuration;
using SharedLibraryCore.Interfaces; using SharedLibraryCore.Interfaces;
using System.Threading.Tasks;
namespace SharedLibraryCore.Commands namespace SharedLibraryCore.Commands
{ {

14
SharedLibraryCore/Commands/UnsetClientTagCommand.cs
View File

@ -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;
using Data.Models.Client;
using SharedLibraryCore.Configuration;
using SharedLibraryCore.Interfaces;
namespace SharedLibraryCore.Commands namespace SharedLibraryCore.Commands
{ {
@ -12,7 +11,8 @@ namespace SharedLibraryCore.Commands
private readonly IMetaService _metaService; 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"; Name = "unsetclienttag";
Description = layout["COMMANDS_UNSET_CLIENT_TAG_DESC"]; Description = layout["COMMANDS_UNSET_CLIENT_TAG_DESC"];
@ -21,7 +21,7 @@ namespace SharedLibraryCore.Commands
RequiresTarget = true; RequiresTarget = true;
Arguments = new[] Arguments = new[]
{ {
new CommandArgument() new CommandArgument
{ {
Name = _translationLookup["COMMANDS_ARGUMENT_TAG"], Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
Required = true Required = true

64
SharedLibraryCore/Configuration/ApplicationConfiguration.cs
View File

@ -1,10 +1,10 @@
using SharedLibraryCore.Configuration.Attributes; using System;
using SharedLibraryCore.Interfaces;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.Linq; using System.Linq;
using Newtonsoft.Json; using Newtonsoft.Json;
using SharedLibraryCore.Configuration.Attributes;
using SharedLibraryCore.Interfaces;
using static Data.Models.Client.EFClient; using static Data.Models.Client.EFClient;
namespace SharedLibraryCore.Configuration namespace SharedLibraryCore.Configuration
@ -12,7 +12,8 @@ namespace SharedLibraryCore.Configuration
public class ApplicationConfiguration : IBaseConfiguration public class ApplicationConfiguration : IBaseConfiguration
{ {
[ConfigurationIgnore] [ConfigurationIgnore]
public CommunityInformationConfiguration CommunityInformation { get; set; } = new CommunityInformationConfiguration(); public CommunityInformationConfiguration CommunityInformation { get; set; } =
new CommunityInformationConfiguration();
[LocalizedDisplayName("SETUP_ENABLE_WEBFRONT")] [LocalizedDisplayName("SETUP_ENABLE_WEBFRONT")]
[ConfigurationLinked("WebfrontBindUrl", "ManualWebfrontUrl", "WebfrontPrimaryColor", "WebfrontSecondaryColor", [ConfigurationLinked("WebfrontBindUrl", "ManualWebfrontUrl", "WebfrontPrimaryColor", "WebfrontSecondaryColor",
@ -38,8 +39,7 @@ namespace SharedLibraryCore.Configuration
[LocalizedDisplayName("WEBFRONT_CONFIGURATION_CUSTOM_BRANDING")] [LocalizedDisplayName("WEBFRONT_CONFIGURATION_CUSTOM_BRANDING")]
public string WebfrontCustomBranding { get; set; } 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")] [LocalizedDisplayName("SETUP_ENABLE_MULTIOWN")]
public bool EnableMultipleOwners { get; set; } public bool EnableMultipleOwners { get; set; }
@ -116,8 +116,7 @@ namespace SharedLibraryCore.Configuration
[LocalizedDisplayName("WEBFRONT_CONFIGURATION_ENABLE_COLOR_CODES")] [LocalizedDisplayName("WEBFRONT_CONFIGURATION_ENABLE_COLOR_CODES")]
public bool EnableColorCodes { get; set; } public bool EnableColorCodes { get; set; }
[ConfigurationIgnore] [ConfigurationIgnore] public string IngameAccentColorKey { get; set; } = "Cyan";
public string IngameAccentColorKey { get; set; } = "Cyan";
[LocalizedDisplayName("WEBFRONT_CONFIGURATION_AUTOMESSAGE_PERIOD")] [LocalizedDisplayName("WEBFRONT_CONFIGURATION_AUTOMESSAGE_PERIOD")]
public int AutoMessagePeriod { get; set; } public int AutoMessagePeriod { get; set; }
@ -135,7 +134,8 @@ namespace SharedLibraryCore.Configuration
public int MapChangeDelaySeconds { get; set; } = 5; public int MapChangeDelaySeconds { get; set; } = 5;
[LocalizedDisplayName("WEBFRONT_CONFIGURATION_BAN_DURATIONS")] [LocalizedDisplayName("WEBFRONT_CONFIGURATION_BAN_DURATIONS")]
public TimeSpan[] BanDurations { get; set; } = { public TimeSpan[] BanDurations { get; set; } =
{
TimeSpan.FromHours(1), TimeSpan.FromHours(1),
TimeSpan.FromHours(6), TimeSpan.FromHours(6),
TimeSpan.FromDays(1), TimeSpan.FromDays(1),
@ -147,18 +147,16 @@ namespace SharedLibraryCore.Configuration
[ConfigurationIgnore] [ConfigurationIgnore]
[LocalizedDisplayName("WEBFRONT_CONFIGURATION_PRESET_BAN_REASONS")] [LocalizedDisplayName("WEBFRONT_CONFIGURATION_PRESET_BAN_REASONS")]
public Dictionary<string, string> PresetPenaltyReasons { get; set; } = new Dictionary<string, string> 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; } 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; public int ServerConnectionAttempts { get; set; } = 6;
@ -167,16 +165,20 @@ namespace SharedLibraryCore.Configuration
.GetValues(typeof(Permission)) .GetValues(typeof(Permission))
.Cast<Permission>() .Cast<Permission>()
.ToDictionary(perm => perm, perm => perm.ToString()); .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 int MinimumNameLength { get; set; } = 3;
[ConfigurationIgnore] public string Id { get; set; } [ConfigurationIgnore] public string Id { get; set; }
[ConfigurationIgnore] public string SubscriptionId { get; set; } [ConfigurationIgnore] public string SubscriptionId { get; set; }
[Obsolete("Moved to DefaultSettings")] [Obsolete("Moved to DefaultSettings")]
[ConfigurationIgnore] public MapConfiguration[] Maps { get; set; } [ConfigurationIgnore]
public MapConfiguration[] Maps { get; set; }
[Obsolete("Moved to DefaultSettings")] [Obsolete("Moved to DefaultSettings")]
[ConfigurationIgnore] public QuickMessageConfiguration[] QuickMessages { get; set; } [ConfigurationIgnore]
public QuickMessageConfiguration[] QuickMessages { get; set; }
[ConfigurationIgnore] [ConfigurationIgnore]
[JsonIgnore] [JsonIgnore]
@ -192,30 +194,30 @@ namespace SharedLibraryCore.Configuration
var loc = Utilities.CurrentLocalization.LocalizationIndex; var loc = Utilities.CurrentLocalization.LocalizationIndex;
Id = Guid.NewGuid().ToString(); 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) if (useCustomParserEncoding)
{ {
CustomParserEncoding = Utilities.PromptString(loc["SETUP_ENCODING_STRING"]); CustomParserEncoding = loc["SETUP_ENCODING_STRING"].PromptString();
} }
WebfrontBindUrl = "http://0.0.0.0:1624"; WebfrontBindUrl = "http://0.0.0.0:1624";
if (EnableCustomSayName) 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) 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; RConPollRate = 5000;

4
SharedLibraryCore/Configuration/Attributes/ConfigurationIgnore.cs
View File

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

6
SharedLibraryCore/Configuration/Attributes/ConfigurationLinked.cs
View File

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

4
SharedLibraryCore/Configuration/Attributes/ConfigurationOptional.cs
View File

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

8
SharedLibraryCore/Configuration/Attributes/LocalizedDisplayName.cs
View File

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

12
SharedLibraryCore/Configuration/CommandConfiguration.cs
View File

@ -1,7 +1,7 @@
using SharedLibraryCore.Interfaces; using System;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using SharedLibraryCore.Interfaces;
namespace SharedLibraryCore.Configuration namespace SharedLibraryCore.Configuration
{ {
@ -13,7 +13,8 @@ namespace SharedLibraryCore.Configuration
/// <summary> /// <summary>
/// Dict of command class names mapped to configurable properties /// Dict of command class names mapped to configurable properties
/// </summary> /// </summary>
public Dictionary<string, CommandProperties> Commands { get; set; } = new Dictionary<string, CommandProperties>(); public Dictionary<string, CommandProperties> Commands { get; set; } =
new Dictionary<string, CommandProperties>();
/// <summary> /// <summary>
/// prefix indicated the chat message is a command /// prefix indicated the chat message is a command
@ -32,6 +33,9 @@ namespace SharedLibraryCore.Configuration
throw new NotImplementedException(); throw new NotImplementedException();
} }
public string Name() => nameof(CommandConfiguration); public string Name()
{
return nameof(CommandConfiguration);
}
} }
} }

6
SharedLibraryCore/Configuration/CommunityInformationConfiguration.cs
View File

@ -1,12 +1,12 @@
using System.Linq; namespace SharedLibraryCore.Configuration
namespace SharedLibraryCore.Configuration
{ {
public class CommunityInformationConfiguration public class CommunityInformationConfiguration
{ {
public string Name { get; set; } = "IW4MAdmin - Configure In IW4MAdminSettings.json"; public string Name { get; set; } = "IW4MAdmin - Configure In IW4MAdminSettings.json";
public string Description { get; set; } = 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."; "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 bool EnableBanner { get; set; } = true;
public SocialAccountConfiguration[] SocialAccounts { get; set; } = public SocialAccountConfiguration[] SocialAccounts { get; set; } =

12
SharedLibraryCore/Configuration/DefaultSettings.cs
View File

@ -8,12 +8,18 @@ namespace SharedLibraryCore.Configuration
public string[] GlobalRules { get; set; } public string[] GlobalRules { get; set; }
public MapConfiguration[] Maps { get; set; } public MapConfiguration[] Maps { get; set; }
public GametypeConfiguration[] Gametypes { get; set; } public GametypeConfiguration[] Gametypes { get; set; }
public QuickMessageConfiguration[] QuickMessages {get; set;} public QuickMessageConfiguration[] QuickMessages { get; set; }
public string[] DisallowedClientNames { get; set; } public string[] DisallowedClientNames { get; set; }
public GameStringConfiguration GameStrings { 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";
}
} }
} }

17
SharedLibraryCore/Configuration/Extensions/ConfigurationExtensions.cs
View File

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

4
SharedLibraryCore/Configuration/QuickMessageConfiguration.cs
View File

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

157
SharedLibraryCore/Configuration/ServerConfiguration.cs
View File

@ -1,14 +1,24 @@
using SharedLibraryCore.Configuration.Attributes; using System;
using SharedLibraryCore.Interfaces;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using SharedLibraryCore.Configuration.Attributes;
using SharedLibraryCore.Configuration.Extensions; using SharedLibraryCore.Configuration.Extensions;
using SharedLibraryCore.Interfaces;
namespace SharedLibraryCore.Configuration namespace SharedLibraryCore.Configuration
{ {
public class ServerConfiguration : IBaseConfiguration 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")] [LocalizedDisplayName("WEBFRONT_CONFIGURATION_SERVER_IP")]
public string IPAddress { get; set; } public string IPAddress { get; set; }
@ -45,14 +55,74 @@ namespace SharedLibraryCore.Configuration
[ConfigurationOptional] [ConfigurationOptional]
public string CustomHostname { get; set; } 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]; AutoMessages = new string[0];
Rules = new string[0];
ManualLogPath = null;
return this;
}
public string Name()
{
return "ServerConfiguration";
} }
public void AddRConParser(IRConParser parser) public void AddRConParser(IRConParser parser)
@ -88,74 +158,5 @@ namespace SharedLibraryCore.Configuration
Console.WriteLine(loc["SETUP_SERVER_NO_LOG"]); Console.WriteLine(loc["SETUP_SERVER_NO_LOG"]);
ManualLogPath = loc["SETUP_SERVER_LOG_PATH"].PromptString(); 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";
}
} }
} }

7
SharedLibraryCore/Configuration/Validation/ApplicationConfigurationValidator.cs
View File

@ -1,6 +1,7 @@
using FluentValidation; using System;
using System;
using System.Linq; using System.Linq;
using System.Net;
using FluentValidation;
namespace SharedLibraryCore.Configuration.Validation namespace SharedLibraryCore.Configuration.Validation
{ {
@ -35,7 +36,7 @@ namespace SharedLibraryCore.Configuration.Validation
.When(_app => _app.EnableWebfrontConnectionWhitelist); .When(_app => _app.EnableWebfrontConnectionWhitelist);
RuleForEach(_app => _app.WebfrontConnectionWhitelist) RuleForEach(_app => _app.WebfrontConnectionWhitelist)
.Must(_address => System.Net.IPAddress.TryParse(_address, out _)); .Must(_address => IPAddress.TryParse(_address, out _));
RuleFor(_app => _app.CustomLocale) RuleFor(_app => _app.CustomLocale)
.NotEmpty() .NotEmpty()

1
SharedLibraryCore/Configuration/Validation/ServerConfigurationValidator.cs
View File

@ -1,5 +1,4 @@
using FluentValidation; using FluentValidation;
using System.Net;
namespace SharedLibraryCore.Configuration.Validation namespace SharedLibraryCore.Configuration.Validation
{ {

18
SharedLibraryCore/Dtos/AuditInfo.cs
View File

@ -7,6 +7,10 @@ namespace SharedLibraryCore.Dtos
/// </summary> /// </summary>
public class AuditInfo public class AuditInfo
{ {
private string newValue;
private string oldValue;
/// <summary> /// <summary>
/// name of the origin entity /// name of the origin entity
/// </summary> /// </summary>
@ -42,16 +46,22 @@ namespace SharedLibraryCore.Dtos
/// </summary> /// </summary>
public string Data { get; set; } public string Data { get; set; }
private string oldValue;
/// <summary> /// <summary>
/// previous value /// previous value
/// </summary> /// </summary>
public string OldValue { get => oldValue ?? "--"; set => oldValue = value; } public string OldValue
{
get => oldValue ?? "--";
set => oldValue = value;
}
private string newValue;
/// <summary> /// <summary>
/// new value /// new value
/// </summary> /// </summary>
public string NewValue { get => newValue ?? "--"; set => newValue = value; } public string NewValue
{
get => newValue ?? "--";
set => newValue = value;
}
} }
} }

6
SharedLibraryCore/Dtos/ClientInfo.cs
View File

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

8
SharedLibraryCore/Dtos/CommandResponseInfo.cs
View File

@ -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 public class CommandResponseInfo
{ {

6
SharedLibraryCore/Dtos/EntityInfo.cs
View File

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

3
SharedLibraryCore/Dtos/EventInfo.cs
View File

@ -1,5 +1,4 @@
using System; using System;
using static SharedLibraryCore.GameEvent;
namespace SharedLibraryCore.Dtos namespace SharedLibraryCore.Dtos
{ {
@ -15,6 +14,6 @@ namespace SharedLibraryCore.Dtos
public EntityInfo OwnerEntity { get; set; } public EntityInfo OwnerEntity { get; set; }
public DateTime EventTime { get; set; } public DateTime EventTime { get; set; }
public string ExtraInfo { get; set; } public string ExtraInfo { get; set; }
public string Id { get; private set; } = Guid.NewGuid().ToString(); public string Id { get; } = Guid.NewGuid().ToString();
} }
} }

5
SharedLibraryCore/Dtos/FindClientRequest.cs
View File

@ -12,6 +12,9 @@
/// </summary> /// </summary>
public string Xuid { get; set; } public string Xuid { get; set; }
public string ToDebugString() => $"[Name={Name}, Xuid={Xuid}]"; public string ToDebugString()
{
return $"[Name={Name}, Xuid={Xuid}]";
}
} }
} }

6
SharedLibraryCore/Dtos/Meta/Requests/BaseClientMetaRequest.cs
View File

@ -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 public class BaseClientMetaRequest : PaginationRequest
{ {

7
SharedLibraryCore/Dtos/Meta/Requests/ReceivedPenaltyRequest.cs
View File

@ -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 public class ReceivedPenaltyRequest : BaseClientMetaRequest
{ {

6
SharedLibraryCore/Dtos/Meta/Responses/AdministeredPenaltyResponse.cs
View File

@ -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 public class AdministeredPenaltyResponse : ReceivedPenaltyResponse
{ {

8
SharedLibraryCore/Dtos/Meta/Responses/BaseMetaResponse.cs
View File

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

7
SharedLibraryCore/Dtos/Meta/Responses/InformationResponse.cs
View File

@ -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 public class InformationResponse : BaseMetaResponse
{ {

11
SharedLibraryCore/Dtos/Meta/Responses/ReceivedPenaltyResponse.cs
View File

@ -14,8 +14,15 @@ namespace SharedLibraryCore.Dtos.Meta.Responses
public string Offense { get; set; } public string Offense { get; set; }
public string AutomatedOffense { get; set; } public string AutomatedOffense { get; set; }
public DateTime? ExpirationDate { 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 bool IsLinked { get; set; }
public int LinkedClientId { get; set; } public int LinkedClientId { get; set; }
} }

5
SharedLibraryCore/Dtos/Meta/Responses/UpdatedAliasResponse.cs
View File

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

6
SharedLibraryCore/Dtos/Meta/WebfrontTranslationHelper.cs
View File

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

15
SharedLibraryCore/Dtos/PenaltyInfo.cs
View File

@ -22,11 +22,20 @@ namespace SharedLibraryCore.Dtos
public string PenaltyTypeText => PenaltyType.ToString(); public string PenaltyTypeText => PenaltyType.ToString();
public DateTime TimePunished { get; set; } public DateTime TimePunished { get; set; }
public string TimePunishedString => TimePunished.HumanizeForCurrentCulture(); 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 bool Expired => Expires.HasValue && Expires <= DateTime.UtcNow;
public DateTime? Expires { get; set; } 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 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"]})" : "")}";
} }
} }

6
SharedLibraryCore/Dtos/PlayerInfo.cs
View File

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

5
SharedLibraryCore/Dtos/ServerInfo.cs
View File

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

3
SharedLibraryCore/Dtos/SharedInfo.cs
View File

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

27
SharedLibraryCore/Events/EventAPI.cs
View File

@ -1,5 +1,4 @@
using System; using System.Collections.Concurrent;
using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using SharedLibraryCore.Dtos; using SharedLibraryCore.Dtos;
@ -7,8 +6,8 @@ namespace SharedLibraryCore.Events
{ {
public class EventApi 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) public static IEnumerable<EventInfo> GetEvents(bool shouldConsume)
{ {
@ -28,32 +27,38 @@ namespace SharedLibraryCore.Events
var E = gameEvent; var E = gameEvent;
// don't want to clog up the api with unknown events // don't want to clog up the api with unknown events
if (E.Type == GameEvent.EventType.Unknown) if (E.Type == GameEvent.EventType.Unknown)
{
return; return;
}
var apiEvent = new EventInfo() var apiEvent = new EventInfo
{ {
ExtraInfo = E.Extra?.ToString() ?? E.Data, ExtraInfo = E.Extra?.ToString() ?? E.Data,
GameInfo = new EntityInfo() GameInfo = new EntityInfo
{ {
Name = E.Owner.GameName.ToString(), Name = E.Owner.GameName.ToString(),
Id = (int)E.Owner.GameName Id = (int)E.Owner.GameName
}, },
OwnerEntity = new EntityInfo() OwnerEntity = new EntityInfo
{ {
Name = E.Owner.Hostname, Name = E.Owner.Hostname,
Id = E.Owner.EndPoint Id = E.Owner.EndPoint
}, },
OriginEntity = E.Origin == null ? null : new EntityInfo() OriginEntity = E.Origin == null
? null
: new EntityInfo
{ {
Id = E.Origin.ClientId, Id = E.Origin.ClientId,
Name = E.Origin.Name Name = E.Origin.Name
}, },
TargetEntity = E.Target == null ? null : new EntityInfo() TargetEntity = E.Target == null
? null
: new EntityInfo
{ {
Id = E.Target.ClientId, Id = E.Target.ClientId,
Name = E.Target.Name Name = E.Target.Name
}, },
EventType = new EntityInfo() EventType = new EntityInfo
{ {
Id = (int)E.Type, Id = (int)E.Type,
Name = E.Type.ToString() Name = E.Type.ToString()
@ -73,7 +78,9 @@ namespace SharedLibraryCore.Events
{ {
// remove the first added event // remove the first added event
if (RecentEvents.Count >= MaxEvents) if (RecentEvents.Count >= MaxEvents)
{
RecentEvents.TryDequeue(out _); RecentEvents.TryDequeue(out _);
}
RecentEvents.Enqueue(info); RecentEvents.Enqueue(info);
} }

400
SharedLibraryCore/Events/GameEvent.cs
View File

@ -1,11 +1,10 @@
using SharedLibraryCore.Database.Models; using System;
using SharedLibraryCore.Events;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Serilog.Context; using Serilog.Context;
using SharedLibraryCore.Database.Models;
namespace SharedLibraryCore namespace SharedLibraryCore
{ {
@ -17,186 +16,35 @@ namespace SharedLibraryCore
/// event execution did not fail /// event execution did not fail
/// </summary> /// </summary>
None, None,
/// <summary> /// <summary>
/// an internal exception prevented the event /// an internal exception prevented the event
/// from executing /// from executing
/// </summary> /// </summary>
Exception, Exception,
/// <summary> /// <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> /// </summary>
Permission, Permission,
/// <summary> /// <summary>
/// executing the event would cause an invalid state /// executing the event would cause an invalid state
/// </summary> /// </summary>
Invalid, Invalid,
/// <summary> /// <summary>
/// client is doing too much of something /// client is doing too much of something
/// </summary> /// </summary>
Throttle, Throttle,
/// <summary> /// <summary>
/// the event timed out before completion /// the event timed out before completion
/// </summary> /// </summary>
Timeout 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] [Flags]
public enum EventRequiredEntity public enum EventRequiredEntity
{ {
@ -213,12 +61,203 @@ namespace SharedLibraryCore
Internal 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() public GameEvent()
{ {
_eventFinishedWaiter = new ManualResetEvent(false); _eventFinishedWaiter = new ManualResetEvent(false);
@ -226,34 +265,25 @@ namespace SharedLibraryCore
Id = GetNextEventId(); Id = GetNextEventId();
} }
~GameEvent()
{
_eventFinishedWaiter.Set();
_eventFinishedWaiter.Dispose();
}
public EventType Type;
public EventSource Source { get; set; } public EventSource Source { get; set; }
/// <summary> /// <summary>
/// suptype of the event for more detailed classification /// suptype of the event for more detailed classification
/// </summary> /// </summary>
public string Subtype { get; set; } public string Subtype { get; set; }
public EventRequiredEntity RequiredEntity { get; set; } public EventRequiredEntity RequiredEntity { get; set; }
public string Data; // Data is usually the message sent by player
public string Message;
/// <summary> /// <summary>
/// Specifies the game time offset as printed in the log /// Specifies the game time offset as printed in the log
/// </summary> /// </summary>
public long? GameTime { get; set; } public long? GameTime { get; set; }
public EFClient Origin;
public EFClient Target;
public EFClient ImpersonationOrigin { get; set; } public EFClient ImpersonationOrigin { get; set; }
public Server Owner;
public bool IsRemote { get; set; } public bool IsRemote { get; set; }
public object Extra { get; set; } public object Extra { get; set; }
private readonly ManualResetEvent _eventFinishedWaiter;
public DateTime Time { get; set; } public DateTime Time { get; set; }
public long Id { get; private set; } public long Id { get; }
public EventFailReason FailReason { get; set; } public EventFailReason FailReason { get; set; }
public bool Failed => FailReason != EventFailReason.None; public bool Failed => FailReason != EventFailReason.None;
public Guid CorrelationId { get; set; } = Guid.NewGuid(); public Guid CorrelationId { get; set; } = Guid.NewGuid();
@ -264,6 +294,17 @@ namespace SharedLibraryCore
/// </summary> /// </summary>
public bool IsBlocking { get; set; } public bool IsBlocking { get; set; }
private static long GetNextEventId()
{
return Interlocked.Increment(ref NextEventId);
}
~GameEvent()
{
_eventFinishedWaiter.Set();
_eventFinishedWaiter.Dispose();
}
public void Complete() public void Complete()
{ {
_eventFinishedWaiter.Set(); _eventFinishedWaiter.Set();
@ -280,7 +321,7 @@ namespace SharedLibraryCore
/// <returns>waitable task </returns> /// <returns>waitable task </returns>
public async Task<GameEvent> WaitAsync(TimeSpan timeSpan, CancellationToken token) public async Task<GameEvent> WaitAsync(TimeSpan timeSpan, CancellationToken token)
{ {
bool processed = false; var processed = false;
Utilities.DefaultLogger.LogDebug("Begin wait for event {Id}", Id); Utilities.DefaultLogger.LogDebug("Begin wait for event {Id}", Id);
try try
{ {
@ -294,9 +335,10 @@ namespace SharedLibraryCore
if (!processed) 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() });
} }
} }

6
SharedLibraryCore/Events/GameEventArgs.cs
View File

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

6
SharedLibraryCore/Exceptions/AuthorizationException.cs
View File

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

13
SharedLibraryCore/Exceptions/CommandException.cs
View File

@ -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 class CommandException : ServerException
{ {
public CommandException(string msg) : base(msg) { } public CommandException(string msg) : base(msg)
{
}
// .data contains // .data contains
// "command_name" // "command_name"
} }

6
SharedLibraryCore/Exceptions/ConfigurationException.cs
View File

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

8
SharedLibraryCore/Exceptions/DatabaseException.cs
View File

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

12
SharedLibraryCore/Exceptions/DvarException.cs
View File

@ -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 class DvarException : ServerException
{ {
public DvarException(string msg) : base(msg) { } public DvarException(string msg) : base(msg)
{
}
} }
} }

14
SharedLibraryCore/Exceptions/NetworkException.cs
View File

@ -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 namespace SharedLibraryCore.Exceptions
{ {
public class NetworkException : ServerException public class NetworkException : ServerException
{ {
public NetworkException(string msg) : base(msg) { } public NetworkException(string msg) : base(msg)
{
}
public NetworkException(string msg, Socket s) : base(msg) public NetworkException(string msg, Socket s) : base(msg)
{ {
this.Data.Add("socket", s); Data.Add("socket", s);
} }
} }
} }

4
SharedLibraryCore/Exceptions/PluginException.cs
View File

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

8
SharedLibraryCore/Exceptions/SerializationException.cs
View File

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

8
SharedLibraryCore/Exceptions/ServerException.cs
View File

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

1
SharedLibraryCore/Formatting/ColorCodes.cs
View File

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

5
SharedLibraryCore/Game/Map.cs
View File

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

76
SharedLibraryCore/Helpers/BuildNumber.cs
View File

@ -6,12 +6,41 @@ namespace SharedLibraryCore.Helpers
{ {
public class BuildNumber : IComparable public class BuildNumber : IComparable
{ {
private BuildNumber()
{
}
public int Major { get; private set; } public int Major { get; private set; }
public int Minor { get; private set; } public int Minor { get; private set; }
public int Build { get; private set; } public int Build { get; private set; }
public int Revision { 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) public static bool TryParse(string input, out BuildNumber buildNumber)
{ {
@ -32,15 +61,24 @@ namespace SharedLibraryCore.Helpers
/// </summary> /// </summary>
/// <param name="buildNumber">The build number string to parse</param> /// <param name="buildNumber">The build number string to parse</param>
/// <returns>A new BuildNumber class set from the buildNumber string</returns> /// <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) public static BuildNumber Parse(string buildNumber)
{ {
if (buildNumber == null) throw new ArgumentNullException("buildNumber"); if (buildNumber == null)
{
throw new ArgumentNullException("buildNumber");
}
var versions = buildNumber var versions = buildNumber
.Split(new[] { '.' }, .Split(new[] { '.' },
@ -94,35 +132,19 @@ namespace SharedLibraryCore.Helpers
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) 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) public static bool operator <(BuildNumber first, BuildNumber second)
{ {
return (first.CompareTo(second) < 0); return first.CompareTo(second) < 0;
} }
public override bool Equals(object obj) public override bool Equals(object obj)
{ {
return (CompareTo(obj) == 0); return CompareTo(obj) == 0;
} }
public override int GetHashCode() public override int GetHashCode()

7
SharedLibraryCore/Helpers/BuildNumberJsonConverter.cs
View File

@ -1,5 +1,5 @@
using Newtonsoft.Json; using System;
using System; using Newtonsoft.Json;
namespace SharedLibraryCore.Helpers namespace SharedLibraryCore.Helpers
{ {
@ -13,7 +13,8 @@ namespace SharedLibraryCore.Helpers
return objectType == typeof(string); 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()); return BuildNumber.Parse(reader.Value.ToString());
} }

21
SharedLibraryCore/Helpers/ChangeTracking.cs
View File

@ -1,8 +1,4 @@
using SharedLibraryCore.Interfaces; using System.Collections.Concurrent;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Text;
namespace SharedLibraryCore.Helpers namespace SharedLibraryCore.Helpers
{ {
@ -12,26 +8,29 @@ namespace SharedLibraryCore.Helpers
/// <typeparam name="T">Type of entity to keep track of changes to</typeparam> /// <typeparam name="T">Type of entity to keep track of changes to</typeparam>
public class ChangeTracking<T> public class ChangeTracking<T>
{ {
ConcurrentQueue<T> Values; private readonly ConcurrentQueue<T> Values;
public ChangeTracking() public ChangeTracking()
{ {
Values = new ConcurrentQueue<T>(); Values = new ConcurrentQueue<T>();
} }
public bool HasChanges => Values.Count > 0;
public void OnChange(T value) public void OnChange(T value)
{ {
if (Values.Count > 30) if (Values.Count > 30)
Values.TryDequeue(out T throwAway); {
Values.TryDequeue(out var throwAway);
}
Values.Enqueue(value); Values.Enqueue(value);
} }
public T GetNextChange() 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;
} }
} }

8
SharedLibraryCore/Helpers/Hashing.cs
View File

@ -11,7 +11,6 @@ namespace SharedLibraryCore.Helpers
/// <returns></returns> /// <returns></returns>
public static string[] Hash(string password, string saltStr = null) public static string[] Hash(string password, string saltStr = null)
{ {
string hash; string hash;
string salt; string salt;
var CryptoSvc = new PBKDF2(); var CryptoSvc = new PBKDF2();
@ -21,22 +20,19 @@ namespace SharedLibraryCore.Helpers
{ {
hash = CryptoSvc.Compute(password); hash = CryptoSvc.Compute(password);
salt = CryptoSvc.Salt; salt = CryptoSvc.Salt;
return new string[] return new[]
{ {
hash, hash,
salt salt
}; };
} }
else
{
hash = CryptoSvc.Compute(password, saltStr); hash = CryptoSvc.Compute(password, saltStr);
return new string[] return new[]
{ {
hash, hash,
"" ""
}; };
} }
} }
}
} }

6
SharedLibraryCore/Helpers/MessageToken.cs
View File

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

2
SharedLibraryCore/Helpers/ParseEnum.cs
View File

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

25
SharedLibraryCore/Helpers/ParserRegex.cs
View File

@ -43,9 +43,16 @@ namespace SharedLibraryCore.Interfaces
AdditionalGroup = 200 AdditionalGroup = 200
} }
public IParserPatternMatcher PatternMatcher { get; private set; }
private string pattern; private string pattern;
public ParserRegex(IParserPatternMatcher pattern)
{
GroupMapping = new Dictionary<GroupType, int>();
PatternMatcher = pattern;
}
public IParserPatternMatcher PatternMatcher { get; }
/// <summary> /// <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> /// </summary>
@ -62,7 +69,7 @@ namespace SharedLibraryCore.Interfaces
/// <summary> /// <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> /// </summary>
public Dictionary<GroupType, int> GroupMapping { get; private set; } public Dictionary<GroupType, int> GroupMapping { get; }
/// <summary> /// <summary>
/// helper method to enable script parsers to app regex mapping /// helper method to enable script parsers to app regex mapping
@ -73,7 +80,7 @@ namespace SharedLibraryCore.Interfaces
/// <param name="mapValue">group index</param> /// <param name="mapValue">group index</param>
public void AddMapping(object mapKey, object mapValue) 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)) if (GroupMapping.ContainsKey((GroupType)key))
{ {
@ -88,8 +95,8 @@ namespace SharedLibraryCore.Interfaces
if (mapKey.GetType() == typeof(GroupType) && mapValue.GetType().ToString() == "System.Int32") 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)) if (GroupMapping.ContainsKey(k))
{ {
@ -102,11 +109,5 @@ namespace SharedLibraryCore.Interfaces
} }
} }
} }
public ParserRegex(IParserPatternMatcher pattern)
{
GroupMapping = new Dictionary<GroupType, int>();
PatternMatcher = pattern;
}
} }
} }

17
SharedLibraryCore/Helpers/PlayerHistory.cs
View File

@ -8,25 +8,20 @@ namespace SharedLibraryCore.Helpers
// how many minutes between updates // how many minutes between updates
public static readonly int UpdateInterval = 5; public static readonly int UpdateInterval = 5;
private readonly DateTime When;
public PlayerHistory(int cNum) public PlayerHistory(int cNum)
{ {
DateTime t = DateTime.UtcNow; var t = DateTime.UtcNow;
When = new DateTime(t.Year, t.Month, t.Day, t.Hour, Math.Min(59, UpdateInterval * (int)Math.Round(t.Minute / (float)UpdateInterval)), 0); When = new DateTime(t.Year, t.Month, t.Day, t.Hour,
Math.Min(59, UpdateInterval * (int)Math.Round(t.Minute / (float)UpdateInterval)), 0);
y = cNum; y = cNum;
} }
private DateTime When;
/// <summary> /// <summary>
/// Used by CanvasJS as a point on the x axis /// Used by CanvasJS as a point on the x axis
/// </summary> /// </summary>
public string x public string x => When.ToString("yyyy-MM-ddTHH:mm:ssZ");
{
get
{
return When.ToString("yyyy-MM-ddTHH:mm:ssZ");
}
}
/// <summary> /// <summary>
/// Used by CanvasJS as a point on the y axis /// Used by CanvasJS as a point on the y axis

5
SharedLibraryCore/Helpers/Report.cs
View File

@ -1,9 +1,4 @@
using SharedLibraryCore.Database.Models; using SharedLibraryCore.Database.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SharedLibraryCore.Helpers namespace SharedLibraryCore.Helpers
{ {

4
SharedLibraryCore/Helpers/ResourceQueryHelperResult.cs
View File

@ -1,6 +1,4 @@
using System; using System.Collections.Generic;
using System.Collections.Generic;
using SharedLibraryCore.Dtos.Meta.Responses;
namespace SharedLibraryCore.Helpers namespace SharedLibraryCore.Helpers
{ {

6
SharedLibraryCore/Helpers/TokenState.cs
View File

@ -1,6 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.Text;
namespace SharedLibraryCore.Helpers namespace SharedLibraryCore.Helpers
{ {
@ -10,6 +8,8 @@ namespace SharedLibraryCore.Helpers
public DateTime RequestTime { get; set; } = DateTime.Now; public DateTime RequestTime { get; set; } = DateTime.Now;
public TimeSpan TokenDuration { get; set; } public TimeSpan TokenDuration { get; set; }
public string Token { get; set; } public string Token { get; set; }
public string RemainingTime => Math.Round(-(DateTime.Now - RequestTime).Subtract(TokenDuration).TotalMinutes, 1).ToString();
public string RemainingTime => Math.Round(-(DateTime.Now - RequestTime).Subtract(TokenDuration).TotalMinutes, 1)
.ToString();
} }
} }

4
SharedLibraryCore/Interfaces/IAuditInformationRepository.cs
View File

@ -1,6 +1,6 @@
using SharedLibraryCore.Dtos; using System.Collections.Generic;
using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using SharedLibraryCore.Dtos;
namespace SharedLibraryCore.Interfaces namespace SharedLibraryCore.Interfaces
{ {

8
SharedLibraryCore/Interfaces/IBaseConfiguration.cs
View File

@ -1,10 +1,4 @@
using System; namespace SharedLibraryCore.Interfaces
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SharedLibraryCore.Interfaces
{ {
public interface IBaseConfiguration public interface IBaseConfiguration
{ {

8
SharedLibraryCore/Interfaces/IClientMetaResponse.cs
View File

@ -1,12 +1,8 @@
using System; namespace SharedLibraryCore.Interfaces
using System.Collections.Generic;
using System.Text;
namespace SharedLibraryCore.Interfaces
{ {
public interface IClientMetaResponse public interface IClientMetaResponse
{ {
int ClientId { get;} int ClientId { get; }
long MetaId { get; } long MetaId { get; }
} }
} }

Some files were not shown because too many files have changed in this diff Show More