fix type (int -> long) for Amount fields

Author: wiz0u

src/Telegram.Bot/Extend.Types.cs

@@ -218,7 +218,7 @@ namespace Payments
         public partial class LabeledPrice
         {
             /// <summary>Instantiates a new <see cref="LabeledPrice"/> from a tuple</summary>
-            public static implicit operator LabeledPrice((string label, int amount) t) => new(t.label, t.amount);
+            public static implicit operator LabeledPrice((string label, long amount) t) => new(t.label, t.amount);
         }
     }
 

src/Telegram.Bot/Types/Payments/AffiliateInfo.cs

@@ -19,7 +19,7 @@ public partial class AffiliateInfo
 
     /// <summary>Integer amount of Telegram Stars received by the affiliate from the transaction, rounded to 0; can be negative for refunds</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
-    public int Amount { get; set; }
+    public long Amount { get; set; }
 
     /// <summary><em>Optional</em>. The number of 1/1000000000 shares of Telegram Stars received by the affiliate; from -999999999 to 999999999; can be negative for refunds</summary>
     [JsonPropertyName("nanostar_amount")]

src/Telegram.Bot/Types/Payments/LabeledPrice.cs

@@ -10,13 +10,13 @@ public partial class LabeledPrice
 
     /// <summary>Price of the product in the <em>smallest units</em> of the <a href="https://core.telegram.org/bots/payments#supported-currencies">currency</a> (integer, <b>not</b> float/double). For example, for a price of <c>US$ 1.45</c> pass <c>amount = 145</c>. See the <em>exp</em> parameter in <a href="https://core.telegram.org/bots/payments/currencies.json">currencies.json</a>, it shows the number of digits past the decimal point for each currency (2 for the majority of currencies).</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
-    public required int Amount { get; set; }
+    public required long Amount { get; set; }
 
     /// <summary>Initializes an instance of <see cref="LabeledPrice"/></summary>
     /// <param name="label">Portion label</param>
     /// <param name="amount">Price of the product in the <em>smallest units</em> of the <a href="https://core.telegram.org/bots/payments#supported-currencies">currency</a> (integer, <b>not</b> float/double). For example, for a price of <c>US$ 1.45</c> pass <c>amount = 145</c>. See the <em>exp</em> parameter in <a href="https://core.telegram.org/bots/payments/currencies.json">currencies.json</a>, it shows the number of digits past the decimal point for each currency (2 for the majority of currencies).</param>
     [SetsRequiredMembers]
