From 678f79da049b7cf134cad3cb74f0be561c16037a Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 11 Jul 2022 01:56:31 +0600 Subject: [PATCH] CreatorChatMember -> OwnerChatMember --- CHANGELOG.md | 1 + .../dev/inmo/tgbotapi/types/chat/member/ChatMember.kt | 4 ++-- .../member/{CreatorChatMember.kt => OwnerChatMember.kt} | 5 ++++- .../kotlin/dev/inmo/tgbotapi/extensions/utils/ClassCasts.kt | 6 +++--- 4 files changed, 10 insertions(+), 6 deletions(-) rename tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/{CreatorChatMember.kt => OwnerChatMember.kt} (86%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9828084c6d..8967ccf6a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ * New companion functions: * `ReplyForce#Selective` * `ReplyForce#NonSelective` + * Rename `CreatorChatMember` -> `OwnerChatMember` * `API`: * For `copyMessage` order of parameters has been changed * `Utils`: diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/ChatMember.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/ChatMember.kt index fc90fa4271..584606fe2f 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/ChatMember.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/ChatMember.kt @@ -22,7 +22,7 @@ object ChatMemberSerializer : KSerializer { override fun deserialize(decoder: Decoder): ChatMember { val json = JsonObject.serializer().deserialize(decoder) return when (json[statusField] ?.jsonPrimitive ?.content ?: error("Status field of chat member must be specified, but incoming json contains next: $json")) { - "creator" -> nonstrictJsonFormat.decodeFromJsonElement(CreatorChatMember.serializer(), json) + "creator" -> nonstrictJsonFormat.decodeFromJsonElement(OwnerChatMember.serializer(), json) "administrator" -> nonstrictJsonFormat.decodeFromJsonElement(AdministratorChatMemberImpl.serializer(), json) "member" -> nonstrictJsonFormat.decodeFromJsonElement(MemberChatMemberImpl.serializer(), json) "restricted" -> nonstrictJsonFormat.decodeFromJsonElement(RestrictedChatMember.serializer(), json) @@ -34,7 +34,7 @@ object ChatMemberSerializer : KSerializer { override fun serialize(encoder: Encoder, value: ChatMember) { when (value) { - is CreatorChatMember -> CreatorChatMember.serializer() + is OwnerChatMember -> OwnerChatMember.serializer() is AdministratorChatMemberImpl -> AdministratorChatMemberImpl.serializer() is MemberChatMember -> MemberChatMemberImpl.serializer() is RestrictedChatMember -> RestrictedChatMember.serializer() diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/CreatorChatMember.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/OwnerChatMember.kt similarity index 86% rename from tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/CreatorChatMember.kt rename to tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/OwnerChatMember.kt index fb0397afb6..9f58ee3ef2 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/CreatorChatMember.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/OwnerChatMember.kt @@ -5,7 +5,7 @@ import dev.inmo.tgbotapi.types.chat.User import kotlinx.serialization.* @Serializable -data class CreatorChatMember( +data class OwnerChatMember( override val user: User, @SerialName(isAnonymousField) override val isAnonymous: Boolean = false, @@ -38,3 +38,6 @@ data class CreatorChatMember( @Required private val type: String = "creator" } + +@Deprecated("Renamed", ReplaceWith("OwnerChatMember", "dev.inmo.tgbotapi.types.chat.member.OwnerChatMember")) +typealias CreatorChatMember = OwnerChatMember diff --git a/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ClassCasts.kt b/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ClassCasts.kt index a8464c167e..09469564c3 100644 --- a/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ClassCasts.kt +++ b/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ClassCasts.kt @@ -1828,13 +1828,13 @@ inline fun InlineQueryResult.requireInlineQueryResultVoiceCommon(): InlineQueryR this as InlineQueryResultVoiceCommon @PreviewFeature -inline fun ChatMember.whenCreatorChatMember(block: (CreatorChatMember) -> T) = asCreatorChatMember() ?.let(block) +inline fun ChatMember.whenCreatorChatMember(block: (OwnerChatMember) -> T) = asCreatorChatMember() ?.let(block) @PreviewFeature -inline fun ChatMember.asCreatorChatMember(): CreatorChatMember? = this as? CreatorChatMember +inline fun ChatMember.asCreatorChatMember(): OwnerChatMember? = this as? OwnerChatMember @PreviewFeature -inline fun ChatMember.requireCreatorChatMember(): CreatorChatMember = this as CreatorChatMember +inline fun ChatMember.requireCreatorChatMember(): OwnerChatMember = this as OwnerChatMember @PreviewFeature inline fun ChatMember.whenKickedChatMember(block: (KickedChatMember) -> T) = asKickedChatMember() ?.let(block)