From 8ec209422afb39c0c3230c4c2e5775435161125a Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 16 Mar 2024 22:47:17 +0600 Subject: [PATCH] ShippingOptionId now is value class --- CHANGELOG.md | 1 + tgbotapi.core/api/tgbotapi.core.api | 48 +++++++++++++++---- .../kotlin/dev/inmo/tgbotapi/types/Common.kt | 1 - .../inmo/tgbotapi/types/ShippingOptionId.kt | 16 +++++++ .../types/payments/PreCheckoutQuery.kt | 2 +- .../tgbotapi/types/payments/ShippingOption.kt | 2 +- .../utils/extensions/raw/PreCheckoutQuery.kt | 4 +- 7 files changed, 60 insertions(+), 14 deletions(-) create mode 100644 tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ShippingOptionId.kt diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f8d4ee619..fd93433ae7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ * `InlineMessageIdentifier` has been renamed to `InlineMessageId` and now is `value class` * `ShippingQueryIdentifier` has been renamed to `ShippingQueryId` and now is `value class` * `Identifier` has been renamed to `RawChatId` and now is `value class` + * `ShippingOptionIdentifier` has been renamed to `ShippingOptionId` and now is `value class` ## 10.1.2 diff --git a/tgbotapi.core/api/tgbotapi.core.api b/tgbotapi.core/api/tgbotapi.core.api index 63716e5385..a023bd4ebd 100644 --- a/tgbotapi.core/api/tgbotapi.core.api +++ b/tgbotapi.core/api/tgbotapi.core.api @@ -10473,6 +10473,36 @@ public final class dev/inmo/tgbotapi/types/SecondaryChatInviteLink$DefaultImpls public static fun isPrimary (Ldev/inmo/tgbotapi/types/SecondaryChatInviteLink;)Z } +public final class dev/inmo/tgbotapi/types/ShippingOptionId { + public static final field Companion Ldev/inmo/tgbotapi/types/ShippingOptionId$Companion; + public static final synthetic fun box-impl (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/ShippingOptionId; + public static fun constructor-impl (Ljava/lang/String;)Ljava/lang/String; + public fun equals (Ljava/lang/Object;)Z + public static fun equals-impl (Ljava/lang/String;Ljava/lang/Object;)Z + public static final fun equals-impl0 (Ljava/lang/String;Ljava/lang/String;)Z + public final fun getString ()Ljava/lang/String; + public fun hashCode ()I + public static fun hashCode-impl (Ljava/lang/String;)I + public fun toString ()Ljava/lang/String; + public static fun toString-impl (Ljava/lang/String;)Ljava/lang/String; + public final synthetic fun unbox-impl ()Ljava/lang/String; +} + +public final class dev/inmo/tgbotapi/types/ShippingOptionId$$serializer : kotlinx/serialization/internal/GeneratedSerializer { + public static final field INSTANCE Ldev/inmo/tgbotapi/types/ShippingOptionId$$serializer; + public fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize-_4cU8P0 (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/String; + public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize-IjckslA (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/String;)V + public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; +} + +public final class dev/inmo/tgbotapi/types/ShippingOptionId$Companion { + public final fun serializer ()Lkotlinx/serialization/KSerializer; +} + public final class dev/inmo/tgbotapi/types/ShippingQueryId { public static final field Companion Ldev/inmo/tgbotapi/types/ShippingQueryId$Companion; public static final synthetic fun box-impl (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/ShippingQueryId; @@ -21649,10 +21679,10 @@ public final class dev/inmo/tgbotapi/types/payments/PreCheckoutQuery : dev/inmo/ public final fun component3 ()Ljava/lang/String; public final fun component4 ()J public final fun component5 ()Ljava/lang/String; - public final fun component6 ()Ljava/lang/String; + public final fun component6-GnnktA4 ()Ljava/lang/String; public final fun component7 ()Ldev/inmo/tgbotapi/types/payments/OrderInfo; - public final fun copy-KzUIE5U (Ljava/lang/String;Ldev/inmo/tgbotapi/types/chat/User;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/payments/OrderInfo;)Ldev/inmo/tgbotapi/types/payments/PreCheckoutQuery; - public static synthetic fun copy-KzUIE5U$default (Ldev/inmo/tgbotapi/types/payments/PreCheckoutQuery;Ljava/lang/String;Ldev/inmo/tgbotapi/types/chat/User;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/payments/OrderInfo;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/payments/PreCheckoutQuery; + public final fun copy-caBx8O4 (Ljava/lang/String;Ldev/inmo/tgbotapi/types/chat/User;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/payments/OrderInfo;)Ldev/inmo/tgbotapi/types/payments/PreCheckoutQuery; + public static synthetic fun copy-caBx8O4$default (Ldev/inmo/tgbotapi/types/payments/PreCheckoutQuery;Ljava/lang/String;Ldev/inmo/tgbotapi/types/chat/User;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/payments/OrderInfo;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/payments/PreCheckoutQuery; public fun equals (Ljava/lang/Object;)Z public fun getAdaptedMajorityTotalAmount ()D public fun getAmount ()J @@ -21661,7 +21691,7 @@ public final class dev/inmo/tgbotapi/types/payments/PreCheckoutQuery : dev/inmo/ public final fun getId-vkd00ps ()Ljava/lang/String; public final fun getInvoicePayload ()Ljava/lang/String; public final fun getOrderInfo ()Ldev/inmo/tgbotapi/types/payments/OrderInfo; - public final fun getShippingOptionId ()Ljava/lang/String; + public final fun getShippingOptionId-GnnktA4 ()Ljava/lang/String; public fun getUser ()Ldev/inmo/tgbotapi/types/chat/User; public fun hashCode ()I public fun toString ()Ljava/lang/String; @@ -21722,14 +21752,14 @@ public final class dev/inmo/tgbotapi/types/payments/ShippingAddress$Companion { public final class dev/inmo/tgbotapi/types/payments/ShippingOption : dev/inmo/tgbotapi/types/payments/abstracts/Priced { public static final field Companion Ldev/inmo/tgbotapi/types/payments/ShippingOption$Companion; - public fun (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;)V - public final fun component1 ()Ljava/lang/String; + public synthetic fun (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun component1-HilhuNU ()Ljava/lang/String; public final fun component2 ()Ljava/lang/String; public final fun component3 ()Ljava/util/List; - public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;)Ldev/inmo/tgbotapi/types/payments/ShippingOption; - public static synthetic fun copy$default (Ldev/inmo/tgbotapi/types/payments/ShippingOption;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/payments/ShippingOption; + public final fun copy-8iYHifA (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;)Ldev/inmo/tgbotapi/types/payments/ShippingOption; + public static synthetic fun copy-8iYHifA$default (Ldev/inmo/tgbotapi/types/payments/ShippingOption;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/payments/ShippingOption; public fun equals (Ljava/lang/Object;)Z - public final fun getId ()Ljava/lang/String; + public final fun getId-HilhuNU ()Ljava/lang/String; public fun getPrices ()Ljava/util/List; public final fun getTitle ()Ljava/lang/String; public fun hashCode ()I diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt index 6c35adb88e..0bcd83beb1 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt @@ -14,7 +14,6 @@ typealias ForwardSenderName = String typealias AuthorSignature = ForwardSignature typealias PaymentQueryIdentifier = String typealias InvoicePayload = String -typealias ShippingOptionIdentifier = String typealias StartParameter = String typealias PollIdentifier = String typealias StickerSetName = String diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ShippingOptionId.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ShippingOptionId.kt new file mode 100644 index 0000000000..820d0d0a10 --- /dev/null +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ShippingOptionId.kt @@ -0,0 +1,16 @@ +package dev.inmo.tgbotapi.types + +import kotlinx.serialization.Serializable +import kotlin.jvm.JvmInline + +@Serializable +@JvmInline +value class ShippingOptionId( + val string: String +) { + override fun toString(): String { + return string + } +} +@Deprecated("ShippingOptionId", ReplaceWith("ShippingOptionId", "dev.inmo.tgbotapi.types.ShippingOptionId")) +typealias ShippingOptionIdentifier = ShippingOptionId \ No newline at end of file diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/PreCheckoutQuery.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/PreCheckoutQuery.kt index 368afd6d4c..f877ad05aa 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/PreCheckoutQuery.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/PreCheckoutQuery.kt @@ -21,7 +21,7 @@ data class PreCheckoutQuery( @SerialName(invoicePayloadField) val invoicePayload: InvoicePayload, @SerialName(shippingOptionIdField) - val shippingOptionId: ShippingOptionIdentifier? = null, + val shippingOptionId: ShippingOptionId? = null, @SerialName(orderInfoField) val orderInfo: OrderInfo? = null ) : Currencied, Amounted, FromUser diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/ShippingOption.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/ShippingOption.kt index 5bb102aeca..7e5bd288fb 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/ShippingOption.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/ShippingOption.kt @@ -9,7 +9,7 @@ import kotlinx.serialization.builtins.ListSerializer @Serializable data class ShippingOption( @SerialName(idField) - val id: ShippingOptionIdentifier, + val id: ShippingOptionId, @SerialName(titleField) val title: String, @Serializable(LabeledPricesSerializer::class) diff --git a/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/raw/PreCheckoutQuery.kt b/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/raw/PreCheckoutQuery.kt index 1c1226c925..d589245c80 100644 --- a/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/raw/PreCheckoutQuery.kt +++ b/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/raw/PreCheckoutQuery.kt @@ -1,7 +1,7 @@ package dev.inmo.tgbotapi.extensions.utils.extensions.raw import dev.inmo.tgbotapi.types.InvoicePayload -import dev.inmo.tgbotapi.types.ShippingOptionIdentifier +import dev.inmo.tgbotapi.types.ShippingOptionId import dev.inmo.tgbotapi.types.payments.OrderInfo import dev.inmo.tgbotapi.types.payments.PreCheckoutQuery import dev.inmo.tgbotapi.utils.RiskFeature @@ -13,7 +13,7 @@ val PreCheckoutQuery.total_amount: Long val PreCheckoutQuery.invoice_payload: InvoicePayload get() = invoicePayload @RiskFeature(RawFieldsUsageWarning) -val PreCheckoutQuery.shipping_option_id: ShippingOptionIdentifier? +val PreCheckoutQuery.shipping_option_id: ShippingOptionId? get() = shippingOptionId @RiskFeature(RawFieldsUsageWarning) val PreCheckoutQuery.order_info: OrderInfo?