ItemRequestData feeds

Libraries/Core/Models/Eft/Health/HealthTreatmentRequestData.cs

@@ -1,11 +1,10 @@
 using System.Text.Json.Serialization;
+using Core.Models.Eft.Common.Request;
 
 namespace Core.Models.Eft.Health;
 
-public record HealthTreatmentRequestData
+public record HealthTreatmentRequestData : BaseInteractionRequestData
 {
-    [JsonPropertyName("Action")]
-    public string Action { get; set; } = "RestoreHealth";
 
     [JsonPropertyName("trader")]
     public string? Trader { get; set; }

Libraries/Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs

@@ -1,12 +1,10 @@
 using System.Text.Json.Serialization;
+using Core.Models.Eft.Common.Request;
 
 namespace Core.Models.Eft.Hideout;
 
-public record HideoutCircleOfCultistProductionStartRequestData
+public record HideoutCircleOfCultistProductionStartRequestData : BaseInteractionRequestData
 {
-    [JsonPropertyName("Action")]
-    public string? Action { get; set; } = "HideoutCircleOfCultistProductionStart";
-
     [JsonPropertyName("timestamp")]
     public long? Timestamp { get; set; }
 }

Libraries/Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs

@@ -1,12 +1,10 @@
 using System.Text.Json.Serialization;
+using Core.Models.Eft.Common.Request;
 
 namespace Core.Models.Eft.Hideout;
 
-public record HideoutContinuousProductionStartRequestData
+public record HideoutContinuousProductionStartRequestData : BaseInteractionRequestData
 {
-    [JsonPropertyName("Action")]
-    public string? Action { get; } = "HideoutContinuousProductionStart";
-
     [JsonPropertyName("recipeId")]
     public string? RecipeId { get; set; }
 

Libraries/Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs

@@ -1,11 +1,10 @@
 using System.Text.Json.Serialization;
+using Core.Models.Eft.Common.Request;
 
 namespace Core.Models.Eft.Hideout;
 
-public record HideoutCustomizationApplyRequestData
+public record HideoutCustomizationApplyRequestData: BaseInteractionRequestData
 {
-    [JsonPropertyName("Action")]
-    public string? Action { get; set; } = "HideoutCustomizationApply";
 
     /// <summary>
     /// Id of the newly picked item to apply to hideout

Libraries/Core/Models/Eft/Hideout/HideoutCustomizationSetMannequinPoseRequest.cs

@@ -1,16 +1,13 @@
 using System.Text.Json.Serialization;
+using Core.Models.Eft.Common.Request;
 
-namespace Core.Models.Eft.Hideout
+namespace Core.Models.Eft.Hideout;
+
+public record HideoutCustomizationSetMannequinPoseRequest : BaseInteractionRequestData
 {
-    public record HideoutCustomizationSetMannequinPoseRequest
-    {
-        [JsonPropertyName("Action")]
-        public string? Action { get; set; } = "HideoutCustomizationSetMannequinPose";
+    [JsonPropertyName("poses")]
+    public Dictionary<string, string> Poses { get; set; }
 
-        [JsonPropertyName("poses")]
-        public Dictionary<string, string> Poses { get; set; }
-
-        [JsonPropertyName("timestamp")]
-        public double Timestamp { get; set; }
-    }
+    [JsonPropertyName("timestamp")]
+    public double Timestamp { get; set; }
 }

Libraries/Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs

@@ -1,12 +1,10 @@
 using System.Text.Json.Serialization;
+using Core.Models.Eft.Common.Request;
 
 namespace Core.Models.Eft.Hideout;
 
-public record HideoutDeleteProductionRequestData
+public record HideoutDeleteProductionRequestData: BaseInteractionRequestData
 {
-    [JsonPropertyName("Action")]
-    public string? Action { get; set; } = "HideoutDeleteProductionCommand";
-
     [JsonPropertyName("recipeId")]
     public string? RecipeId { get; set; }
 

Libraries/Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs

@@ -1,12 +1,10 @@
 using System.Text.Json.Serialization;
+using Core.Models.Eft.Common.Request;
 
 namespace Core.Models.Eft.Hideout;
 
-public record HideoutImproveAreaRequestData
+public record HideoutImproveAreaRequestData : BaseInteractionRequestData
 {
-    [JsonPropertyName("Action")]
-    public string? Action { get; set; } = "HideoutImproveArea";
-
     /** Hideout area id from areas.json */
     [JsonPropertyName("id")]
     public string? AreaId { get; set; }

Libraries/Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs

@@ -1,11 +1,10 @@
 using System.Text.Json.Serialization;
+using Core.Models.Eft.Common.Request;
 
 namespace Core.Models.Eft.Hideout;
 
-public record HideoutPutItemInRequestData
+public record HideoutPutItemInRequestData : BaseInteractionRequestData
 {
-    [JsonPropertyName("Action")]
-    public string? Action { get; set; } = "HideoutPutItemsInAreaSlots";
 
     [JsonPropertyName("areaType")]
     public int? AreaType { get; set; }

Libraries/Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs

@@ -1,12 +1,10 @@
 using System.Text.Json.Serialization;
+using Core.Models.Eft.Common.Request;
 
 namespace Core.Models.Eft.Hideout;
 
-public record HideoutScavCaseStartRequestData
+public record HideoutScavCaseStartRequestData : BaseInteractionRequestData
 {
-    [JsonPropertyName("Action")]
-    public string? Action { get; set; } = "HideoutScavCaseProductionStart";
-
     [JsonPropertyName("recipeId")]
     public string? RecipeId { get; set; }
 

Libraries/Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs

@@ -1,12 +1,10 @@
 using System.Text.Json.Serialization;
+using Core.Models.Eft.Common.Request;
 
 namespace Core.Models.Eft.Hideout;
 
-public record HideoutSingleProductionStartRequestData
+public record HideoutSingleProductionStartRequestData : BaseInteractionRequestData
 {
-    [JsonPropertyName("Action")]
-    public string? Action { get; set; } = "HideoutSingleProductionStart";
-
     [JsonPropertyName("recipeId")]
     public string? RecipeId { get; set; }
 

Libraries/Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs

@@ -1,12 +1,10 @@
 using System.Text.Json.Serialization;
+using Core.Models.Eft.Common.Request;
 
 namespace Core.Models.Eft.Hideout;
 
-public record HideoutTakeItemOutRequestData
+public record HideoutTakeItemOutRequestData : BaseInteractionRequestData
 {
-    [JsonPropertyName("Action")]
-    public string? Action { get; set; } = "HideoutTakeItemsFromAreaSlots";
-
     [JsonPropertyName("areaType")]
     public int? AreaType { get; set; }
 

Libraries/Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs

@@ -1,12 +1,10 @@
 using System.Text.Json.Serialization;
+using Core.Models.Eft.Common.Request;
 
 namespace Core.Models.Eft.Hideout;
 
-public record HideoutTakeProductionRequestData
+public record HideoutTakeProductionRequestData : BaseInteractionRequestData
 {
-    [JsonPropertyName("Action")]
-    public string? Action { get; set; } = "HideoutTakeProduction";
-
     [JsonPropertyName("recipeId")]
     public string? RecipeId { get; set; }
 

Libraries/Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs

@@ -1,12 +1,10 @@
 using System.Text.Json.Serialization;
+using Core.Models.Eft.Common.Request;
 
 namespace Core.Models.Eft.Hideout;
 
-public record HideoutToggleAreaRequestData
+public record HideoutToggleAreaRequestData : BaseInteractionRequestData
 {
-    [JsonPropertyName("Action")]
-    public string? Action { get; set; } = "HideoutToggleArea";
-
     [JsonPropertyName("areaType")]
     public int? AreaType { get; set; }
 

Libraries/Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs

@@ -1,11 +1,10 @@
 using System.Text.Json.Serialization;
+using Core.Models.Eft.Common.Request;
 
 namespace Core.Models.Eft.Hideout;
 
-public record HideoutUpgradeCompleteRequestData
+public record HideoutUpgradeCompleteRequestData : BaseInteractionRequestData
 {
-    [JsonPropertyName("Action")]
-    public string? Action { get; set; } = "HideoutUpgradeComplete";
 
     [JsonPropertyName("areaType")]
     public int? AreaType { get; set; }

Libraries/Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs

@@ -1,11 +1,10 @@
 using System.Text.Json.Serialization;
+using Core.Models.Eft.Common.Request;
 
 namespace Core.Models.Eft.Hideout;
 
-public record HideoutUpgradeRequestData
+public record HideoutUpgradeRequestData : BaseInteractionRequestData
 {
-    [JsonPropertyName("Action")]
-    public string? Action { get; set; } = "HideoutUpgrade";
 
     [JsonPropertyName("areaType")]
     public int? AreaType { get; set; }

Libraries/Core/Models/Eft/Hideout/RecordShootingRangePoints.cs

@@ -1,12 +1,10 @@
 using System.Text.Json.Serialization;
+using Core.Models.Eft.Common.Request;
 
 namespace Core.Models.Eft.Hideout;
 
-public record RecordShootingRangePoints
+public record RecordShootingRangePoints : BaseInteractionRequestData
 {
-    [JsonPropertyName("Action")]
-    public string? Action { get; set; } = "RecordShootingRangePoints";
-
     [JsonPropertyName("points")]
     public int? Points { get; set; }
 }

Libraries/Core/Utils/Json/Converters/BaseInteractionRequestDataConverter.cs

@@ -2,6 +2,10 @@
 using System.Text.Json.Serialization;
 using Core.Models.Eft.Common.Request;
 using Core.Models.Eft.Customization;
+using Core.Models.Eft.Health;
+using Core.Models.Eft.Hideout;
+using Core.Models.Eft.Insurance;
+using Core.Models.Enums;
 
 namespace Core.Utils.Json.Converters;
 
@@ -23,6 +27,46 @@ public class BaseInteractionRequestDataConverter : JsonConverter<BaseInteraction
                 return JsonSerializer.Deserialize<BuyClothingRequestData>(jsonText, options);
             case "CustomizationSet":
                 return JsonSerializer.Deserialize<CustomizationSetRequest>(jsonText, options);
+            case "Eat":
+                return JsonSerializer.Deserialize<OffraidEatRequestData>(jsonText, options);
+            case "Heal":
+                return JsonSerializer.Deserialize<OffraidHealRequestData>(jsonText, options);
+            case "RestoreHealth":
+                return JsonSerializer.Deserialize<HealthTreatmentRequestData>(jsonText, options);
+            case HideoutEventActions.HIDEOUT_UPGRADE:
+                return JsonSerializer.Deserialize<HideoutUpgradeRequestData>(jsonText, options);
+            case HideoutEventActions.HIDEOUT_UPGRADE_COMPLETE:
+                return JsonSerializer.Deserialize<HideoutUpgradeCompleteRequestData>(jsonText, options);
+            case HideoutEventActions.HIDEOUT_PUT_ITEMS_IN_AREA_SLOTS:
+                return JsonSerializer.Deserialize<HideoutPutItemInRequestData>(jsonText, options);
+            case HideoutEventActions.HIDEOUT_TAKE_ITEMS_FROM_AREA_SLOTS:
+                return JsonSerializer.Deserialize<HideoutTakeItemOutRequestData>(jsonText, options);
+            case HideoutEventActions.HIDEOUT_TOGGLE_AREA:
+                return JsonSerializer.Deserialize<HideoutToggleAreaRequestData>(jsonText, options);
+            case HideoutEventActions.HIDEOUT_SINGLE_PRODUCTION_START:
+                return JsonSerializer.Deserialize<HideoutSingleProductionStartRequestData>(jsonText, options);
+            case HideoutEventActions.HIDEOUT_SCAV_CASE_PRODUCTION_START:
+                return JsonSerializer.Deserialize<HideoutScavCaseStartRequestData>(jsonText, options);
+            case HideoutEventActions.HIDEOUT_CONTINUOUS_PRODUCTION_START:
+                return JsonSerializer.Deserialize<HideoutContinuousProductionStartRequestData>(jsonText, options);
+            case HideoutEventActions.HIDEOUT_TAKE_PRODUCTION:
+                return JsonSerializer.Deserialize<HideoutTakeProductionRequestData>(jsonText, options);
+            case HideoutEventActions.HIDEOUT_RECORD_SHOOTING_RANGE_POINTS:
+                return JsonSerializer.Deserialize<RecordShootingRangePoints>(jsonText, options);
+            case HideoutEventActions.HIDEOUT_IMPROVE_AREA:
+                return JsonSerializer.Deserialize<HideoutImproveAreaRequestData>(jsonText, options);
+            case HideoutEventActions.HIDEOUT_CANCEL_PRODUCTION_COMMAND:
+                return JsonSerializer.Deserialize<HideoutImproveAreaRequestData>(jsonText, options);
+            case HideoutEventActions.HIDEOUT_CIRCLE_OF_CULTIST_PRODUCTION_START:
+                return JsonSerializer.Deserialize<HideoutCircleOfCultistProductionStartRequestData>(jsonText, options);
+            case HideoutEventActions.HIDEOUT_DELETE_PRODUCTION_COMMAND:
+                return JsonSerializer.Deserialize<HideoutDeleteProductionRequestData>(jsonText, options);
+            case HideoutEventActions.HIDEOUT_CUSTOMIZATION_APPLY_COMMAND:
+                return JsonSerializer.Deserialize<HideoutCustomizationApplyRequestData>(jsonText, options);
+            case HideoutEventActions.HIDEOUT_CUSTOMIZATION_SET_MANNEQUIN_POSE:
+                return JsonSerializer.Deserialize<HideoutCustomizationSetMannequinPoseRequest>(jsonText, options);
+            case "Insure":
+                return JsonSerializer.Deserialize<InsureRequestData>(jsonText, options);
             
             ///////////////////////////////////////////