and more... :)

CHANGELOG.md

@@ -15,6 +15,7 @@
 * `Bot API 5.3`:
     * Add type `BotCommandScope`, its serializer `BotCommandScopeSerializer` and all its children
     * New request `DeleteMyCommands` and updates in `GetMyCommands` and `SetMyCommands`
+    * Renames according to `And more` of [June 25, 2021](https://core.telegram.org/bots/api-changelog#june-25-2021) update
 
 ## 0.35.0
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/get/GetChatMemberCount.kt

@@ -8,13 +8,16 @@ import kotlinx.serialization.*
 import kotlinx.serialization.builtins.serializer
 
 @Serializable
-data class GetChatMembersCount(
+data class GetChatMemberCount(
     @SerialName(chatIdField)
     override val chatId: ChatIdentifier
 ): ChatRequest, SimpleRequest<Int> {
-    override fun method(): String = "getChatMembersCount"
+    override fun method(): String = "getChatMemberCount"
     override val resultDeserializer: DeserializationStrategy<Int>
         get() = Int.serializer()
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+@Deprecated("Renamed", ReplaceWith("GetChatMemberCount", "dev.inmo.tgbotapi.requests.chat.get.GetChatMemberCount"))
+typealias GetChatMembersCount = GetChatMemberCount

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/BanChatMember.kt

@@ -7,7 +7,7 @@ import kotlinx.serialization.*
 import kotlinx.serialization.builtins.serializer
 
 @Serializable
-data class KickChatMember(
+data class BanChatMember(
     @SerialName(chatIdField)
     override val chatId: ChatIdentifier,
     @SerialName(userIdField)
@@ -17,9 +17,12 @@ data class KickChatMember(
     @SerialName(revokeMessagesField)
     val revokeMessages: Boolean? = null
 ) : ChatMemberRequest<Boolean>, UntilDate {
-    override fun method(): String = "kickChatMember"
+    override fun method(): String = "banChatMember"
     override val resultDeserializer: DeserializationStrategy<Boolean>
         get() = Boolean.serializer()
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+@Deprecated("Renamed", ReplaceWith("BanChatMember", "dev.inmo.tgbotapi.requests.chat.members.BanChatMember"))
+typealias KickChatMember = BanChatMember

tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChatMemberCount.kt

@@ -0,0 +1,24 @@
+package dev.inmo.tgbotapi.extensions.api.chat.get
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.chat.get.GetChatMemberCount
+import dev.inmo.tgbotapi.types.ChatIdentifier
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
+
+suspend fun TelegramBot.getChatMemberCount(
+    chatId: ChatIdentifier
+) = execute(GetChatMemberCount(chatId))
+
+suspend fun TelegramBot.getChatMemberCount(
+    chat: PublicChat
+) = getChatMemberCount(chat.id)
+
+@Deprecated("Renamed", ReplaceWith("getChatMemberCount", "dev.inmo.tgbotapi.extensions.api.chat.get.getChatMemberCount"))
+suspend fun TelegramBot.getChatMembersCount(
+    chatId: ChatIdentifier
+) = getChatMemberCount(chatId)
+
+@Deprecated("Renamed", ReplaceWith("getChatMemberCount", "dev.inmo.tgbotapi.extensions.api.chat.get.getChatMemberCount"))
+suspend fun TelegramBot.getChatMembersCount(
+    chat: PublicChat
+) = getChatMemberCount(chat)

tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChatMembersCount.kt

@@ -1,14 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.get
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.get.GetChatMembersCount
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
-
-suspend fun TelegramBot.getChatMembersCount(
-    chatId: ChatIdentifier
-) = execute(GetChatMembersCount(chatId))
-
-suspend fun TelegramBot.getChatMembersCount(
-    chat: PublicChat
-) = getChatMembersCount(chat.id)

tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/BanChatMember.kt

@@ -0,0 +1,66 @@
+package dev.inmo.tgbotapi.extensions.api.chat.members
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.chat.members.BanChatMember
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
+
+suspend fun TelegramBot.banChatMember(
+    chatId: ChatIdentifier,
+    userId: UserId,
+    untilDate: TelegramDate? = null,
+    revokeMessages: Boolean? = null
+) = execute(BanChatMember(chatId, userId, untilDate, revokeMessages))
+
+suspend fun TelegramBot.banChatMember(
+    chat: PublicChat,
+    userId: UserId,
+    untilDate: TelegramDate? = null,
+    revokeMessages: Boolean? = null
+) = banChatMember(chat.id, userId, untilDate, revokeMessages)
+
+suspend fun TelegramBot.banChatMember(
+    chatId: ChatId,
+    user: User,
+    untilDate: TelegramDate? = null,
+    revokeMessages: Boolean? = null
+) = banChatMember(chatId, user.id, untilDate, revokeMessages)
+
+suspend fun TelegramBot.banChatMember(
+    chat: PublicChat,
+    user: User,
+    untilDate: TelegramDate? = null,
+    revokeMessages: Boolean? = null
+) = banChatMember(chat.id, user.id, untilDate, revokeMessages)
+
+@Deprecated("Renamed", ReplaceWith("banChatMember", "dev.inmo.tgbotapi.extensions.api.chat.members.banChatMember"))
+suspend fun TelegramBot.kickChatMember(
+    chatId: ChatIdentifier,
+    userId: UserId,
+    untilDate: TelegramDate? = null,
+    revokeMessages: Boolean? = null
+) = banChatMember(chatId, userId, untilDate, revokeMessages)
+
+@Deprecated("Renamed", ReplaceWith("banChatMember", "dev.inmo.tgbotapi.extensions.api.chat.members.banChatMember"))
+suspend fun TelegramBot.kickChatMember(
+    chat: PublicChat,
+    userId: UserId,
+    untilDate: TelegramDate? = null,
+    revokeMessages: Boolean? = null
+) = banChatMember(chat, userId, untilDate, revokeMessages)
+
+@Deprecated("Renamed", ReplaceWith("banChatMember", "dev.inmo.tgbotapi.extensions.api.chat.members.banChatMember"))
+suspend fun TelegramBot.kickChatMember(
+    chatId: ChatId,
+    user: User,
+    untilDate: TelegramDate? = null,
+    revokeMessages: Boolean? = null
+) = banChatMember(chatId, user, untilDate, revokeMessages)
+
+@Deprecated("Renamed", ReplaceWith("banChatMember", "dev.inmo.tgbotapi.extensions.api.chat.members.banChatMember"))
+suspend fun TelegramBot.kickChatMember(
+    chat: PublicChat,
+    user: User,
+    untilDate: TelegramDate? = null,
+    revokeMessages: Boolean? = null
+) = banChatMember(chat, user, untilDate, revokeMessages)

tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/KickChatMember.kt

@@ -1,34 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.members
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.members.KickChatMember
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
-
-suspend fun TelegramBot.kickChatMember(
-    chatId: ChatIdentifier,
-    userId: UserId,
-    untilDate: TelegramDate? = null,
-    revokeMessages: Boolean? = null
-) = execute(KickChatMember(chatId, userId, untilDate, revokeMessages))
-
-suspend fun TelegramBot.kickChatMember(
-    chat: PublicChat,
-    userId: UserId,
-    untilDate: TelegramDate? = null,
-    revokeMessages: Boolean? = null
-) = kickChatMember(chat.id, userId, untilDate, revokeMessages)
-
-suspend fun TelegramBot.kickChatMember(
-    chatId: ChatId,
-    user: User,
-    untilDate: TelegramDate? = null,
-    revokeMessages: Boolean? = null
-) = kickChatMember(chatId, user.id, untilDate, revokeMessages)
-
-suspend fun TelegramBot.kickChatMember(
-    chat: PublicChat,
-    user: User,
-    untilDate: TelegramDate? = null,
-    revokeMessages: Boolean? = null
-) = kickChatMember(chat.id, user.id, untilDate, revokeMessages)