Update CHANGELOG.md

9.4.2

.github/workflows/packages_publishing.yml

@@ -22,9 +22,10 @@ jobs:
         run: ./gradlew build
       - name: Publish to Gitea
         continue-on-error: true
-        run: ./gradlew publishAllPublicationsToGiteaRepository
+        run: ./gradlew publishAllPublicationsToInmoNexusRepository
         env:
-          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+          INMONEXUS_USER: ${{ secrets.INMONEXUS_USER }}
+          INMONEXUS_PASSWORD: ${{ secrets.INMONEXUS_PASSWORD }}
       - name: Publish to GithubPackages
         continue-on-error: true
         run: ./gradlew publishAllPublicationsToGithubPackagesRepository --no-parallel

CHANGELOG.md

@@ -1,5 +1,21 @@
 # TelegramBotAPI changelog
 
+## 9.4.3
+
+**IetfLanguageCode has been renamed to IetfLang in MicroUtils**
+
+* `Version`:
+  * `Kotlin`: `1.9.21` -> `1.9.22`
+  * `MicroUtils`: `0.20.19` -> `0.20.23`
+
+## 9.4.2
+
+* `Version`:
+  * `Serialization`: `1.6.1` -> `1.6.2`
+  * `Ktor`: `2.3.6` -> `2.3.7`
+  * `MicroUtils`: `0.20.15` -> `0.20.19`
+  * `UUID`: `0.8.1` -> `0.8.2`
+
 ## 9.4.1
 
 * Replace warning about two bots from `LongPolling` to `DefaultKtorRequestsExecutor`

build.gradle

@@ -25,7 +25,7 @@ allprojects {
         mavenLocal()
         mavenCentral()
         google()
-        maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" }
+        maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
     }
     if (it != rootProject.findProject("docs")) {
         tasks.whenTaskAdded { task ->

gradle.properties

@@ -6,4 +6,4 @@ kotlin.incremental=true
 kotlin.incremental.js=true
 
 library_group=dev.inmo
-library_version=9.4.1
+library_version=9.4.3

gradle/libs.versions.toml

@@ -1,19 +1,19 @@
 [versions]
 
-kotlin = "1.9.21"
-kotlin-serialization = "1.6.1"
+kotlin = "1.9.22"
+kotlin-serialization = "1.6.2"
 kotlin-coroutines = "1.7.3"
 
 javax-activation = "1.1.1"
 
 korlibs = "4.0.10"
-uuid = "0.8.1"
-ktor = "2.3.6"
+uuid = "0.8.2"
+ktor = "2.3.7"
 
-ksp = "1.9.20-1.0.14"
-kotlin-poet = "1.15.1"
+ksp = "1.9.21-1.0.16"
+kotlin-poet = "1.15.3"
 
-microutils = "0.20.15"
+microutils = "0.20.23"
 kslog = "1.3.1"
 
 versions = "0.50.0"

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip

publish.gradle

@@ -50,18 +50,14 @@ publishing {
             
                 }
             }
-            if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
+            if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
                 maven {
-                    name = "Gitea"
-                    url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
+                    name = "InmoNexus"
+                    url = uri("https://nexus.inmo.dev/repository/maven-releases/")
             
-                    credentials(HttpHeaderCredentials) {
-                        name = "Authorization"
-                        value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
-                    }
-            
-                    authentication {
-                        header(HttpHeaderAuthentication)
+                    credentials {
+                        username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
+                        password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
                     }
             
                 }

publish.kpsb

@@ -1 +1 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"${project.description}","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
+{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"${project.description}","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/DeleteMyCommands.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.extensions.api.bot
 
-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
+import dev.inmo.micro_utils.language_codes.IetfLang
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.bot.DeleteMyCommands
 import dev.inmo.tgbotapi.types.commands.BotCommandScope
@@ -8,10 +8,10 @@ import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
 
 suspend fun TelegramBot.deleteMyCommands(
     scope: BotCommandScope = BotCommandScopeDefault,
-    languageCode: IetfLanguageCode?
+    languageCode: IetfLang?
 ) = execute(DeleteMyCommands(scope, languageCode))
 
 suspend fun TelegramBot.deleteMyCommands(
     scope: BotCommandScope = BotCommandScopeDefault,
     languageCode: String? = null
-) = deleteMyCommands(scope, languageCode ?.let(::IetfLanguageCode))
+) = deleteMyCommands(scope, languageCode ?.let(::IetfLang))

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyCommands.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.extensions.api.bot
 
-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
+import dev.inmo.micro_utils.language_codes.IetfLang
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.bot.GetMyCommands
 import dev.inmo.tgbotapi.types.commands.BotCommandScope
@@ -8,10 +8,10 @@ import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
 
 suspend fun TelegramBot.getMyCommands(
     scope: BotCommandScope = BotCommandScopeDefault,
-    languageCode: IetfLanguageCode? = null
+    languageCode: IetfLang? = null
 ) = execute(GetMyCommands(scope, languageCode))
 
 suspend fun TelegramBot.getMyCommands(
     scope: BotCommandScope = BotCommandScopeDefault,
     languageCode: String?
-) = getMyCommands(scope, languageCode ?.let(::IetfLanguageCode))
+) = getMyCommands(scope, languageCode ?.let(::IetfLang))

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyDescription.kt

@@ -1,16 +1,13 @@
 package dev.inmo.tgbotapi.extensions.api.bot
 
-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
+import dev.inmo.micro_utils.language_codes.IetfLang
 import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.GetMyCommands
 import dev.inmo.tgbotapi.requests.bot.GetMyDescription
-import dev.inmo.tgbotapi.types.commands.BotCommandScope
-import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
 
 suspend fun TelegramBot.getMyDescription(
-    languageCode: IetfLanguageCode? = null
+    languageCode: IetfLang? = null
 ) = execute(GetMyDescription(languageCode))
 
 suspend fun TelegramBot.getMyDescription(
     languageCode: String?
-) = getMyDescription(languageCode ?.let(::IetfLanguageCode))
+) = getMyDescription(languageCode ?.let(::IetfLang))

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyName.kt

