Fixes (#249)

EvoEsports · Jul 27, 2024 · 4604096 · 4604096
1 parent f030022
commit 4604096
Show file tree

Hide file tree

Showing 44 changed files with 212 additions and 91 deletions.
diff --git a/src/EvoSC.Common/Interfaces/Services/IAuditService.cs b/src/EvoSC.Common/Interfaces/Services/IAuditService.cs
@@ -16,7 +16,7 @@ public interface IAuditService
     /// <param name="comment">A comment or description of the event.</param>
     /// <param name="properties">Any properties or values associated with the event.</param>
     /// <returns></returns>
-    internal Task LogAsync(string eventName, AuditEventStatus status, IPlayer actor, string comment,
+    internal Task LogAsync(string eventName, AuditEventStatus status, IPlayer? actor, string comment,
         dynamic? properties);
 
     /// <summary>

diff --git a/src/EvoSC.Common/Interfaces/Services/IMatchSettingsService.cs b/src/EvoSC.Common/Interfaces/Services/IMatchSettingsService.cs
@@ -1,5 +1,6 @@
 using EvoSC.Common.Interfaces.Models;
 using EvoSC.Common.Interfaces.Util;
+using EvoSC.Common.Util.MatchSettings;
 using EvoSC.Common.Util.MatchSettings.Builders;
 using GbxRemoteNet.Exceptions;
 
@@ -90,4 +91,16 @@ public interface IMatchSettingsService
     /// <exception cref="FileNotFoundException">Thrown if the match settings file was not found.</exception>
     /// <returns></returns>
     public Task DeleteMatchSettingsAsync(string name);
+
+    /// <summary>
+    /// Get the name of the current mode script.
+    /// </summary>
+    /// <returns></returns>
+    public Task<string> GetCurrentScriptNameAsync();
+
+    /// <summary>
+    /// Get the mode of the current match settings.
+    /// </summary>
+    /// <returns></returns>
+    public Task<DefaultModeScriptName> GetCurrentModeAsync();
 }
diff --git a/src/EvoSC.Common/Services/AuditService.cs b/src/EvoSC.Common/Services/AuditService.cs
@@ -6,6 +6,7 @@
 using EvoSC.Common.Interfaces.Services;
 using EvoSC.Common.Interfaces.Util.Auditing;
 using EvoSC.Common.Models.Audit;
+using EvoSC.Common.Util;
 using EvoSC.Common.Util.Auditing;
 using EvoSC.Common.Util.EnumIdentifier;
 using Microsoft.Extensions.Logging;
@@ -37,17 +38,17 @@ private void LogLogger(DbAuditRecord auditRecord)
         );
     }
 
