upgrades

2025-09-15 13:19:30 +00:00 · 2023-12-24 19:25:41 +06:00
parent 4085f721be
commit 9a7dd6ec9a
22 changed files with 84 additions and 84 deletions
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/DeleteMyCommands.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/DeleteMyCommands.kt
@@ -1,7 +1,8 @@
 package dev.inmo.tgbotapi.requests.bot

-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
-import dev.inmo.micro_utils.language_codes.IetfLanguageCodeSerializer
+import dev.inmo.micro_utils.language_codes.IetfLang
+import dev.inmo.micro_utils.language_codes.IetfLangSerializer
+
 import dev.inmo.tgbotapi.types.commands.*
 import dev.inmo.tgbotapi.types.languageCodeField
 import dev.inmo.tgbotapi.types.scopeField
@@ -14,8 +15,8 @@ data class DeleteMyCommands(
    @Serializable(BotCommandScopeSerializer::class)
    override val scope: BotCommandScope = BotCommandScopeDefault,
    @SerialName(languageCodeField)
-    @Serializable(IetfLanguageCodeSerializer::class)
-    override val ietfLanguageCode: IetfLanguageCode? = null
+    @Serializable(IetfLangSerializer::class)
+    override val ietfLanguageCode: IetfLang? = null
 ) : MyCommandsRequest<Boolean> {
    override fun method(): String  = "deleteMyCommands"
    override val requestSerializer: SerializationStrategy<DeleteMyCommands>
@@ -28,7 +29,7 @@ data class DeleteMyCommands(
        languageCode: String?
    ) : this(
        scope,
-        languageCode ?.let(::IetfLanguageCode)
+        languageCode ?.let(::IetfLang)
    )

    companion object : MyCommandsRequest<Boolean> by DeleteMyCommands()
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/GetMyCommands.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/GetMyCommands.kt
@@ -1,7 +1,8 @@
 package dev.inmo.tgbotapi.requests.bot

-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
-import dev.inmo.micro_utils.language_codes.IetfLanguageCodeSerializer
+import dev.inmo.micro_utils.language_codes.IetfLang
+import dev.inmo.micro_utils.language_codes.IetfLangSerializer
+
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.commands.*
 import kotlinx.serialization.*
@@ -15,8 +16,8 @@ data class GetMyCommands(
    @Serializable(BotCommandScopeSerializer::class)
    override val scope: BotCommandScope = BotCommandScopeDefault,
    @SerialName(languageCodeField)
-    @Serializable(IetfLanguageCodeSerializer::class)
-    override val ietfLanguageCode: IetfLanguageCode? = null
+    @Serializable(IetfLangSerializer::class)
+    override val ietfLanguageCode: IetfLang? = null
 ) : MyCommandsRequest<List<BotCommand>> {
    override fun method(): String = "getMyCommands"
    override val resultDeserializer: DeserializationStrategy<List<BotCommand>>
@@ -29,7 +30,7 @@ data class GetMyCommands(
        languageCode: String?
    ) : this(
        scope,
-        languageCode ?.let(::IetfLanguageCode)
+        languageCode ?.let(::IetfLang)
    )

    companion object : MyCommandsRequest<List<BotCommand>> by GetMyCommands()
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/GetMyDescription.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/GetMyDescription.kt
@@ -1,7 +1,8 @@
 package dev.inmo.tgbotapi.requests.bot

-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
-import dev.inmo.micro_utils.language_codes.IetfLanguageCodeSerializer
+import dev.inmo.micro_utils.language_codes.IetfLang
+import dev.inmo.micro_utils.language_codes.IetfLangSerializer
+
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.abstracts.WithOptionalLanguageCode
@@ -12,8 +13,8 @@ import kotlinx.serialization.builtins.serializer
@Serializable
 class GetMyDescription(
    @SerialName(languageCodeField)
-    @Serializable(IetfLanguageCodeSerializer::class)
-    override val ietfLanguageCode: IetfLanguageCode? = null
+    @Serializable(IetfLangSerializer::class)
+    override val ietfLanguageCode: IetfLang? = null
 ) : SimpleRequest<BotDescription>, WithOptionalLanguageCode {
    override fun method(): String = "getMyDescription"
    override val resultDeserializer: DeserializationStrategy<BotDescription>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/GetMyName.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/GetMyName.kt
@@ -1,7 +1,8 @@
 package dev.inmo.tgbotapi.requests.bot

-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
-import dev.inmo.micro_utils.language_codes.IetfLanguageCodeSerializer
+import dev.inmo.micro_utils.language_codes.IetfLang
+import dev.inmo.micro_utils.language_codes.IetfLangSerializer
+
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.abstracts.WithOptionalLanguageCode
@@ -12,8 +13,8 @@ import kotlinx.serialization.builtins.serializer
@Serializable
 class GetMyName(
    @SerialName(languageCodeField)
-    @Serializable(IetfLanguageCodeSerializer::class)
-    override val ietfLanguageCode: IetfLanguageCode? = null
+    @Serializable(IetfLangSerializer::class)
+    override val ietfLanguageCode: IetfLang? = null
 ) : SimpleRequest<BotName>, WithOptionalLanguageCode {
    override fun method(): String = "getMyName"
    override val resultDeserializer: DeserializationStrategy<BotName>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/GetMyShortDescription.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/GetMyShortDescription.kt
@@ -1,7 +1,8 @@
 package dev.inmo.tgbotapi.requests.bot

-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
-import dev.inmo.micro_utils.language_codes.IetfLanguageCodeSerializer
+import dev.inmo.micro_utils.language_codes.IetfLang
+import dev.inmo.micro_utils.language_codes.IetfLangSerializer
+
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.abstracts.WithOptionalLanguageCode
@@ -12,8 +13,8 @@ import kotlinx.serialization.builtins.serializer
@Serializable
 class GetMyShortDescription(
    @SerialName(languageCodeField)
-    @Serializable(IetfLanguageCodeSerializer::class)
-    override val ietfLanguageCode: IetfLanguageCode? = null
+    @Serializable(IetfLangSerializer::class)
+    override val ietfLanguageCode: IetfLang? = null
 ) : SimpleRequest<BotShortDescription>, WithOptionalLanguageCode {
    override fun method(): String = "getMyShortDescription"
    override val resultDeserializer: DeserializationStrategy<BotShortDescription>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/SetMyCommands.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/SetMyCommands.kt
@@ -1,7 +1,8 @@
 package dev.inmo.tgbotapi.requests.bot

-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
-import dev.inmo.micro_utils.language_codes.IetfLanguageCodeSerializer
+import dev.inmo.micro_utils.language_codes.IetfLang
+import dev.inmo.micro_utils.language_codes.IetfLangSerializer
+
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.commands.*
 import kotlinx.serialization.*
@@ -15,8 +16,8 @@ class SetMyCommands(
    @Serializable(BotCommandScopeSerializer::class)
    override val scope: BotCommandScope = BotCommandScopeDefault,
    @SerialName(languageCodeField)
-    @Serializable(IetfLanguageCodeSerializer::class)
-    override val ietfLanguageCode: IetfLanguageCode? = null
+    @Serializable(IetfLangSerializer::class)
+    override val ietfLanguageCode: IetfLang? = null
 ) : MyCommandsRequest<Boolean> {
    override fun method(): String = "setMyCommands"
    override val resultDeserializer: DeserializationStrategy<Boolean>
@@ -31,7 +32,7 @@ class SetMyCommands(
    ) : this(
        commands,
        scope,
-        languageCode ?.let(::IetfLanguageCode)
+        languageCode ?.let(::IetfLang)
    )

    init {
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/SetMyDescription.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/SetMyDescription.kt
@@ -1,7 +1,7 @@
 package dev.inmo.tgbotapi.requests.bot

-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
-import dev.inmo.micro_utils.language_codes.IetfLanguageCodeSerializer
+import dev.inmo.micro_utils.language_codes.IetfLang
+import dev.inmo.micro_utils.language_codes.IetfLangSerializer
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.abstracts.WithOptionalLanguageCode
@@ -14,8 +14,8 @@ class SetMyDescription(
    @SerialName(descriptionField)
    val description: String? = null,
    @SerialName(languageCodeField)
-    @Serializable(IetfLanguageCodeSerializer::class)
-    override val ietfLanguageCode: IetfLanguageCode? = null
+    @Serializable(IetfLangSerializer::class)
+    override val ietfLanguageCode: IetfLang? = null
 ) : SimpleRequest<Boolean>, WithOptionalLanguageCode {
    override fun method(): String = "setMyDescription"
    override val resultDeserializer: DeserializationStrategy<Boolean>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/SetMyName.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/SetMyName.kt
@@ -1,7 +1,7 @@
 package dev.inmo.tgbotapi.requests.bot

-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
-import dev.inmo.micro_utils.language_codes.IetfLanguageCodeSerializer
+import dev.inmo.micro_utils.language_codes.IetfLang
+import dev.inmo.micro_utils.language_codes.IetfLangSerializer
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.abstracts.WithOptionalLanguageCode
@@ -14,8 +14,8 @@ class SetMyName(
    @SerialName(nameField)
    val name: String? = null,
    @SerialName(languageCodeField)
-    @Serializable(IetfLanguageCodeSerializer::class)
-    override val ietfLanguageCode: IetfLanguageCode? = null
+    @Serializable(IetfLangSerializer::class)
+    override val ietfLanguageCode: IetfLang? = null
 ) : SimpleRequest<Boolean>, WithOptionalLanguageCode {
    override fun method(): String = "setMyName"
    override val resultDeserializer: DeserializationStrategy<Boolean>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/SetMyShortDescription.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/SetMyShortDescription.kt
@@ -1,7 +1,7 @@
 package dev.inmo.tgbotapi.requests.bot

-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
-import dev.inmo.micro_utils.language_codes.IetfLanguageCodeSerializer
+import dev.inmo.micro_utils.language_codes.IetfLang
+import dev.inmo.micro_utils.language_codes.IetfLangSerializer
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.abstracts.WithOptionalLanguageCode
@@ -14,8 +14,8 @@ class SetMyShortDescription(
    @SerialName(shortDescriptionField)
    val shortDescription: String? = null,
    @SerialName(languageCodeField)
-    @Serializable(IetfLanguageCodeSerializer::class)
-    override val ietfLanguageCode: IetfLanguageCode? = null
+    @Serializable(IetfLangSerializer::class)
+    override val ietfLanguageCode: IetfLang? = null
 ) : SimpleRequest<Boolean>, WithOptionalLanguageCode {
    override fun method(): String = "setMyShortDescription"
    override val resultDeserializer: DeserializationStrategy<Boolean>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/abstracts/WithOptionalLanguageCode.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/abstracts/WithOptionalLanguageCode.kt
@@ -1,9 +1,9 @@
 package dev.inmo.tgbotapi.types.abstracts

-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
+import dev.inmo.micro_utils.language_codes.IetfLang

 interface WithOptionalLanguageCode {
-    val ietfLanguageCode: IetfLanguageCode?
+    val ietfLanguageCode: IetfLang?

    val languageCode: String?
        get() = ietfLanguageCode ?.code
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/Impls.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/Impls.kt
@@ -1,7 +1,7 @@
 package dev.inmo.tgbotapi.types.chat

-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
-import dev.inmo.micro_utils.language_codes.IetfLanguageCodeSerializer
+import dev.inmo.micro_utils.language_codes.IetfLang
+import dev.inmo.micro_utils.language_codes.IetfLangSerializer
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.abstracts.WithOptionalLanguageCode
 import dev.inmo.tgbotapi.utils.RiskFeature
@@ -99,8 +99,8 @@ data class CommonUser(
    @SerialName(usernameField)
    override val username: Username? = null,
    @SerialName(languageCodeField)
-    @Serializable(IetfLanguageCodeSerializer::class)
-    override val ietfLanguageCode: IetfLanguageCode? = null,
+    @Serializable(IetfLangSerializer::class)
+    override val ietfLanguageCode: IetfLang? = null,
    @SerialName(isPremiumField)
    override val isPremium: Boolean = false,
    @SerialName(addedToAttachmentMenuField)
@@ -112,5 +112,5 @@ data class CommonUser(
        lastName: String = "",
        username: Username? = null,
        languageCode: String
-    ) : this(id, firstName, lastName, username, IetfLanguageCode(languageCode))
+    ) : this(id, firstName, lastName, username, IetfLang(languageCode))
 }
--- a/tgbotapi.core/src/jvmMain/kotlin/dev/inmo/tgbotapi/types/UserLocale.kt
+++ b/tgbotapi.core/src/jvmMain/kotlin/dev/inmo/tgbotapi/types/UserLocale.kt
@@ -1,8 +1,8 @@
 package dev.inmo.tgbotapi.types

-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
+import dev.inmo.micro_utils.language_codes.IetfLang
 import dev.inmo.tgbotapi.types.abstracts.WithOptionalLanguageCode
 import java.util.*

-fun IetfLanguageCode?.javaLocale() = this ?.code ?.let { Locale.forLanguageTag(it) }
+fun IetfLang?.javaLocale() = this ?.code ?.let { Locale.forLanguageTag(it) }
 fun WithOptionalLanguageCode?.javaLocale() = this ?.ietfLanguageCode ?.javaLocale()