fix issue with delay on map command

SharedLibraryCore/Commands/NativeCommands.cs

@@ -632,11 +632,11 @@ namespace SharedLibraryCore.Commands
 
         public override async Task ExecuteAsync(GameEvent E)
         {
-            var _ = !E.Origin.Masked ?
+            _ = !E.Origin.Masked ?
                 E.Owner.Broadcast($"{_translationLookup["COMMANDS_MAPROTATE"]} [^5{E.Origin.Name}^7]", E.Origin) :
                 E.Owner.Broadcast(_translationLookup["COMMANDS_MAPROTATE"], E.Origin);
 
-            await Task.Delay(5000);
+            await Task.Delay(E.Owner.Manager.GetApplicationSettings().Configuration().MapChangeDelaySeconds * 1000);
             await E.Owner.ExecuteCommandAsync("map_rotate");
         }
     }
@@ -864,21 +864,17 @@ namespace SharedLibraryCore.Commands
 
         public override async Task ExecuteAsync(GameEvent E)
         {
-            string newMap = E.Data.Trim().ToLower();
+            string newMap = E.Data.Trim();
-            foreach (Map m in E.Owner.Maps)
+            int delay = E.Owner.Manager.GetApplicationSettings().Configuration().MapChangeDelaySeconds * 1000;
-            {
-                if (m.Name.ToLower() == newMap || m.Alias.ToLower() == newMap)
-                {
-                    E.Owner.Broadcast(_translationLookup["COMMANDS_MAP_SUCCESS"].FormatExt(m.Alias));
-                    await Task.Delay((int)(Utilities.DefaultCommandTimeout.TotalMilliseconds / 2.0));
-                    await E.Owner.LoadMap(m.Name);
-                    return;
-                }
-            }
 
-            // todo: this can be moved into a single statement
+            var foundMap = E.Owner.Maps.FirstOrDefault(_map => _map.Name.Equals(newMap, StringComparison.InvariantCultureIgnoreCase) ||
-            E.Owner.Broadcast(_translationLookup["COMMANDS_MAP_UKN"].FormatExt(newMap));
+            _map.Alias.Equals(newMap, StringComparison.InvariantCultureIgnoreCase));
-            await Task.Delay(5000);
+
+            _ = foundMap == null ?
+                E.Owner.Broadcast(_translationLookup["COMMANDS_MAP_UKN"].FormatExt(newMap)) :
+                 E.Owner.Broadcast(_translationLookup["COMMANDS_MAP_SUCCESS"].FormatExt(foundMap.Alias));
+
+            await Task.Delay(delay);
             await E.Owner.LoadMap(newMap);
         }
     }

SharedLibraryCore/Configuration/ApplicationConfiguration.cs

@@ -91,6 +91,8 @@ namespace SharedLibraryCore.Configuration
         public string[] GlobalRules { get; set; } = new string[0];
         [LocalizedDisplayName("WEBFRONT_CONFIGURATION_DISALLOWED_NAMES")]
         public string[] DisallowedClientNames { get; set; } = new string[0];
+        [LocalizedDisplayName("WEBFRONT_CONFIGURATION_MAP_CHANGE_DELAY")]
+        public int MapChangeDelaySeconds { get; set; } = 5;
         [UIHint("ServerConfiguration")]
         public ServerConfiguration[] Servers { get; set; }
 

SharedLibraryCore/Database/DatabaseContext.cs

@@ -205,7 +205,18 @@ namespace SharedLibraryCore.Database
                 pluginDir = Path.Join(Utilities.OperatingDirectory, "..", "..", "..", "..", "BUILD", "Plugins");
             }
 
