Push changes

src/Prospect.Server.Api/Services/CloudScript/Models/Data/FYActiveContractPlayerData.cs

@@ -4,9 +4,9 @@ namespace Prospect.Server.Api.Services.CloudScript.Models.Data;
 
 public class FYActiveContractPlayerData
 {
-    [JsonPropertyName("contractId")] 
-    public string ContractId { get; set; } = null!;
+    [JsonPropertyName("contractId")]
+    public string ContractID { get; set; } = null!;
 
     [JsonPropertyName("progress")]
-    public List<int> Progress { get; set; } = null!;
+    public int[] Progress { get; set; } = null!;
 }

src/Prospect.Server.Api/Services/CloudScript/Models/Data/FYFactionContractData.cs

@@ -6,7 +6,4 @@ public class FYFactionContractData
 {
     [JsonPropertyName("contractId")]
     public string ContractId { get; set; } = null!;
-
-    [JsonPropertyName("contractIsLockedDueToLowFactionReputation")]
-    public bool ContractIsLockedDueToLowFactionReputation { get; set; }
 }

src/Prospect.Server.Api/Services/CloudScript/Models/Data/FYTechTreeNodeStatus.cs

@@ -0,0 +1,11 @@
+using System.Text.Json.Serialization;
+using Prospect.Server.Api.Services.CloudScript.Models.Data;
+
+public class FYTechTreeNodeStatus {
+    [JsonPropertyName("nodeId")]
+	public string NodeID { get; set; }
+    [JsonPropertyName("level")]
+	public int Level { get; set; }
+    [JsonPropertyName("upgradeStartedTime")]
+	public FYTimestamp UpgradeStartedTime { get; set; }
+};

src/Prospect.Server.Api/Services/CloudScript/Models/Data/FYVivoxJoinTokenRequest.cs

@@ -5,14 +5,20 @@ namespace Prospect.Server.Api.Services.CloudScript.Models.Data;
 public class FYVivoxJoinTokenRequest
 {
     [JsonPropertyName("userName")]
-    public string? Username { get; set; }
-    
+    public string Username { get; set; }
+
     [JsonPropertyName("channel")]
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public string? Channel { get; set; }
-    
-    // TODO: channelType
-    // TODO: hasText
-    // TODO: hasAudio
-    // TODO: channelId
+    public string Channel { get; set; }
+
+    [JsonPropertyName("hasText")]
+    public bool HasText { get; set; }
+
+    [JsonPropertyName("hasAudio")]
+    public bool HasAudio { get; set; }
+
+    [JsonPropertyName("channelType")]
+    public int ChannelType { get; set; }
+
+    [JsonPropertyName("channelId")]
+    public string ChannelID { get; set; }
 }

src/Prospect.Server.Api/Services/CloudScript/Models/FYEnterMatchAzureFunction.cs

@@ -7,22 +7,25 @@ public class FYEnterMatchAzureFunction
 {
     [JsonPropertyName("optimalRegion")]
     public string? OptimalRegion { get; set; }
-    
+
     [JsonPropertyName("isMatch")]
     public bool IsMatch { get; set; }
-    
+
     [JsonPropertyName("bypassMaintenanceMode")]
     public bool BypassMaintenanceMode { get; set; }
-    
+
     [JsonPropertyName("debugOption")]
     public string? DebugOption { get; set; }
-    
+
     [JsonPropertyName("mapName")]
     public string? MapName { get; set; }
-    
+
     [JsonPropertyName("squad_id")]
     public string? SquadId { get; set; }
-    
-    [JsonPropertyName("purchaseInventoryInsurances")]
-    public List<FYPurchaseInventoryInsuranceRequest>? PurchaseInventoryInsurances { get; set; }
-}
+
+    [JsonPropertyName("purchaseInsuranceRequest")]
+    public FYPurchaseInventoryInsuranceRequest PurchaseInventoryInsurances { get; set; }
+
+    [JsonPropertyName("loginNonce")]
+    public string LoginNonce { get; set; }
+}

src/Prospect.Server.Api/Services/CloudScript/Models/FYEnterMatchAzureFunctionResult.cs

@@ -2,29 +2,22 @@
 
 namespace Prospect.Server.Api.Services.CloudScript.Models;
 
-public class FYEnterMatchAzureFunctionResult
+public class FYEnterMatchmakingResult
 {
     [JsonPropertyName("success")]
     public bool Success { get; set; }
-    
-    [JsonPropertyName("address")]
-    public string? Address { get; set; }
-    
-    [JsonPropertyName("errorMessage")]
-    public string? ErrorMessage { get; set; }
-    
-    [JsonPropertyName("port")]
-    public int Port { get; set; }
-    
-    [JsonPropertyName("sharedIndex")]
-    public int ShardIndex { get; set; }
-    
+    [JsonPropertyName("maintenanceMode")] // TODO: Legacy param?
+    public bool MaintenanceMode { get; set; }
+    [JsonPropertyName("blocker")]
+	public int Blocker { get; set; } // EYMatchmakingBlocker
+    [JsonPropertyName("isMatchTravel")]
+	public bool IsMatchTravel { get; set; }
     [JsonPropertyName("singleplayerStation")]
     public bool SingleplayerStation { get; set; }
-    
-    [JsonPropertyName("maintenanceMode")]
-    public bool MaintenanceMode { get; set; }
-    
-    [JsonPropertyName("sessionTimeJoinDelay")]
-    public float SessionTimeJoinDelay { get; set; }
+    [JsonPropertyName("numAttempts")]
+	public int NumAttempts { get; set; }
+    [JsonPropertyName("sessionId")]
+	public string SessionId { get; set; }
+    [JsonPropertyName("errorMessage")]
+	public string ErrorMessage { get; set; }
 }

src/Prospect.Server.Api/Services/CloudScript/Models/FYRetentionBonusRequest.cs

@@ -1,6 +1,30 @@
-namespace Prospect.Server.Api.Services.CloudScript.Models;
+using System;
+using System.Text.Json.Serialization;
+using Prospect.Server.Api.Services.CloudScript.Models.Data;
+
+namespace Prospect.Server.Api.Services.CloudScript.Models;
 
 public class FYRetentionBonusRequest
 {
     
-}
+}
+
+public class FYRetentionBonusResult
+{
+    [JsonPropertyName("userId")]
+    public string UserId { get; set; }
+    [JsonPropertyName("error")]
+    public string Error { get; set; }
+    [JsonPropertyName("playerData")]
+    public FYRetentionProgress PlayerData { get; set; }
+};
+
+public class FYRetentionProgress
+{
+    [JsonPropertyName("daysClaimed")]
+    public int DaysClaimed { get; set; }
+    [JsonPropertyName("lastClaimTime")]
+    public FYTimestamp LastClaimTime { get; set; }
+    [JsonPropertyName("claimedAll")]
+    public bool ClaimedAll { get; set; }
+};

src/Prospect.Server.Api/Services/CloudScript/Models/FYVivoxJoinData.cs

@@ -8,7 +8,7 @@ public class FYVivoxJoinData
     [JsonPropertyName("request")]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public FYVivoxJoinTokenRequest? Request { get; set; }
-    
+
     [JsonPropertyName("token")]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? Token { get; set; }