-    async Task IAuditService.LogAsync(string eventName, AuditEventStatus status, IPlayer actor, string comment,
+    async Task IAuditService.LogAsync(string eventName, AuditEventStatus status, IPlayer? actor, string comment,
         dynamic? properties)
     {
         var serializedData = properties != null ? JsonSerializer.Serialize(properties) : null;
 
         var auditRecord = new DbAuditRecord
         {
             Status = status,
-            Actor = new DbPlayer(actor),
+            Actor = actor == null ? null : new DbPlayer(actor),
             CreatedAt = DateTime.UtcNow,
-            ActorId = actor.Id,
+            ActorId = actor?.Id ?? 0,
             EventName = eventName,
             Comment = comment,
             Properties = serializedData

diff --git a/src/EvoSC.Common/Services/MatchSettingsService.cs b/src/EvoSC.Common/Services/MatchSettingsService.cs
@@ -6,6 +6,7 @@
 using EvoSC.Common.Interfaces.Util;
 using EvoSC.Common.Models.Maps;
 using EvoSC.Common.Util;
+using EvoSC.Common.Util.EnumIdentifier;
 using EvoSC.Common.Util.MatchSettings;
 using EvoSC.Common.Util.MatchSettings.Builders;
 using GbxRemoteNet.Exceptions;
@@ -108,7 +109,19 @@ public async Task DeleteMatchSettingsAsync(string name)
         var filePath = await GetFilePathAsync(name);
         File.Delete(filePath);
     }
-
+
+    public async Task<string> GetCurrentScriptNameAsync()
+    {
+        var scriptInfo = await server.Remote.GetModeScriptInfoAsync();
+        return scriptInfo.Name;
+    }
+
+    public async Task<DefaultModeScriptName> GetCurrentModeAsync()
+    {
+        var scriptName = await GetCurrentScriptNameAsync();
+        return scriptName.ToEnumValue<DefaultModeScriptName>() ?? DefaultModeScriptName.Unknown;
+    }
+
     private async Task<string> GetFilePathAsync(string name)
     {
         var mapsDir = await server.GetMapsDirectoryAsync();

diff --git a/src/EvoSC.Common/Util/MatchSettings/DefaultModeScriptName.cs b/src/EvoSC.Common/Util/MatchSettings/DefaultModeScriptName.cs
@@ -24,9 +24,11 @@ public enum DefaultModeScriptName
     Laps,
 
     [Identifier(Name = "Trackmania/TM_Knockout_Online.Script.txt", NoPrefix = true)]
+    [Alias(Name = "ko")]
     Knockout,
 
     [Identifier(Name = "Trackmania/TM_TMWTTeams_Online.Script.txt", NoPrefix = true)]
+    [Alias(Name = "tmwt")]
     TmwtTeams,
 
     /// <summary>

diff --git a/src/EvoSC.Manialinks/Templates/Containers/Window.mt b/src/EvoSC.Manialinks/Templates/Containers/Window.mt
@@ -109,6 +109,7 @@ The window is designed to only be used once per Manialink.
                       y="-1.6"
                       data="{{ id }}"
                       size="small"
+                      if="canClose"
           />
 
           <!-- Body Contents -->
@@ -121,69 +122,6 @@ The window is designed to only be used once per Manialink.
           >
             <slot />
           </Container>
-
-          <!-- Window Header -->
-            <!-- <quad
-                    class="window-bg"
-                    size="{{ width }} {{ height }}"
-                    scriptevents="1"
-            />
-
-            <quad 
-                    class="window-header evosc-window-header evosc-window"
-                    size="{{ width }} {{ 5 }}"
-                    if="hasTitlebar"
-            />
-
-            <label
-                    class="window-title evosc-window"
-                    valign="center"
-                    text="{{ icon }}"
-                    size="{{ width-1.5 }} 5"
-                    pos="1.5 -2.2"
-                    if='hasTitlebar &amp;&amp; icon != ""'
-            />
-
-            <label 
-                    class="window-title-{{ style }} evosc-window"
-                    valign="center"
-                    text="{{ title.ToUpper() }}"
-                    size='{{ width-1.5 }} 5'
-                    pos='{{ icon != "" ? 5.5 : 1.5 }} -2.2'
-                    if="hasTitlebar"
-            />
-
-            <label
-                    class="window-closebtn-{{ style }} evosc-window-closebtn evosc-window-ctrlbtn"
-                    data-id="{{ id }}"
-                    valign="center"
-                    text="❌"
-                    size="5 5"
-                    pos="{{ width-4.5 }} -2.2"
-                    scriptevents="1"
-                    if="hasTitlebar &amp;&amp; canClose"
-            />
-
-            <label
-                    class="window-minimizebtn-{{ style }} evosc-window-minimizebtn evosc-window-ctrlbtn"
-                    data-id="{{ id }}"
-                    valign="center"
-                    text="—"
-                    size="5 5"
-                    pos="{{ width - 4.5 - (canClose ? 4 : 0) }} -2.2"
-                    scriptevents="1"
-                    if="hasTitlebar &amp;&amp; canMinimize"
-            />
-
-            <Container
-                    x="{{ padding }}"
-                    y="-{{ hasTitlebar ? 5+padding : padding }}"
-                    width="{{ width-padding*2 }}"
-                    height="{{ height-(hasTitlebar ? 5+padding*2 : padding*2) }}"
-                    scrollable="false"
-            >
-                <slot />
-            </Container> -->
         </frame>
     </template>
 

diff --git a/src/EvoSC.Testing/EvoSC.Testing.csproj b/src/EvoSC.Testing/EvoSC.Testing.csproj
@@ -7,6 +7,10 @@
     </PropertyGroup>
 
     <ItemGroup>
+      <PackageReference Include="coverlet.msbuild" Version="6.0.2">
+        <PrivateAssets>all</PrivateAssets>
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      </PackageReference>
       <PackageReference Include="Moq" Version="4.20.70" />
       <PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779">
         <PrivateAssets>all</PrivateAssets>

diff --git a/src/EvoSC/InternalModules.cs b/src/EvoSC/InternalModules.cs
@@ -31,9 +31,9 @@ namespace EvoSC;
 public static class InternalModules
 {
     public static readonly Type[] Modules =
-    {
+    [
+        //typeof(ExampleModule),
         typeof(PlayerModule),
-        typeof(ExampleModule),
         typeof(MapsModule),
         typeof(WorldRecordModule),
         typeof(PlayerRecordsModule),
@@ -56,7 +56,7 @@ public static class InternalModules
         typeof(LocalRecordsModule),
         typeof(ForceTeamModule),
         typeof(TeamSettingsModule)
-    };
+    ];
 
     /// <summary>
     /// Run any migrations from all the modules.

diff --git a/src/Modules/ExampleModule/ExampleController.cs b/src/Modules/ExampleModule/ExampleController.cs
@@ -77,13 +77,9 @@ public async Task RateMap(int rating)
     [ChatCommand("test", "Some testing.")]
     public async Task TestCommand()
     {
-        var mapList = await _server.Remote.GetMapListAsync(-1, 0);
-
-        var maps = new List<IMap>();
-        foreach (var map in mapList)
-        {
-            maps.Add(await _mapService.GetMapByUidAsync(map.UId));
-        }
+        var mode = await _matchSettings.GetCurrentModeAsync();
+
+        Console.WriteLine(mode);
     }
 
     [ChatCommand("rejoin", "Simulates the player joining the server.")]

diff --git a/src/Modules/LocalRecordsModule/Controllers/WidgetUpdateController.cs b/src/Modules/LocalRecordsModule/Controllers/WidgetUpdateController.cs
@@ -25,5 +25,13 @@ public async Task OnPlayerConnectAsync(object sender, PlayerConnectGbxEventArgs
     public Task OnBeginMapAsync(object sender, MapGbxEventArgs args) => localRecords.ShowWidgetToAllAsync();
 
     [Subscribe(PlayerRecordsEvent.PbRecord)]
-    public Task OnPbAsync(object sender, PbRecordUpdateEventArgs args) => localRecords.UpdatePbAsync(args.Record);
+    public Task OnPbAsync(object sender, PbRecordUpdateEventArgs args)
+    {
+        if (args.Status == RecordUpdateStatus.NotUpdated)
+        {
+            return Task.CompletedTask;
+        }
+
+        return localRecords.UpdatePbAsync(args.Record);
+    }
 }
diff --git a/src/Modules/LocalRecordsModule/Database/Repository/LocalRecordRepository.cs b/src/Modules/LocalRecordsModule/Database/Repository/LocalRecordRepository.cs
@@ -176,7 +176,7 @@ await NewLoadAll()
 
     public async Task<DbLocalRecord?> GetRecordOfPlayerInMapAsync(IPlayer player, IMap map) =>
         await NewLoadAll()
-            .FirstOrDefaultAsync(r => r.DbRecord.DbPlayer.Id == player.Id);
+            .FirstOrDefaultAsync(r => r.DbRecord.DbPlayer.Id == player.Id && r.DbMap.Id == map.Id);
 
     public async Task DeleteRecordAsync(IPlayer player, IMap map)
     {

diff --git a/src/Modules/LocalRecordsModule/Services/LocalRecordsService.cs b/src/Modules/LocalRecordsModule/Services/LocalRecordsService.cs
@@ -120,7 +120,7 @@ await server.InfoMessageAsync(new TextFormatter()
                 .ToString());
             await ShowWidgetToAllAsync();
         }
-        else if (record.Score == oldRecord.Record.Score)
+        else if (record.Score == localRecord.Record.Score)
         {
             await server.InfoMessageAsync(new TextFormatter()
                 .AddText(record.Player.NickName)

diff --git a/src/Modules/OpenPlanetModule/Config/IOpenPlanetControlSettings.cs b/src/Modules/OpenPlanetModule/Config/IOpenPlanetControlSettings.cs
@@ -2,6 +2,7 @@
 using Config.Net;
 using EvoSC.Modules.Attributes;
 using EvoSC.Modules.Official.OpenPlanetModule.Models;
+using LinqToDB.Common;
 
 namespace EvoSC.Modules.Official.OpenPlanetModule.Config;
 
@@ -29,6 +30,12 @@ public interface IOpenPlanetControlSettings
     [Option(DefaultValue = true), Description("Allow the use of openplanet. If false, no signature mode is allowed.")]
     public bool AllowOpenplanet { get; set; }
 
-    [Option(DefaultValue = "1.25.45"), Description("The minimum required OpenPlanet version to play on this server.")]
+    [Option(DefaultValue = "1.26.25"), Description("The minimum required OpenPlanet version to play on this server.")]
     public Version MinimumRequiredVersion { get; set; }
+
+    [Option(DefaultValue = true), Description("Enable auditing of all checks.")]
+    public bool AuditAllChecks { get; set; }
+
+    [Option(DefaultValue = true), Description("Enable auditing of players that got jailed.")]
+    public bool AuditJails { get; set; }
 }
diff --git a/src/Modules/OpenPlanetModule/Controllers/OpenPlanetControlManialinkController.cs b/src/Modules/OpenPlanetModule/Controllers/OpenPlanetControlManialinkController.cs
@@ -3,6 +3,8 @@
 using EvoSC.Common.Util;
 using EvoSC.Manialinks;
 using EvoSC.Manialinks.Attributes;
+using EvoSC.Modules.Official.OpenPlanetModule.Config;
+using EvoSC.Modules.Official.OpenPlanetModule.Events;
 using EvoSC.Modules.Official.OpenPlanetModule.Interfaces;
 using EvoSC.Modules.Official.OpenPlanetModule.Interfaces.Models;
 
@@ -11,7 +13,7 @@ namespace EvoSC.Modules.Official.OpenPlanetModule.Controllers;
 [Controller]
 [ManialinkRoute(Route = "OpenPlanetActions")]
 public class OpenPlanetControlManialinkController(IOpenPlanetControlService opControl, IServerClient server,
-        IOpenPlanetTrackerService trackerService)
+        IOpenPlanetTrackerService trackerService, IOpenPlanetScheduler scheduler)
     : ManialinkController
 {
     public async Task CheckAsync(IOpenPlanetInfo openPlanetInfo)
@@ -20,5 +22,13 @@ public async Task CheckAsync(IOpenPlanetInfo openPlanetInfo)
         trackerService.AddOrUpdatePlayer(Context.Player, openPlanetInfo);
     }
 
-    public Task DisconnectAsync() => server.Remote.KickAsync(Context.Player.GetLogin());
+    public async Task DisconnectAsync()
+    {
+        await server.Remote.KickAsync(Context.Player.GetLogin());
+
+        if (scheduler.PlayerIsScheduledForKick(Context.Player))
+        {
+            scheduler.UnScheduleKickPlayer(Context.Player);
+        }
+    }
 }
diff --git a/src/Modules/OpenPlanetModule/Events/OpAuditEvents.cs b/src/Modules/OpenPlanetModule/Events/OpAuditEvents.cs
@@ -0,0 +1,12 @@
+using EvoSC.Common.Util.EnumIdentifier;
+
+namespace EvoSC.Modules.Official.OpenPlanetModule.Events;
+
+public enum OpAuditEvents
+{
+    [Identifier(Name = "OpenPlanet:SignatureModeCheck")]
+    SignatureModeCheck,
+
+    [Identifier(Name = "OpenPlanet:PlayerJailed")]
+    PlayerJailed
+}
diff --git a/src/Modules/OpenPlanetModule/Services/OpenPlanetControlService.cs b/src/Modules/OpenPlanetModule/Services/OpenPlanetControlService.cs
@@ -7,6 +7,7 @@
 using EvoSC.Common.Util;
 using EvoSC.Manialinks.Interfaces;
 using EvoSC.Modules.Official.OpenPlanetModule.Config;
+using EvoSC.Modules.Official.OpenPlanetModule.Events;
 using EvoSC.Modules.Official.OpenPlanetModule.Interfaces;
 using EvoSC.Modules.Official.OpenPlanetModule.Interfaces.Models;
 using EvoSC.Modules.Official.OpenPlanetModule.Models;
@@ -18,7 +19,7 @@ namespace EvoSC.Modules.Official.OpenPlanetModule.Services;
 public class OpenPlanetControlService(ILogger<OpenPlanetControlService> logger, IPermissionManager permissions,
         IOpenPlanetControlSettings opcSettings, IManialinkManager manialinks, IServerClient server,
         IOpenPlanetScheduler scheduler,
-        Locale locale)
+        Locale locale, IAuditService auditService)
     : IOpenPlanetControlService
 {
     private readonly dynamic _locale = locale;
@@ -27,6 +28,15 @@ public async Task VerifySignatureModeAsync(IPlayer player, IOpenPlanetInfo playe
     {
         logger.LogDebug("Verifying OpenPlanet for Player {Player}", player.AccountId);
 
+        if (opcSettings.AuditAllChecks)
+        {
+            await auditService.NewEvent(OpAuditEvents.SignatureModeCheck)
+                .HavingProperties(new { Player = player, OpenPlanetData = playerOpInfo })
+                .Comment("OpenPlanet state checked for player.")
+                .Info()
+                .LogAsync();
+        }
+
         if (!playerOpInfo.IsOpenPlanet)
         {
             await ReleasePlayerAsync(player);
@@ -74,6 +84,14 @@ public async Task VerifySignatureModeAsync(IPlayer player, IOpenPlanetInfo playe
 
     private async Task JailPlayerAsync(IPlayer player, OpJailReason reason)
     {
+        if (opcSettings.AuditJails)
+        {
+            await auditService.NewEvent(OpAuditEvents.PlayerJailed)
+                .HavingProperties(new { Player = player, Reason = reason })
+                .Success()
+                .LogAsync("Player jailed.");
+        }
+
         if (scheduler.PlayerIsScheduledForKick(player))
         {
             return;

diff --git a/src/Modules/OpenPlanetModule/Templates/DetectOP.mt b/src/Modules/OpenPlanetModule/Templates/DetectOP.mt
@@ -31,8 +31,11 @@
 
         *** OnLoop ***
         ***
-        if (lastTime + {{ config.CheckInterval }} <= Now && lastToolInfo != System.ExtraTool_Info) {
-            CheckOpenPlanet();
+        if (lastTime + {{ config.CheckInterval }} <= Now) {
+            if (lastToolInfo != System.ExtraTool_Info) {
+              CheckOpenPlanet();
+            }
+
             lastTime = Now;
             lastToolInfo = System.ExtraTool_Info;
         }