-            IEnumerable<string> directoryFiles = Directory.GetFiles(pluginDir).Where(f => f.EndsWith(".dll"));
+            IEnumerable<string> directoryFiles = Enumerable.Empty<string>();
+
+            try
+            {
+                directoryFiles = Directory.GetFiles(pluginDir).Where(f => f.EndsWith(".dll"));
+            }
+
+            catch (DirectoryNotFoundException)
+            {
+                // this is just an ugly thing for unit testing
+                directoryFiles = Directory.GetFiles(@"X:\IW4MAdmin\Tests\ApplicationTests\bin\Debug\netcoreapp3.1").Where(f => f.EndsWith("dll"));
+            }
 
             foreach (string dllPath in directoryFiles)
             {

SharedLibraryCore/Server.cs

@@ -122,7 +122,7 @@ namespace SharedLibraryCore
         /// <param name="message">Message to be sent to all players</param>
         public GameEvent Broadcast(string message, EFClient sender = null)
         {
-            string formattedMessage = string.Format(RconParser.Configuration.CommandPrefixes.Say, $"{(CustomSayEnabled && GameName == Game.IW4 ? $"{CustomSayName}: " : "")}{message.FixIW4ForwardSlash()}");
+            string formattedMessage = string.Format(RconParser.Configuration.CommandPrefixes.Say ?? "", $"{(CustomSayEnabled && GameName == Game.IW4 ? $"{CustomSayName}: " : "")}{message.FixIW4ForwardSlash()}");
 #if DEBUG == true
             Logger.WriteVerbose(message.StripColors());
 #endif

Tests/ApplicationTests/ApplicationTests.csproj

@@ -7,6 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="FakeItEasy" Version="6.2.0" />
+    <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0">

Tests/ApplicationTests/CommandTests.cs

@@ -14,6 +14,8 @@ using SharedLibraryCore;
 using ApplicationTests.Mocks;
 using SharedLibraryCore.Services;
 using static SharedLibraryCore.Database.Models.EFClient;
+using FluentAssertions;
+using FluentAssertions.Extensions;
 
 namespace ApplicationTests
 {
@@ -33,11 +35,14 @@ namespace ApplicationTests
         public void Setup()
         {
             logger = A.Fake<ILogger>();
-            cmdConfig = new CommandConfiguration();
 
             serviceProvider = new ServiceCollection()
                 .BuildBase(new EventHandlerMock(true))
                 .AddSingleton(A.Fake<ClientService>())
+                .AddSingleton<LoadMapCommand>()
+                .AddSingleton<SetLevelCommand>()
+                .AddSingleton<RunAsCommand>()
+                .AddSingleton<PrivateMessageAdminsCommand>()
                 .BuildServiceProvider()
                 .SetupTestHooks();
 
@@ -46,6 +51,8 @@ namespace ApplicationTests
             transLookup = serviceProvider.GetRequiredService<ITranslationLookup>();
             clientService = serviceProvider.GetRequiredService<ClientService>();
             appConfig = serviceProvider.GetRequiredService<ApplicationConfiguration>();
+            appConfig.MapChangeDelaySeconds = 1;
+            cmdConfig = serviceProvider.GetRequiredService<CommandConfiguration>();
 
             A.CallTo(() => manager.GetClientService())
                 .Returns(clientService);
@@ -69,7 +76,7 @@ namespace ApplicationTests
         [Test]
         public async Task Test_RunAsFailsOnSelf()
         {
-            var cmd = new RunAsCommand(cmdConfig, transLookup);
+            var cmd = serviceProvider.GetRequiredService<RunAsCommand>();
             var server = serviceProvider.GetRequiredService<IW4MServer>();
             var target = ClientGenerators.CreateBasicClient(server);
 
@@ -88,7 +95,7 @@ namespace ApplicationTests
         [Test]
         public async Task Test_RunAsFailsOnHigherPrivilege()
         {
-            var cmd = new RunAsCommand(cmdConfig, transLookup);
+            var cmd = serviceProvider.GetRequiredService<RunAsCommand>();
             var server = serviceProvider.GetRequiredService<IW4MServer>();
             var target = ClientGenerators.CreateBasicClient(server);
             target.Level = EFClient.Permission.Administrator;
@@ -111,7 +118,7 @@ namespace ApplicationTests
         [Test]
         public async Task Test_RunAsFailsOnSamePrivilege()
         {
-            var cmd = new RunAsCommand(cmdConfig, transLookup);
+            var cmd = serviceProvider.GetRequiredService<RunAsCommand>();
             var server = serviceProvider.GetRequiredService<IW4MServer>();
             var target = ClientGenerators.CreateBasicClient(server);
             target.Level = EFClient.Permission.Administrator;
@@ -134,7 +141,7 @@ namespace ApplicationTests
         [Test]
         public async Task Test_RunAsFailsOnDisallowedCommand()
         {
-            var cmd = new RunAsCommand(cmdConfig, transLookup);
+            var cmd = serviceProvider.GetRequiredService<RunAsCommand>();
             var server = serviceProvider.GetRequiredService<IW4MServer>();
             var target = ClientGenerators.CreateBasicClient(server);
             target.Level = EFClient.Permission.Moderator;
@@ -160,7 +167,7 @@ namespace ApplicationTests
         [Test]
         public async Task Test_RunAsQueuesEventAndResponse()
         {
-            var cmd = new RunAsCommand(cmdConfig, transLookup);
+            var cmd = serviceProvider.GetRequiredService<RunAsCommand>();
             var server = serviceProvider.GetRequiredService<IW4MServer>();
             var target = ClientGenerators.CreateBasicClient(server);
             target.Level = EFClient.Permission.Moderator;
@@ -187,7 +194,7 @@ namespace ApplicationTests
         [Test]
         public async Task Test_SetLevelFailOnSelf()
         {
-            var cmd = new SetLevelCommand(cmdConfig, transLookup, logger);
+            var cmd = serviceProvider.GetRequiredService<SetLevelCommand>();
             var server = serviceProvider.GetRequiredService<IW4MServer>();
             var target = ClientGenerators.CreateBasicClient(server);
             target.Level = Permission.Owner;
@@ -211,7 +218,7 @@ namespace ApplicationTests
         public async Task Test_SetLevelFailWithSourcePrivilegeTooLow()
         {
             var server = serviceProvider.GetRequiredService<IW4MServer>();
-            var cmd = new SetLevelCommand(cmdConfig, transLookup, logger);
+            var cmd = serviceProvider.GetRequiredService<SetLevelCommand>();
             var origin = ClientGenerators.CreateBasicClient(server);
             origin.Level = Permission.Moderator;
             var target = ClientGenerators.CreateBasicClient(server);
@@ -239,7 +246,7 @@ namespace ApplicationTests
         public async Task Test_SetLevelFailWithExistingOwner_AndOnlyOneOwnerAllowed()
         {
             var server = serviceProvider.GetRequiredService<IW4MServer>();
-            var cmd = new SetLevelCommand(cmdConfig, transLookup, logger);
+            var cmd = serviceProvider.GetRequiredService<SetLevelCommand>();
             var origin = ClientGenerators.CreateBasicClient(server);
             var target = ClientGenerators.CreateBasicClient(server);
             target.Level = Permission.User;
@@ -266,7 +273,7 @@ namespace ApplicationTests
         public async Task Test_SetLevelFailWithStepPrivilegesDisabled_AndNonOwner()
         {
             var server = serviceProvider.GetRequiredService<IW4MServer>();
-            var cmd = new SetLevelCommand(cmdConfig, transLookup, logger);
+            var cmd = serviceProvider.GetRequiredService<SetLevelCommand>();
             var origin = ClientGenerators.CreateBasicClient(server);
             origin.Level = Permission.SeniorAdmin;
             var target = ClientGenerators.CreateBasicClient(server);
@@ -294,7 +301,7 @@ namespace ApplicationTests
         public async Task Test_SetLevelFailWithStepPrivilegesEnabled_ButNewPermissionTooHigh()
         {
             var server = serviceProvider.GetRequiredService<IW4MServer>();
-            var cmd = new SetLevelCommand(cmdConfig, transLookup, logger);
+            var cmd = serviceProvider.GetRequiredService<SetLevelCommand>();
             var origin = ClientGenerators.CreateBasicClient(server);
             origin.Level = Permission.Moderator;
             var target = ClientGenerators.CreateBasicClient(server);
@@ -320,7 +327,7 @@ namespace ApplicationTests
         public async Task Test_SetLevelFailInvalidGroup()
         {
             var server = serviceProvider.GetRequiredService<IW4MServer>();
-            var cmd = new SetLevelCommand(cmdConfig, transLookup, logger);
+            var cmd = serviceProvider.GetRequiredService<SetLevelCommand>();
             var origin = ClientGenerators.CreateBasicClient(server);
             origin.Level = Permission.Owner;
             var target = ClientGenerators.CreateBasicClient(server);
@@ -345,7 +352,7 @@ namespace ApplicationTests
         public async Task Test_SetLevelSucceedWithNoExistingOwner_AndOnlyOneOwnerAllowed()
         {
             var server = serviceProvider.GetRequiredService<IW4MServer>();
-            var cmd = new SetLevelCommand(cmdConfig, transLookup, logger);
+            var cmd = serviceProvider.GetRequiredService<SetLevelCommand>();
             var origin = ClientGenerators.CreateBasicClient(server);
             origin.Level = Permission.Owner;
             var target = ClientGenerators.CreateBasicClient(server);
@@ -373,7 +380,7 @@ namespace ApplicationTests
         public async Task Test_SetLevelOwnerSucceedWithMultiOwnerAllowed()
         {
             var server = serviceProvider.GetRequiredService<IW4MServer>();
-            var cmd = new SetLevelCommand(cmdConfig, transLookup, logger);
+            var cmd = serviceProvider.GetRequiredService<SetLevelCommand>();
             var origin = ClientGenerators.CreateBasicClient(server);
             origin.Level = Permission.Owner;
             var target = ClientGenerators.CreateBasicClient(server);
@@ -402,7 +409,7 @@ namespace ApplicationTests
         public async Task Test_SetLevelOwnerSucceedWithMultiOwnerAllowed_AndSteppedPrivileges()
         {
             var server = serviceProvider.GetRequiredService<IW4MServer>();
-            var cmd = new SetLevelCommand(cmdConfig, transLookup, logger);
+            var cmd = serviceProvider.GetRequiredService<SetLevelCommand>();
             var origin = ClientGenerators.CreateBasicClient(server);
             origin.Level = Permission.Owner;
             var target = ClientGenerators.CreateBasicClient(server);
@@ -432,7 +439,7 @@ namespace ApplicationTests
         public async Task Test_SetLevelSucceedWithSteppedPrivileges()
         {
             var server = serviceProvider.GetRequiredService<IW4MServer>();
-            var cmd = new SetLevelCommand(cmdConfig, transLookup, logger);
+            var cmd = serviceProvider.GetRequiredService<SetLevelCommand>();
             var origin = ClientGenerators.CreateBasicClient(server);
             origin.Level = Permission.Moderator;
             var target = ClientGenerators.CreateBasicClient(server);
@@ -461,7 +468,7 @@ namespace ApplicationTests
         public async Task Test_SetLevelSucceed()
         {
             var server = serviceProvider.GetRequiredService<IW4MServer>();
-            var cmd = new SetLevelCommand(cmdConfig, transLookup, logger);
+            var cmd = serviceProvider.GetRequiredService<SetLevelCommand>();
             var origin = ClientGenerators.CreateBasicClient(server);
             origin.Level = Permission.Owner;
             var target = ClientGenerators.CreateBasicClient(server);
@@ -490,7 +497,7 @@ namespace ApplicationTests
         public async Task Test_SetLevelSucceed_AndFindsIngameClient()
         {
             var server = serviceProvider.GetRequiredService<IW4MServer>();
-            var cmd = new SetLevelCommand(cmdConfig, transLookup, logger);
+            var cmd = serviceProvider.GetRequiredService<SetLevelCommand>();
             var origin = ClientGenerators.CreateBasicClient(server);
             origin.Level = Permission.Owner;
             var databaseTarget = ClientGenerators.CreateDatabaseClient();
@@ -542,7 +549,7 @@ namespace ApplicationTests
         [Test]
         public async Task Test_PrivateMessageAdmins_HappyPath()
         {
-            var cmd = new PrivateMessageAdminsCommand(cmdConfig, transLookup);
+            var cmd = serviceProvider.GetRequiredService<PrivateMessageAdminsCommand>();
             var server = serviceProvider.GetRequiredService<IW4MServer>();
             var origin = ClientGenerators.CreateDatabaseClient();
             origin.Level = Permission.Administrator;
@@ -561,7 +568,7 @@ namespace ApplicationTests
         [Test]
         public async Task Test_PrivateMessageAdmins_GameNotSupported()
         {
-            var cmd = new PrivateMessageAdminsCommand(cmdConfig, transLookup);
+            var cmd = serviceProvider.GetRequiredService<PrivateMessageAdminsCommand>();
             var server = serviceProvider.GetRequiredService<IW4MServer>();
             var origin = ClientGenerators.CreateDatabaseClient();
             origin.Level = Permission.Administrator;
@@ -578,5 +585,27 @@ namespace ApplicationTests
             Assert.AreEqual(expectedEvents, mockEventHandler.Events.Count(_event => _event.Type == GameEvent.EventType.Tell));
         }
         #endregion
+
+        #region LOADMAP
+        [Test]
+        public void Test_LoadMap_WaitsAppropriateTime_BeforeExecutingCommand()
+        {
+            var cmd = serviceProvider.GetRequiredService<LoadMapCommand>();
+            var server = serviceProvider.GetRequiredService<IW4MServer>();
+            var rconParser = serviceProvider.GetRequiredService<IRConParser>();
+            server.Maps.Add(new Map()
+            {
+                Name = "mp_test",
+                Alias = "test"
+            });
+            var gameEvent = EventGenerators.GenerateEvent(GameEvent.EventType.Command, server.Maps.First().Name, server);
+
+            Func<Task> act = () => cmd.ExecuteAsync(gameEvent);
+
+            act.ExecutionTime().Should().BeCloseTo(appConfig.MapChangeDelaySeconds.Seconds(), 500.Milliseconds());
+            A.CallTo(() => rconParser.ExecuteCommandAsync(A<IRConConnection>.Ignored, A<string>.Ignored))
+                .MustHaveHappened();
+        }
+        #endregion
     }
 }

Tests/ApplicationTests/DependencyInjectionExtensions.cs

@@ -30,6 +30,10 @@ namespace ApplicationTests
             var manager = A.Fake<IManager>();
             var logger = A.Fake<ILogger>();
 
+            var transLookup = A.Fake<ITranslationLookup>();
+            A.CallTo(() => transLookup[A<string>.Ignored])
+                .Returns("test");
+
             A.CallTo(() => manager.GetLogger(A<long>.Ignored))
                 .Returns(logger);
 
@@ -38,7 +42,7 @@ namespace ApplicationTests
                 .AddSingleton<IDatabaseContextFactory, DatabaseContextFactoryMock>()
                 .AddSingleton(A.Fake<IRConConnectionFactory>())
                 .AddSingleton(A.Fake<IRConConnection>())
-                .AddSingleton(A.Fake<ITranslationLookup>())
+                .AddSingleton(transLookup)
                 .AddSingleton(A.Fake<IRConParser>())
                 .AddSingleton(A.Fake<IParserRegexFactory>())
                 .AddSingleton<DataFileLoader>()