From 0ca815760bfca24d58ff718e30e718f232f576ae Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 7 Feb 2021 16:54:48 +0600 Subject: [PATCH] content messages renames --- CHANGELOG.md | 11 +++ .../types/message/ChannelMessageImpl.kt | 8 +- .../tgbotapi/types/message/GroupMessages.kt | 18 ++-- .../types/message/PrivateMessageImpl.kt | 9 +- .../inmo/tgbotapi/types/message/RawMessage.kt | 10 +-- .../types/message/abstracts/ChannelMessage.kt | 4 +- .../types/message/abstracts/GroupMessages.kt | 19 +++- .../types/message/abstracts/PrivateMessage.kt | 4 +- .../types/message/abstracts/PublicMessage.kt | 4 +- .../tgbotapi/extensions/utils/ClassCasts.kt | 88 ++++++++++++++----- .../tgbotapi/extensions/utils/WithContent.kt | 28 +++--- 11 files changed, 142 insertions(+), 61 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 545b4a8061..825bfd2bf7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,17 @@ * `Kotlin`: `1.4.21` -> `1.4.30` * `Klock`: `2.0.4` -> `2.0.6` * `MicroUtils`: `0.4.23` -> `0.4.24` +* `Core`: + * Renames: + * `ChannelMessage` -> `ChannelContentMessage` + * `PublicMessage` -> `PublicContentMessage` + * `GroupMessage` -> `GroupContentMessage` + * `FromChannelGroupMessage` -> `FromChannelGroupContentMessage` + * `AnonymousGroupMessage` -> `AnonymousGroupContentMessage` + * `CommonGroupMessage` -> `CommonGroupContentMessage` + * `PrivateMessage` -> `PrivateContentMessage` +* `Extensions Utils`: + * Renames of extensions in `ClassCasts` according to changes in `Core` ## 0.32.3 diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelMessageImpl.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelMessageImpl.kt index 73cdf10cb9..bf173782c8 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelMessageImpl.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelMessageImpl.kt @@ -4,11 +4,11 @@ import com.soywiz.klock.DateTime import dev.inmo.tgbotapi.types.* import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup import dev.inmo.tgbotapi.types.chat.abstracts.ChannelChat -import dev.inmo.tgbotapi.types.message.abstracts.ChannelMessage +import dev.inmo.tgbotapi.types.message.abstracts.ChannelContentMessage import dev.inmo.tgbotapi.types.message.abstracts.Message import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent -data class ChannelMessageImpl( +data class ChannelContentMessageImpl( override val messageId: MessageIdentifier, override val chat: ChannelChat, override val content: T, @@ -19,4 +19,6 @@ data class ChannelMessageImpl( override val replyMarkup: InlineKeyboardMarkup?, override val senderBot: CommonBot?, override val authorSignature: AuthorSignature? -) : ChannelMessage +) : ChannelContentMessage +@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("ChannelContentMessageImpl", "dev.inmo.tgbotapi.types.message.ChannelContentMessageImpl")) +typealias ChannelMessageImpl = ChannelContentMessageImpl diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/GroupMessages.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/GroupMessages.kt index bf919049d8..061eae0a99 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/GroupMessages.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/GroupMessages.kt @@ -8,7 +8,7 @@ import dev.inmo.tgbotapi.types.chat.abstracts.GroupChat import dev.inmo.tgbotapi.types.message.abstracts.* import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent -data class FromChannelGroupMessageImpl( +data class FromChannelGroupContentMessageImpl( override val chat: GroupChat, override val channel: ChannelChat, override val messageId: MessageIdentifier, @@ -20,9 +20,11 @@ data class FromChannelGroupMessageImpl( override val content: T, override val senderBot: CommonBot?, override val authorSignature: AuthorSignature? -) : FromChannelGroupMessage +) : FromChannelGroupContentMessage +@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("FromChannelGroupContentMessageImpl", "dev.inmo.tgbotapi.types.message.FromChannelGroupContentMessageImpl")) +typealias FromChannelGroupMessageImpl = FromChannelGroupContentMessageImpl -data class AnonymousGroupMessageImpl( +data class AnonymousGroupContentMessageImpl( override val chat: GroupChat, override val messageId: MessageIdentifier, override val date: DateTime, @@ -33,9 +35,11 @@ data class AnonymousGroupMessageImpl( override val content: T, override val senderBot: CommonBot?, override val authorSignature: AuthorSignature? -) : AnonymousGroupMessage +) : AnonymousGroupContentMessage +@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("AnonymousGroupContentMessageImpl", "dev.inmo.tgbotapi.types.message.AnonymousGroupContentMessageImpl")) +typealias AnonymousGroupMessageImpl = AnonymousGroupContentMessageImpl -data class CommonGroupMessageImpl( +data class CommonGroupContentMessageImpl( override val chat: GroupChat, override val messageId: MessageIdentifier, override val user: User, @@ -46,4 +50,6 @@ data class CommonGroupMessageImpl( override val replyMarkup: InlineKeyboardMarkup?, override val content: T, override val senderBot: CommonBot? -) : CommonGroupMessage +) : CommonGroupContentMessage +@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("CommonGroupContentMessageImpl", "dev.inmo.tgbotapi.types.message.CommonGroupContentMessageImpl")) +typealias CommonGroupMessageImpl = CommonGroupContentMessageImpl diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/PrivateMessageImpl.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/PrivateMessageImpl.kt index e627f034e3..94438537e2 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/PrivateMessageImpl.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/PrivateMessageImpl.kt @@ -4,12 +4,11 @@ import com.soywiz.klock.DateTime import dev.inmo.tgbotapi.types.* import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup import dev.inmo.tgbotapi.types.chat.abstracts.Chat -import dev.inmo.tgbotapi.types.message.abstracts.Message -import dev.inmo.tgbotapi.types.message.abstracts.PrivateMessage +import dev.inmo.tgbotapi.types.message.abstracts.* import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent import dev.inmo.tgbotapi.types.message.payments.SuccessfulPaymentInfo -data class PrivateMessageImpl( +data class PrivateContentMessageImpl( override val messageId: MessageIdentifier, override val user: User, override val chat: Chat, @@ -21,4 +20,6 @@ data class PrivateMessageImpl( override val replyMarkup: InlineKeyboardMarkup?, override val senderBot: CommonBot?, val paymentInfo: SuccessfulPaymentInfo? -) : PrivateMessage +) : PrivateContentMessage +@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("PrivateContentMessageImpl", "dev.inmo.tgbotapi.types.message.PrivateContentMessageImpl")) +typealias PrivateMessageImpl = PrivateContentMessageImpl diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt index b692284b71..e10f88de8b 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt @@ -256,7 +256,7 @@ internal data class RawMessage( } } ?: when (chat) { is PublicChat -> when (chat) { - is ChannelChat -> ChannelMessageImpl( + is ChannelChat -> ChannelContentMessageImpl( messageId, chat, content, @@ -269,7 +269,7 @@ internal data class RawMessage( author_signature ) is GroupChat -> when (sender_chat) { - is ChannelChat -> FromChannelGroupMessageImpl( + is ChannelChat -> FromChannelGroupContentMessageImpl( chat, sender_chat, messageId, @@ -282,7 +282,7 @@ internal data class RawMessage( via_bot, author_signature ) - is GroupChat -> AnonymousGroupMessageImpl( + is GroupChat -> AnonymousGroupContentMessageImpl( chat, messageId, date.asDate, @@ -294,7 +294,7 @@ internal data class RawMessage( via_bot, author_signature ) - null -> CommonGroupMessageImpl( + null -> CommonGroupContentMessageImpl( chat, messageId, from ?: error("It is expected that in messages from non anonymous users and channels user must be specified"), @@ -310,7 +310,7 @@ internal data class RawMessage( } else -> error("Unknown type of public chat: $chat") } - is PrivateChat -> PrivateMessageImpl( + is PrivateChat -> PrivateContentMessageImpl( messageId, from ?: error("Was detected common message, but owner (sender) of the message was not found"), chat, diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/ChannelMessage.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/ChannelMessage.kt index 2ef124d5b1..b9bbbec871 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/ChannelMessage.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/ChannelMessage.kt @@ -4,8 +4,10 @@ import dev.inmo.tgbotapi.types.chat.abstracts.ChannelChat import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent import dev.inmo.tgbotapi.types.message.content.abstracts.PossiblySentViaBotCommonMessage -interface ChannelMessage : PossiblySentViaBotCommonMessage, SignedMessage, WithSenderChatMessage { +interface ChannelContentMessage : PossiblySentViaBotCommonMessage, SignedMessage, WithSenderChatMessage { override val chat: ChannelChat override val senderChat: ChannelChat get() = chat } +@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("ChannelContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.ChannelContentMessage")) +typealias ChannelMessage = ChannelContentMessage diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/GroupMessages.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/GroupMessages.kt index 5b0df8433a..6167a0ca1d 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/GroupMessages.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/GroupMessages.kt @@ -4,17 +4,28 @@ import dev.inmo.tgbotapi.types.chat.abstracts.ChannelChat import dev.inmo.tgbotapi.types.chat.abstracts.GroupChat import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent -interface GroupMessage : PublicMessage { +interface GroupContentMessage : PublicContentMessage { override val chat: GroupChat } +@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("GroupContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.GroupContentMessage")) +typealias GroupMessage = GroupContentMessage -interface FromChannelGroupMessage : GroupMessage, SignedMessage, WithSenderChatMessage { + +interface FromChannelGroupContentMessage : GroupContentMessage, SignedMessage, WithSenderChatMessage { val channel: ChannelChat override val senderChat: ChannelChat get() = channel } -interface AnonymousGroupMessage : GroupMessage, SignedMessage, WithSenderChatMessage { +@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("FromChannelGroupContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.FromChannelGroupContentMessage")) +typealias FromChannelGroupMessage = FromChannelGroupContentMessage + +interface AnonymousGroupContentMessage : GroupContentMessage, SignedMessage, WithSenderChatMessage { override val senderChat: GroupChat get() = chat } -interface CommonGroupMessage : GroupMessage, FromUserMessage +@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("AnonymousGroupContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.AnonymousGroupContentMessage")) +typealias AnonymousGroupMessage = AnonymousGroupContentMessage + +interface CommonGroupContentMessage : GroupContentMessage, FromUserMessage +@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("CommonGroupContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.CommonGroupContentMessage")) +typealias CommonGroupMessage = CommonGroupContentMessage diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PrivateMessage.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PrivateMessage.kt index f57d2ce731..27a6c23614 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PrivateMessage.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PrivateMessage.kt @@ -3,4 +3,6 @@ package dev.inmo.tgbotapi.types.message.abstracts import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent import dev.inmo.tgbotapi.types.message.content.abstracts.PossiblySentViaBotCommonMessage -interface PrivateMessage : PossiblySentViaBotCommonMessage, FromUserMessage +interface PrivateContentMessage : PossiblySentViaBotCommonMessage, FromUserMessage +@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("PrivateContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.PrivateContentMessage")) +typealias PrivateMessage = PrivateContentMessage diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PublicMessage.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PublicMessage.kt index 1ab4b3786c..4b409815c7 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PublicMessage.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PublicMessage.kt @@ -4,6 +4,8 @@ import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent import dev.inmo.tgbotapi.types.message.content.abstracts.PossiblySentViaBotCommonMessage -interface PublicMessage : PossiblySentViaBotCommonMessage { +interface PublicContentMessage : PossiblySentViaBotCommonMessage { override val chat: PublicChat } +@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("PublicContentMessage", "dev.inmo.tgbotapi.types.message.PublicContentMessage")) +typealias PublicMessage = PublicContentMessage diff --git a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ClassCasts.kt b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ClassCasts.kt index b9ec7bb441..b4b2716992 100644 --- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ClassCasts.kt +++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ClassCasts.kt @@ -393,25 +393,41 @@ inline fun SecureValue.asSecureValueWithTranslations(): SecureValueWithTranslati @PreviewFeature inline fun SecureValue.requireSecureValueWithTranslations(): SecureValueWithTranslations = this as SecureValueWithTranslations @PreviewFeature -inline fun Message.asAnonymousGroupMessageImpl(): AnonymousGroupMessageImpl? = this as? AnonymousGroupMessageImpl +inline fun Message.asAnonymousGroupContentMessageImpl(): AnonymousGroupContentMessageImpl? = this as? AnonymousGroupContentMessageImpl +@Deprecated("Renamed", ReplaceWith("asAnonymousGroupContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.asAnonymousGroupContentMessageImpl")) +inline fun Message.asAnonymousGroupMessageImpl() = asAnonymousGroupContentMessageImpl() @PreviewFeature -inline fun Message.requireAnonymousGroupMessageImpl(): AnonymousGroupMessageImpl = this as AnonymousGroupMessageImpl +inline fun Message.requireAnonymousGroupContentMessageImpl(): AnonymousGroupContentMessageImpl = this as AnonymousGroupContentMessageImpl +@Deprecated("Renamed", ReplaceWith("requireAnonymousGroupContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.requireAnonymousGroupContentMessageImpl")) +inline fun Message.requireAnonymousGroupMessageImpl() = requireAnonymousGroupContentMessageImpl() @PreviewFeature -inline fun Message.asChannelMessageImpl(): ChannelMessageImpl? = this as? ChannelMessageImpl +inline fun Message.asChannelContentMessageImpl(): ChannelContentMessageImpl? = this as? ChannelContentMessageImpl +@Deprecated("Renamed", ReplaceWith("asChannelContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.asChannelContentMessageImpl")) +inline fun Message.asChannelMessageImpl() = asChannelContentMessageImpl() @PreviewFeature -inline fun Message.requireChannelMessageImpl(): ChannelMessageImpl = this as ChannelMessageImpl +inline fun Message.requireChannelContentMessageImpl(): ChannelContentMessageImpl = this as ChannelContentMessageImpl +@Deprecated("Renamed", ReplaceWith("requireChannelContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.requireChannelContentMessageImpl")) +inline fun Message.requireChannelMessageImpl() = requireChannelContentMessageImpl() @PreviewFeature -inline fun Message.asFromChannelGroupMessageImpl(): FromChannelGroupMessageImpl? = this as? FromChannelGroupMessageImpl +inline fun Message.asFromChannelGroupContentMessageImpl(): FromChannelGroupContentMessageImpl? = this as? FromChannelGroupContentMessageImpl +@Deprecated("Renamed", ReplaceWith("asFromChannelGroupContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.asFromChannelGroupContentMessageImpl")) +inline fun Message.asFromChannelGroupMessageImpl() = asFromChannelGroupContentMessageImpl() @PreviewFeature -inline fun Message.requireFromChannelGroupMessageImpl(): FromChannelGroupMessageImpl = this as FromChannelGroupMessageImpl +inline fun Message.requireFromChannelGroupContentMessageImpl(): FromChannelGroupContentMessageImpl = this as FromChannelGroupContentMessageImpl +@Deprecated("Renamed", ReplaceWith("requireFromChannelGroupContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.requireFromChannelGroupContentMessageImpl")) +inline fun Message.requireFromChannelGroupMessageImpl() = requireFromChannelGroupContentMessageImpl() @PreviewFeature inline fun Message.asPassportMessage(): PassportMessage? = this as? PassportMessage @PreviewFeature inline fun Message.requirePassportMessage(): PassportMessage = this as PassportMessage @PreviewFeature -inline fun Message.asPrivateMessageImpl(): PrivateMessageImpl? = this as? PrivateMessageImpl +inline fun Message.asPrivateContentMessageImpl(): PrivateContentMessageImpl? = this as? PrivateContentMessageImpl +@Deprecated("Renamed", ReplaceWith("asPrivateContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.asPrivateContentMessageImpl")) +inline fun Message.asPrivateMessageImpl() = asPrivateContentMessageImpl() @PreviewFeature -inline fun Message.requirePrivateMessageImpl(): PrivateMessageImpl = this as PrivateMessageImpl +inline fun Message.requirePrivateContentMessageImpl(): PrivateContentMessageImpl = this as PrivateContentMessageImpl +@Deprecated("Renamed", ReplaceWith("requirePrivateContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.requirePrivateContentMessageImpl")) +inline fun Message.requirePrivateMessageImpl() = requirePrivateContentMessageImpl() @PreviewFeature inline fun Message.asChannelEventMessage(): ChannelEventMessage? = this as? ChannelEventMessage @PreviewFeature @@ -433,21 +449,33 @@ inline fun Message.asCommonSupergroupEventMessage(): CommonSupergroupEventMessag @PreviewFeature inline fun Message.requireCommonSupergroupEventMessage(): CommonSupergroupEventMessage = this as CommonSupergroupEventMessage @PreviewFeature -inline fun Message.asAnonymousGroupMessage(): AnonymousGroupMessage? = this as? AnonymousGroupMessage +inline fun Message.asAnonymousGroupContentMessage(): AnonymousGroupContentMessage? = this as? AnonymousGroupContentMessage +@Deprecated("Renamed", ReplaceWith("asAnonymousGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.asAnonymousGroupContentMessage")) +inline fun Message.asAnonymousGroupMessage() = asAnonymousGroupContentMessage() @PreviewFeature -inline fun Message.requireAnonymousGroupMessage(): AnonymousGroupMessage = this as AnonymousGroupMessage +inline fun Message.requireAnonymousGroupContentMessage(): AnonymousGroupContentMessage = this as AnonymousGroupContentMessage +@Deprecated("Renamed", ReplaceWith("requireAnonymousGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.requireAnonymousGroupContentMessage")) +inline fun Message.requireAnonymousGroupMessage() = requireAnonymousGroupContentMessage() @PreviewFeature -inline fun Message.asChannelMessage(): ChannelMessage? = this as? ChannelMessage +inline fun Message.asChannelContentMessage(): ChannelContentMessageImpl? = this as? ChannelContentMessageImpl +@Deprecated("Renamed", ReplaceWith("asChannelContentMessage", "dev.inmo.tgbotapi.extensions.utils.asChannelContentMessage")) +inline fun Message.asChannelMessage() = asChannelContentMessage() @PreviewFeature -inline fun Message.requireChannelMessage(): ChannelMessage = this as ChannelMessage +inline fun Message.requireChannelContentMessage(): ChannelContentMessageImpl = this as ChannelContentMessageImpl +@Deprecated("Renamed", ReplaceWith("requireChannelContentMessage", "dev.inmo.tgbotapi.extensions.utils.requireChannelContentMessage")) +inline fun Message.requireChannelMessage() = requireChannelContentMessage() @PreviewFeature inline fun Message.asChatEventMessage(): ChatEventMessage? = this as? ChatEventMessage @PreviewFeature inline fun Message.requireChatEventMessage(): ChatEventMessage = this as ChatEventMessage @PreviewFeature -inline fun Message.asCommonGroupMessage(): CommonGroupMessage? = this as? CommonGroupMessage +inline fun Message.asCommonGroupContentMessage(): CommonGroupContentMessage? = this as? CommonGroupContentMessage +@Deprecated("Renamed", ReplaceWith("asCommonGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.asCommonGroupContentMessage")) +inline fun Message.asCommonGroupMessage() = asCommonGroupContentMessage() @PreviewFeature -inline fun Message.requireCommonGroupMessage(): CommonGroupMessage = this as CommonGroupMessage +inline fun Message.requireCommonGroupContentMessage(): CommonGroupContentMessage = this as CommonGroupContentMessage +@Deprecated("Renamed", ReplaceWith("requireCommonGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.requireCommonGroupContentMessage")) +inline fun Message.requireCommonGroupMessage() = requireCommonGroupContentMessage() @PreviewFeature inline fun Message.asCommonMessage(): CommonMessage? = this as? CommonMessage @PreviewFeature @@ -457,17 +485,25 @@ inline fun Message.asContentMessage(): ContentMessage? = this as @PreviewFeature inline fun Message.requireContentMessage(): ContentMessage = this as ContentMessage @PreviewFeature -inline fun Message.asFromChannelGroupMessage(): FromChannelGroupMessage? = this as? FromChannelGroupMessage +inline fun Message.asFromChannelGroupContentMessage(): FromChannelGroupContentMessage? = this as? FromChannelGroupContentMessage +@Deprecated("Renamed", ReplaceWith("asFromChannelGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.asFromChannelGroupContentMessage")) +inline fun Message.asFromChannelGroupMessage() = asFromChannelGroupContentMessage() @PreviewFeature -inline fun Message.requireFromChannelGroupMessage(): FromChannelGroupMessage = this as FromChannelGroupMessage +inline fun Message.requireFromChannelGroupContentMessage(): FromChannelGroupContentMessage = this as FromChannelGroupContentMessage +@Deprecated("Renamed", ReplaceWith("requireFromChannelGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.requireFromChannelGroupContentMessage")) +inline fun Message.requireFromChannelGroupMessage() = requireFromChannelGroupContentMessage() @PreviewFeature inline fun Message.asGroupEventMessage(): GroupEventMessage? = this as? GroupEventMessage @PreviewFeature inline fun Message.requireGroupEventMessage(): GroupEventMessage = this as GroupEventMessage @PreviewFeature -inline fun Message.asGroupMessage(): GroupMessage? = this as? GroupMessage +inline fun Message.asGroupContentMessage(): GroupContentMessage? = this as? GroupContentMessage +@Deprecated("Renamed", ReplaceWith("asGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.asGroupContentMessage")) +inline fun Message.asGroupMessage() = asGroupContentMessage() @PreviewFeature -inline fun Message.requireGroupMessage(): GroupMessage = this as GroupMessage +inline fun Message.requireGroupContentMessage(): GroupContentMessage = this as GroupContentMessage +@Deprecated("Renamed", ReplaceWith("requireGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.requireGroupContentMessage")) +inline fun Message.requireGroupMessage() = requireGroupContentMessage() @PreviewFeature inline fun Message.asMediaGroupMessage(): MediaGroupMessage? = this as? MediaGroupMessage @PreviewFeature @@ -485,13 +521,21 @@ inline fun Message.asPossiblyPaymentMessage(): PossiblyPaymentMessage? = this as @PreviewFeature inline fun Message.requirePossiblyPaymentMessage(): PossiblyPaymentMessage = this as PossiblyPaymentMessage @PreviewFeature -inline fun Message.asPrivateMessage(): PrivateMessage? = this as? PrivateMessage +inline fun Message.asPrivateContentMessage(): PrivateContentMessage? = this as? PrivateContentMessage +@Deprecated("Renamed", ReplaceWith("asPrivateContentMessage", "dev.inmo.tgbotapi.extensions.utils.asPrivateContentMessage")) +inline fun Message.asPrivateMessage() = asPrivateContentMessage() @PreviewFeature -inline fun Message.requirePrivateMessage(): PrivateMessage = this as PrivateMessage +inline fun Message.requirePrivateContentMessage(): PrivateContentMessage = this as PrivateContentMessage +@Deprecated("Renamed", ReplaceWith("requirePrivateContentMessage", "dev.inmo.tgbotapi.extensions.utils.requirePrivateContentMessage")) +inline fun Message.requirePrivateMessage() = requirePrivateContentMessage() @PreviewFeature -inline fun Message.asPublicMessage(): PublicMessage? = this as? PublicMessage +inline fun Message.asPublicContentMessage(): PublicContentMessage? = this as? PublicContentMessage +@Deprecated("Renamed", ReplaceWith("asPublicContentMessage", "dev.inmo.tgbotapi.extensions.utils.asPublicContentMessage")) +inline fun Message.asPublicMessage() = asPublicContentMessage() @PreviewFeature -inline fun Message.requirePublicMessage(): PublicMessage = this as PublicMessage +inline fun Message.requirePublicContentMessage(): PublicContentMessage = this as PublicContentMessage +@Deprecated("Renamed", ReplaceWith("requirePublicContentMessage", "dev.inmo.tgbotapi.extensions.utils.requirePublicContentMessage")) +inline fun Message.requirePublicMessage() = requirePublicContentMessage() @PreviewFeature inline fun Message.asSignedMessage(): SignedMessage? = this as? SignedMessage @PreviewFeature diff --git a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/WithContent.kt b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/WithContent.kt index be45e0b6f1..4b6e861577 100644 --- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/WithContent.kt +++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/WithContent.kt @@ -14,26 +14,26 @@ inline fun CommonMessage<*>.requireWithContent() = inline fun PossiblySentViaBotCommonMessage<*>.withContent() = if (content is T) { this as PossiblySentViaBotCommonMessage } else { null } inline fun PossiblySentViaBotCommonMessage<*>.requireWithContent() = withContent()!! -inline fun ChannelMessage<*>.withContent() = if (content is T) { this as ChannelMessage } else { null } -inline fun ChannelMessage<*>.requireWithContent() = withContent()!! +inline fun ChannelContentMessage<*>.withContent() = if (content is T) { this as ChannelContentMessage } else { null } +inline fun ChannelContentMessage<*>.requireWithContent() = withContent()!! -inline fun PrivateMessage<*>.withContent() = if (content is T) { this as PrivateMessage } else { null } -inline fun PrivateMessage<*>.requireWithContent() = withContent()!! +inline fun PrivateContentMessage<*>.withContent() = if (content is T) { this as PrivateContentMessage } else { null } +inline fun PrivateContentMessage<*>.requireWithContent() = withContent()!! -inline fun PublicMessage<*>.withContent() = if (content is T) { this as PublicMessage } else { null } -inline fun PublicMessage<*>.requireWithContent() = withContent()!! +inline fun PublicContentMessage<*>.withContent() = if (content is T) { this as PublicContentMessage } else { null } +inline fun PublicContentMessage<*>.requireWithContent() = withContent()!! -inline fun GroupMessage<*>.withContent() = if (content is T) { this as GroupMessage } else { null } -inline fun GroupMessage<*>.requireWithContent() = withContent()!! +inline fun GroupContentMessage<*>.withContent() = if (content is T) { this as GroupContentMessage } else { null } +inline fun GroupContentMessage<*>.requireWithContent() = withContent()!! -inline fun FromChannelGroupMessage<*>.withContent() = if (content is T) { this as FromChannelGroupMessage } else { null } -inline fun FromChannelGroupMessage<*>.requireWithContent() = withContent()!! +inline fun FromChannelGroupContentMessage<*>.withContent() = if (content is T) { this as FromChannelGroupContentMessage } else { null } +inline fun FromChannelGroupContentMessage<*>.requireWithContent() = withContent()!! -inline fun AnonymousGroupMessage<*>.withContent() = if (content is T) { this as AnonymousGroupMessage } else { null } -inline fun AnonymousGroupMessage<*>.requireWithContent() = withContent()!! +inline fun AnonymousGroupContentMessage<*>.withContent() = if (content is T) { this as AnonymousGroupContentMessage } else { null } +inline fun AnonymousGroupContentMessage<*>.requireWithContent() = withContent()!! -inline fun CommonGroupMessage<*>.withContent() = if (content is T) { this as CommonGroupMessage } else { null } -inline fun CommonGroupMessage<*>.requireWithContent() = withContent()!! +inline fun CommonGroupContentMessage<*>.withContent() = if (content is T) { this as CommonGroupContentMessage } else { null } +inline fun CommonGroupContentMessage<*>.requireWithContent() = withContent()!! inline fun MediaGroupMessage<*>.withContent() = if (content is T) { this as MediaGroupMessage } else { null } inline fun MediaGroupMessage<*>.requireWithContent() = withContent()!!