diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/DeleteMyCommands.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/DeleteMyCommands.kt index 3995e5384a..c7a447c65b 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/DeleteMyCommands.kt +++ b/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)) diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyCommands.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyCommands.kt index 9fe8119ea6..cbb4283076 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyCommands.kt +++ b/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)) diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyDescription.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyDescription.kt index acb3288ed2..cf551df0d2 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyDescription.kt +++ b/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)) diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyName.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyName.kt index 7db1ff1716..4783234dd9 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyName.kt +++ b/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)) diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyShortDescription.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyShortDescription.kt index bfebfef460..32dc212ec3 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyShortDescription.kt +++ b/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)) diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyCommands.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyCommands.kt index e7f5ef01bc..ec67a624c8 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyCommands.kt +++ b/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, 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, 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, diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyDescription.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyDescription.kt index 370ca5a9a7..11f23cb34c 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyDescription.kt +++ b/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)) diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyName.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyName.kt index 3af8abcbda..7e727c1fc4 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyName.kt +++ b/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)) diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyShortDescription.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyShortDescription.kt index 2fcc869793..9431090b54 100644 --- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyShortDescription.kt +++ b/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)) diff --git 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 index cdea8f87b8..ec4e573c6d 100644 --- 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 { override fun method(): String = "deleteMyCommands" override val requestSerializer: SerializationStrategy @@ -28,7 +29,7 @@ data class DeleteMyCommands( languageCode: String? ) : this( scope, - languageCode ?.let(::IetfLanguageCode) + languageCode ?.let(::IetfLang) ) companion object : MyCommandsRequest by DeleteMyCommands() diff --git 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 index 511fc9e33f..d3e617c06c 100644 --- 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> { override fun method(): String = "getMyCommands" override val resultDeserializer: DeserializationStrategy> @@ -29,7 +30,7 @@ data class GetMyCommands( languageCode: String? ) : this( scope, - languageCode ?.let(::IetfLanguageCode) + languageCode ?.let(::IetfLang) ) companion object : MyCommandsRequest> by GetMyCommands() diff --git 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 index fc971d3ea2..6edf46c4d7 100644 --- 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, WithOptionalLanguageCode { override fun method(): String = "getMyDescription" override val resultDeserializer: DeserializationStrategy diff --git 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 index 94c606ef2b..ad5c7709a4 100644 --- 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, WithOptionalLanguageCode { override fun method(): String = "getMyName" override val resultDeserializer: DeserializationStrategy diff --git 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 index c12ff05551..78c65802aa 100644 --- 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, WithOptionalLanguageCode { override fun method(): String = "getMyShortDescription" override val resultDeserializer: DeserializationStrategy diff --git 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 index 6df10c13b1..10d75b5a52 100644 --- 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 { override fun method(): String = "setMyCommands" override val resultDeserializer: DeserializationStrategy @@ -31,7 +32,7 @@ class SetMyCommands( ) : this( commands, scope, - languageCode ?.let(::IetfLanguageCode) + languageCode ?.let(::IetfLang) ) init { diff --git 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 index f0ce0520c9..5e1e8d893f 100644 --- 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, WithOptionalLanguageCode { override fun method(): String = "setMyDescription" override val resultDeserializer: DeserializationStrategy diff --git 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 index f1d867dd5e..9d0a90524b 100644 --- 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, WithOptionalLanguageCode { override fun method(): String = "setMyName" override val resultDeserializer: DeserializationStrategy diff --git 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 index 1a11061860..cda3e11875 100644 --- 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, WithOptionalLanguageCode { override fun method(): String = "setMyShortDescription" override val resultDeserializer: DeserializationStrategy diff --git 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 index 125cb17826..588243fac3 100644 --- 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 diff --git 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 index 7588c3f55d..70ce032703 100644 --- 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)) } diff --git a/tgbotapi.core/src/jvmMain/kotlin/dev/inmo/tgbotapi/types/UserLocale.kt b/tgbotapi.core/src/jvmMain/kotlin/dev/inmo/tgbotapi/types/UserLocale.kt index 007efedfd0..bb8a49b824 100644 --- 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() diff --git a/tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/WebAppUser.kt b/tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/WebAppUser.kt index 75a018e789..46d834af4c 100644 --- a/tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/WebAppUser.kt +++ b/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 ) }