-    public LabeledPrice(string label, int amount)
+    public LabeledPrice(string label, long amount)
     {
         Label = label;
         Amount = amount;

src/Telegram.Bot/Types/Payments/StarTransaction.cs

@@ -10,7 +10,7 @@ public partial class StarTransaction
 
     /// <summary>Integer amount of Telegram Stars transferred by the transaction</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
-    public int Amount { get; set; }
+    public long Amount { get; set; }
 
     /// <summary><em>Optional</em>. The number of 1/1000000000 shares of Telegram Stars transferred by the transaction; from 0 to 999999999</summary>
     [JsonPropertyName("nanostar_amount")]

src/Telegram.Bot/Types/StarAmount.cs

@@ -6,7 +6,7 @@ public partial class StarAmount
 {
     /// <summary>Integer amount of Telegram Stars, rounded to 0; can be negative</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
-    public int Amount { get; set; }
+    public long Amount { get; set; }
 
     /// <summary><em>Optional</em>. The number of 1/1000000000 shares of Telegram Stars; from -999999999 to 999999999; can be negative if and only if <see cref="Amount">Amount</see> is non-positive</summary>
     [JsonPropertyName("nanostar_amount")]

src/Telegram.Bot/Types/SuggestedPostPaid.cs

@@ -13,7 +13,7 @@ public partial class SuggestedPostPaid
     public string Currency { get; set; } = default!;
 
     /// <summary><em>Optional</em>. The amount of the currency that was received by the channel in nanotoncoins; for payments in toncoins only</summary>
-    public int? Amount { get; set; }
+    public long? Amount { get; set; }
 
     /// <summary><em>Optional</em>. The amount of Telegram Stars that was received by the channel; for payments in Telegram Stars only</summary>
     [JsonPropertyName("star_amount")]

src/Telegram.Bot/Types/SuggestedPostPrice.cs

@@ -10,5 +10,5 @@ public partial class SuggestedPostPrice
 
     /// <summary>The amount of the currency that will be paid for the post in the <em>smallest units</em> of the currency, i.e. Telegram Stars or nanotoncoins. Currently, price in Telegram Stars must be between 5 and 100000, and price in nanotoncoins must be between 10000000 and 10000000000000.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
-    public int Amount { get; set; }
+    public long Amount { get; set; }
 }

test/Telegram.Bot.Tests.Integ/Payments/PaymentTests.cs

@@ -170,7 +170,7 @@ await Fixture.BotClient.AnswerPreCheckoutQuery(
         );
 
         PreliminaryInvoice preliminaryInvoice = paymentsBuilder.GetPreliminaryInvoice();
-        int totalAmount = paymentsBuilder.GetTotalAmount();
+        long totalAmount = paymentsBuilder.GetTotalAmount();
 
         Assert.Equal(UpdateType.PreCheckoutQuery, preCheckoutUpdate.Type);
         Assert.NotNull(query.Id);
@@ -246,7 +246,7 @@ await Fixture.BotClient.AnswerPreCheckoutQuery(
 
         Update successfulPaymentUpdate = await GetSuccessfulPaymentUpdate();
         SuccessfulPayment successfulPayment = successfulPaymentUpdate.Message!.SuccessfulPayment;
-        int totalAmount = paymentsBuilder.GetTotalAmount();
+        long totalAmount = paymentsBuilder.GetTotalAmount();
 
         Assert.Equal(totalAmount, successfulPayment!.TotalAmount);
         Assert.Equal("<my-payload>", successfulPayment.InvoicePayload);
@@ -308,10 +308,10 @@ await Fixture.BotClient.AnswerPreCheckoutQuery(
 
         Update successfulPaymentUpdate = await GetSuccessfulPaymentUpdate();
         SuccessfulPayment successfulPayment = successfulPaymentUpdate.Message!.SuccessfulPayment;
-        int totalAmount = paymentsBuilder.GetTotalAmount();
+        long totalAmount = paymentsBuilder.GetTotalAmount();
 
         int[] suggestedTips = [100, 150, 200];
-        int[] totalAmountWithTip = suggestedTips.Select(_ => _ + totalAmount).ToArray();
+        long[] totalAmountWithTip = [.. suggestedTips.Select(_ => _ + totalAmount)];
 
         Assert.Contains(totalAmountWithTip, _ => _ == successfulPayment!.TotalAmount);
         Assert.Equal("<my-payload>", successfulPayment!.InvoicePayload);
@@ -653,5 +653,5 @@ public static string FormatInstructionWithCurrency(FormattableString instruction
 public static class Extensions
 {
     // ReSharper disable once PossibleLossOfFraction
-    public static double CurrencyFormat(this int amount) => amount * 0.01;
+    public static double CurrencyFormat(this long amount) => amount * 0.01;
 }

test/Telegram.Bot.Tests.Integ/Payments/PaymentsBuilder.cs

@@ -170,13 +170,11 @@ public PreliminaryInvoice GetPreliminaryInvoice()
         };
     }
 
-    public Shipping GetShippingOptions() => new([.. _shippingOptions]);
-
-    public int GetTotalAmount() =>
+    public long GetTotalAmount() =>
         (_product?.ProductPrices.Sum(price => price.Amount) ?? 0) +
-        _shippingOptions.Take(1).Sum(x => x.Prices.Sum(p => p.Amount));
+        (_shippingOptions.FirstOrDefault()?.Prices.Sum(p => p.Amount) ?? 0);
 
-    public int GetTotalAmountWithoutShippingCost() => _product?.ProductPrices.Sum(price => price.Amount) ?? 0;
+    public long GetTotalAmountWithoutShippingCost() => _product?.ProductPrices.Sum(price => price.Amount) ?? 0;
 
     public async Task<Types.Message> MakeInvoiceRequest(TestsFixture fixture)
     {
@@ -357,11 +355,6 @@ public record PreliminaryInvoice
         public string Description { get; init; } = default!;
         public string? StartParameter { get; init; }
         public string Currency { get; init; } = default!;
-        public int TotalAmount { get; init; }
-    }
-
-    public record Shipping(IReadOnlyList<ShippingOption> ShippingOptions)
-    {
-        public int TotalAmount => ShippingOptions.Sum(x => x.Prices.Sum(p => p.Amount));
+        public long TotalAmount { get; init; }
     }
 }