@@ -1,16 +1,13 @@
 package dev.inmo.tgbotapi.extensions.api.bot
 
-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
+import dev.inmo.micro_utils.language_codes.IetfLang
 import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.GetMyCommands
 import dev.inmo.tgbotapi.requests.bot.GetMyName
-import dev.inmo.tgbotapi.types.commands.BotCommandScope
-import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
 
 suspend fun TelegramBot.getMyName(
-    languageCode: IetfLanguageCode? = null
+    languageCode: IetfLang? = null
 ) = execute(GetMyName(languageCode))
 
 suspend fun TelegramBot.getMyName(
     languageCode: String?
-) = getMyName(languageCode ?.let(::IetfLanguageCode))
+) = getMyName(languageCode ?.let(::IetfLang))

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyShortDescription.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.extensions.api.bot
 
-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
+import dev.inmo.micro_utils.language_codes.IetfLang
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.bot.GetMyCommands
 import dev.inmo.tgbotapi.requests.bot.GetMyShortDescription
@@ -8,9 +8,9 @@ import dev.inmo.tgbotapi.types.commands.BotCommandScope
 import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
 
 suspend fun TelegramBot.getMyShortDescription(
-    languageCode: IetfLanguageCode? = null
+    languageCode: IetfLang? = null
 ) = execute(GetMyShortDescription(languageCode))
 
 suspend fun TelegramBot.getMyShortDescription(
     languageCode: String?
-) = getMyShortDescription(languageCode ?.let(::IetfLanguageCode))
+) = getMyShortDescription(languageCode ?.let(::IetfLang))

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyCommands.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.extensions.api.bot
 
-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
+import dev.inmo.micro_utils.language_codes.IetfLang
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.bot.SetMyCommands
 import dev.inmo.tgbotapi.types.BotCommand
