From 45c2f5dad21be9ff258e9122c9c951f14e4a0c86 Mon Sep 17 00:00:00 2001 From: Citrinate Date: Sun, 10 Mar 2024 20:44:58 -0400 Subject: [PATCH] Fix errors on non-generic ASF #13 --- BoosterManager/Boosters/BoosterPageResponse.cs | 2 +- BoosterManager/Json.cs | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/BoosterManager/Boosters/BoosterPageResponse.cs b/BoosterManager/Boosters/BoosterPageResponse.cs index edcf62b..111a403 100644 --- a/BoosterManager/Boosters/BoosterPageResponse.cs +++ b/BoosterManager/Boosters/BoosterPageResponse.cs @@ -37,7 +37,7 @@ internal BoosterPageResponse(Bot bot, IDocument? boosterPage) { IEnumerable? enumerableBoosters; try { - enumerableBoosters = JsonSerializer.Deserialize>(info.Value, new JsonSerializerOptions { NumberHandling = System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString }); + enumerableBoosters = JsonSerializer.Deserialize>(info.Value); } catch (JsonException ex) { Bot.ArchiLogger.LogGenericError(ex.Message); diff --git a/BoosterManager/Json.cs b/BoosterManager/Json.cs index 27c3e0c..e94b4d7 100644 --- a/BoosterManager/Json.cs +++ b/BoosterManager/Json.cs @@ -37,6 +37,7 @@ internal sealed class BoosterInfo { [JsonInclude] [JsonPropertyName("price")] + [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString)] [JsonRequired] internal uint Price { get; private init; } @@ -118,22 +119,22 @@ internal sealed class MarketListingsResponse { [JsonInclude] [JsonPropertyName("listings")] [JsonRequired] - internal JsonArray? Listings { get; private init; } + internal List? Listings { get; private init; } [JsonInclude] [JsonPropertyName("listings_on_hold")] [JsonRequired] - internal JsonArray? ListingsOnHold { get; private init; } = new(); + internal List? ListingsOnHold { get; private init; } = new(); [JsonInclude] [JsonPropertyName("listings_to_confirm")] [JsonRequired] - internal JsonArray ListingsToConfirm { get; private init; } = new(); + internal List ListingsToConfirm { get; private init; } = new(); [JsonInclude] [JsonPropertyName("buy_orders")] [JsonRequired] - internal JsonArray BuyOrders { get; private init; } = new(); + internal List BuyOrders { get; private init; } = new(); [JsonConstructor] private MarketListingsResponse() { } @@ -167,7 +168,7 @@ internal sealed class MarketHistoryResponse { [JsonInclude] [JsonPropertyName("events")] - internal JsonArray? Events { get; private init; } + internal List? Events { get; private init; } [JsonInclude] [JsonPropertyName("purchases")] @@ -232,7 +233,7 @@ internal sealed class InventoryHistoryResponse { [JsonInclude] [JsonPropertyName("apps")] - internal JsonArray Apps { get; private init; } = new(); + internal List Apps { get; private init; } = new(); [JsonInclude] [JsonPropertyName("cursor")]