Sanitize parties for ability crests on export (#1102)

SapiensAnatis · Oct 6, 2024 · dada545 · dada545
1 parent 5b31507
commit dada545
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Web/Savefile/SavefileExportTests.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Web/Savefile/SavefileExportTests.cs
@@ -2,6 +2,7 @@
 using System.Net.Http.Json;
 using DragaliaAPI.Database.Entities;
 using DragaliaAPI.Shared.Serialization;
+using Microsoft.EntityFrameworkCore;
 
 namespace DragaliaAPI.Integration.Test.Features.Web.Savefile;
 
@@ -45,6 +46,13 @@ await this.AddToDatabase(
             new DbAbilityCrest() { ViewerId = this.ViewerId, AbilityCrestId = customCrest }
         );
 
+        this.ApiContext.PlayerPartyUnits.Where(x => x.PartyNo == 1)
+            .ExecuteUpdate(e =>
+                e.SetProperty(x => x.EquipCrestSlotType1CrestId1, customCrest)
+                    .SetProperty(x => x.EquipCrestSlotType1CrestId2, customCrest)
+                    .SetProperty(x => x.EquipCrestSlotType1CrestId3, customCrest)
+            );
+
         HttpResponseMessage resp = await this.Client.GetAsync("/api/savefile/export");
 
         DragaliaResponse<LoadIndexResponse>? deserialized = await resp.Content.ReadFromJsonAsync<
@@ -56,5 +64,13 @@ await this.AddToDatabase(
         deserialized!
             .Data.AbilityCrestList.Should()
             .NotContain(x => x.AbilityCrestId == customCrest);
+
+        PartyList? firstParty = deserialized.Data.PartyList.First(x => x.PartyNo == 1);
+
+        firstParty
+            .PartySettingList.Should()
+            .NotContain(x => x.EquipCrestSlotType1CrestId1 == customCrest)
+            .And.NotContain(x => x.EquipCrestSlotType1CrestId2 == customCrest)
+            .And.NotContain(x => x.EquipCrestSlotType1CrestId3 == customCrest);
     }
 }
diff --git a/DragaliaAPI/DragaliaAPI/Services/Game/LoadService.cs b/DragaliaAPI/DragaliaAPI/Services/Game/LoadService.cs
@@ -120,11 +120,33 @@ public async Task<LoadIndexResponse> BuildIndexData(
 
     public LoadIndexResponse SanitizeIndexData(LoadIndexResponse original)
     {
+        AbilityCrestId maxVanilllaId = (AbilityCrestId)50000000;
+
         // Remove custom wyrmprints
         original.AbilityCrestList = original
-            .AbilityCrestList.Where(x => (int)x.AbilityCrestId < 50000000)
+            .AbilityCrestList.Where(x => x.AbilityCrestId < maxVanilllaId)
             .ToList();
 
+        foreach (
+            PartySettingList partySettingList in original.PartyList.SelectMany(x =>
+                x.PartySettingList
+            )
+        )
+        {
+            if (partySettingList.EquipCrestSlotType1CrestId1 >= maxVanilllaId)
+            {
+                partySettingList.EquipCrestSlotType1CrestId1 = 0;
+            }
+            if (partySettingList.EquipCrestSlotType1CrestId2 >= maxVanilllaId)
+            {
+                partySettingList.EquipCrestSlotType1CrestId2 = 0;
+            }
+            if (partySettingList.EquipCrestSlotType1CrestId3 >= maxVanilllaId)
+            {
+                partySettingList.EquipCrestSlotType1CrestId3 = 0;
+            }
+        }
+
         return original;
     }
 }