@@ -10,20 +10,20 @@ import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
 suspend fun TelegramBot.setMyCommands(
     commands: List<BotCommand>,
     scope: BotCommandScope = BotCommandScopeDefault,
-    languageCode: IetfLanguageCode?
+    languageCode: IetfLang?
 ) = execute(SetMyCommands(commands, scope, languageCode))
 
 suspend fun TelegramBot.setMyCommands(
     vararg commands: BotCommand,
     scope: BotCommandScope = BotCommandScopeDefault,
-    languageCode: IetfLanguageCode?
+    languageCode: IetfLang?
 ) = setMyCommands(commands.toList(), scope, languageCode)
 
 suspend fun TelegramBot.setMyCommands(
     commands: List<BotCommand>,
     scope: BotCommandScope = BotCommandScopeDefault,
     languageCode: String? = null
-) = setMyCommands(commands, scope, languageCode ?.let(::IetfLanguageCode))
+) = setMyCommands(commands, scope, languageCode ?.let(::IetfLang))
 
 suspend fun TelegramBot.setMyCommands(
     vararg commands: BotCommand,

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyDescription.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.extensions.api.bot
 
-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
+import dev.inmo.micro_utils.language_codes.IetfLang
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.bot.GetMyCommands
 import dev.inmo.tgbotapi.requests.bot.GetMyDescription
@@ -10,10 +10,10 @@ import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
 
 suspend fun TelegramBot.setMyDescription(
     description: String? = null,
-    languageCode: IetfLanguageCode? = null
+    languageCode: IetfLang? = null
 ) = execute(SetMyDescription(description, languageCode))
 
 suspend fun TelegramBot.setMyDescription(
     description: String?,
     languageCode: String?
-) = setMyDescription(description, languageCode ?.let(::IetfLanguageCode))
+) = setMyDescription(description, languageCode ?.let(::IetfLang))

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyName.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.extensions.api.bot
 
-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
+import dev.inmo.micro_utils.language_codes.IetfLang
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.bot.GetMyCommands
 import dev.inmo.tgbotapi.requests.bot.GetMyName
@@ -10,10 +10,10 @@ import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
 
 suspend fun TelegramBot.setMyName(
     name: String? = null,
-    languageCode: IetfLanguageCode? = null
+    languageCode: IetfLang? = null
 ) = execute(SetMyName(name, languageCode))
 
 suspend fun TelegramBot.setMyName(
     name: String?,
     languageCode: String?
-) = setMyName(name, languageCode ?.let(::IetfLanguageCode))
+) = setMyName(name, languageCode ?.let(::IetfLang))

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyShortDescription.kt

@@ -1,15 +1,15 @@
 package dev.inmo.tgbotapi.extensions.api.bot
 
-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
+import dev.inmo.micro_utils.language_codes.IetfLang
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.bot.SetMyShortDescription
 
 suspend fun TelegramBot.setMyShortDescription(
     shortDescription: String? = null,
-    languageCode: IetfLanguageCode? = null
+    languageCode: IetfLang? = null
 ) = execute(SetMyShortDescription(shortDescription, languageCode))
 
 suspend fun TelegramBot.setMyShortDescription(
     shortDescription: String?,
     languageCode: String?
-) = setMyShortDescription(shortDescription, languageCode ?.let(::IetfLanguageCode))
+) = setMyShortDescription(shortDescription, languageCode ?.let(::IetfLang))

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()

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()

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>

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>

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>

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 {

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>

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>

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>

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

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))
 }

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()

tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/WebAppUser.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.webapps
 
-import dev.inmo.micro_utils.language_codes.IetfLanguageCode
+import dev.inmo.micro_utils.language_codes.IetfLang
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.chat.CommonBot
 import dev.inmo.tgbotapi.types.chat.CommonUser
@@ -42,7 +42,7 @@ fun WebAppUser.asUser() = if (isBot == true) {
         firstName = firstName,
         lastName = lastName ?: "",
         username = username ?.let(::Username),
-        ietfLanguageCode = languageCode ?.let(::IetfLanguageCode),
+        ietfLanguageCode = languageCode ?.let(::IetfLang),
         isPremium = isPremium
     )
 }