*MyCommands actualization

CHANGELOG.md

@@ -14,6 +14,7 @@
     
 * `Bot API 5.3`:
     * Add type `BotCommandScope`, its serializer `BotCommandScopeSerializer` and all its children
+    * New request `DeleteMyCommands` and updates in `GetMyCommands` and `SetMyCommands`
 
 ## 0.35.0
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/BotCommand.kt

@@ -0,0 +1,9 @@
+package dev.inmo.tgbotapi.requests.bot
+
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.commands.BotCommandScope
+
+sealed interface MyCommandsRequest<T : Any> : SimpleRequest<T> {
+    val scope: BotCommandScope
+    val languageCode: String?
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/DeleteMyCommands.kt

@@ -0,0 +1,22 @@
+package dev.inmo.tgbotapi.requests.bot
+
+import dev.inmo.tgbotapi.types.commands.*
+import dev.inmo.tgbotapi.types.languageCodeField
+import dev.inmo.tgbotapi.types.scopeField
+import kotlinx.serialization.*
+import kotlinx.serialization.builtins.serializer
+
+@Serializable
+data class DeleteMyCommands(
+    @SerialName(scopeField)
+    @Serializable(BotCommandScopeSerializer::class)
+    override val scope: BotCommandScope = BotCommandScopeDefault,
+    @SerialName(languageCodeField)
+    override val languageCode: String? = null
+) : MyCommandsRequest<Boolean> {
+    override fun method(): String  = "deleteMyCommands"
+    override val requestSerializer: SerializationStrategy<DeleteMyCommands> = serializer()
+    override val resultDeserializer: DeserializationStrategy<Boolean> = Boolean.serializer()
+
+    companion object : MyCommandsRequest<Boolean> by DeleteMyCommands()
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/GetMyCommands.kt

@@ -1,17 +1,26 @@
 package dev.inmo.tgbotapi.requests.bot
 
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
-import dev.inmo.tgbotapi.types.BotCommand
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.commands.*
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.ListSerializer
 
 private val getMyCommandsSerializer = ListSerializer(BotCommand.serializer())
 
 @Serializable
-object GetMyCommands : SimpleRequest<List<BotCommand>> {
+data class GetMyCommands(
+    @SerialName(scopeField)
+    @Serializable(BotCommandScopeSerializer::class)
+    override val scope: BotCommandScope = BotCommandScopeDefault,
+    @SerialName(languageCodeField)
+    override val languageCode: String? = null
+) : MyCommandsRequest<List<BotCommand>> {
     override fun method(): String = "getMyCommands"
     override val resultDeserializer: DeserializationStrategy<List<BotCommand>>
         get() = getMyCommandsSerializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
+
+    companion object : MyCommandsRequest<List<BotCommand>> by GetMyCommands()
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/SetMyCommands.kt

@@ -2,14 +2,20 @@ package dev.inmo.tgbotapi.requests.bot
 
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.commands.*
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.serializer
 
 @Serializable
 class SetMyCommands(
     @SerialName(botCommandsField)
-    val commands: List<BotCommand>
-) : SimpleRequest<Boolean> {
+    val commands: List<BotCommand>,
+    @SerialName(scopeField)
+    @Serializable(BotCommandScopeSerializer::class)
+    override val scope: BotCommandScope = BotCommandScopeDefault,
+    @SerialName(languageCodeField)
+    override val languageCode: String? = null
+) : MyCommandsRequest<Boolean> {
     override fun method(): String = "setMyCommands"
     override val resultDeserializer: DeserializationStrategy<Boolean>
         get() = Boolean.serializer()

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt

@@ -234,6 +234,7 @@ const val hideUrlField = "hide_url"
 
 const val botCommandField = "command"
 const val botCommandsField = "commands"
+const val scopeField = "scope"
 
 const val isMemberField = "is_member"
 const val canSendMessagesField = "can_send_messages"

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

@@ -0,0 +1,11 @@
+package dev.inmo.tgbotapi.extensions.api.bot
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.bot.DeleteMyCommands
+import dev.inmo.tgbotapi.types.commands.BotCommandScope
+import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
+
+suspend fun TelegramBot.deleteMyCommands(
+    scope: BotCommandScope = BotCommandScopeDefault,
+    languageCode: String? = null
+) = execute(DeleteMyCommands(scope, languageCode))

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

@@ -2,5 +2,10 @@ package dev.inmo.tgbotapi.extensions.api.bot
 
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.bot.GetMyCommands
+import dev.inmo.tgbotapi.types.commands.BotCommandScope
+import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
 
-suspend fun TelegramBot.getMyCommands() = execute(GetMyCommands)
+suspend fun TelegramBot.getMyCommands(
+    scope: BotCommandScope = BotCommandScopeDefault,
+    languageCode: String? = null
+) = execute(GetMyCommands(scope, languageCode))

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

@@ -3,11 +3,17 @@ package dev.inmo.tgbotapi.extensions.api.bot
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.bot.SetMyCommands
 import dev.inmo.tgbotapi.types.BotCommand
+import dev.inmo.tgbotapi.types.commands.BotCommandScope
+import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
 
 suspend fun TelegramBot.setMyCommands(
-    commands: List<BotCommand>
-) = execute(SetMyCommands(commands))
+    commands: List<BotCommand>,
+    scope: BotCommandScope = BotCommandScopeDefault,
+    languageCode: String? = null
+) = execute(SetMyCommands(commands, scope, languageCode))
 
 suspend fun TelegramBot.setMyCommands(
-    vararg commands: BotCommand
-) = setMyCommands(commands.toList())
+    vararg commands: BotCommand,
+    scope: BotCommandScope = BotCommandScopeDefault,
+    languageCode: String? = null
+) = setMyCommands(commands.toList(), scope, languageCode)