content messages renames

2025-09-16 05:40:32 +00:00 · 2021-02-07 16:54:48 +06:00
parent 4748b6813a
commit 0ca815760b
11 changed files with 142 additions and 61 deletions
--- 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<T: MessageContent>(
+data class ChannelContentMessageImpl<T: MessageContent>(
    override val messageId: MessageIdentifier,
    override val chat: ChannelChat,
    override val content: T,
@@ -19,4 +19,6 @@ data class ChannelMessageImpl<T: MessageContent>(
    override val replyMarkup: InlineKeyboardMarkup?,
    override val senderBot: CommonBot?,
    override val authorSignature: AuthorSignature?
-) : ChannelMessage<T>
+) : ChannelContentMessage<T>
+@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("ChannelContentMessageImpl", "dev.inmo.tgbotapi.types.message.ChannelContentMessageImpl"))
+typealias ChannelMessageImpl<T> = ChannelContentMessageImpl<T>
--- 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<T : MessageContent>(
+data class FromChannelGroupContentMessageImpl<T : MessageContent>(
    override val chat: GroupChat,
    override val channel: ChannelChat,
    override val messageId: MessageIdentifier,
@@ -20,9 +20,11 @@ data class FromChannelGroupMessageImpl<T : MessageContent>(
    override val content: T,
    override val senderBot: CommonBot?,
    override val authorSignature: AuthorSignature?
-) : FromChannelGroupMessage<T>
+) : FromChannelGroupContentMessage<T>
+@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("FromChannelGroupContentMessageImpl", "dev.inmo.tgbotapi.types.message.FromChannelGroupContentMessageImpl"))
+typealias FromChannelGroupMessageImpl<T> = FromChannelGroupContentMessageImpl<T>

-data class AnonymousGroupMessageImpl<T : MessageContent>(
+data class AnonymousGroupContentMessageImpl<T : MessageContent>(
    override val chat: GroupChat,
    override val messageId: MessageIdentifier,
    override val date: DateTime,
@@ -33,9 +35,11 @@ data class AnonymousGroupMessageImpl<T : MessageContent>(
    override val content: T,
    override val senderBot: CommonBot?,
    override val authorSignature: AuthorSignature?
-) : AnonymousGroupMessage<T>
+) : AnonymousGroupContentMessage<T>
+@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("AnonymousGroupContentMessageImpl", "dev.inmo.tgbotapi.types.message.AnonymousGroupContentMessageImpl"))
+typealias AnonymousGroupMessageImpl<T> = AnonymousGroupContentMessageImpl<T>

-data class CommonGroupMessageImpl<T : MessageContent>(
+data class CommonGroupContentMessageImpl<T : MessageContent>(
    override val chat: GroupChat,
    override val messageId: MessageIdentifier,
    override val user: User,
@@ -46,4 +50,6 @@ data class CommonGroupMessageImpl<T : MessageContent>(
    override val replyMarkup: InlineKeyboardMarkup?,
    override val content: T,
    override val senderBot: CommonBot?
-) : CommonGroupMessage<T>
+) : CommonGroupContentMessage<T>
+@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("CommonGroupContentMessageImpl", "dev.inmo.tgbotapi.types.message.CommonGroupContentMessageImpl"))
+typealias CommonGroupMessageImpl<T> = CommonGroupContentMessageImpl<T>
--- 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<T: MessageContent>(
+data class PrivateContentMessageImpl<T: MessageContent>(
    override val messageId: MessageIdentifier,
    override val user: User,
    override val chat: Chat,
@@ -21,4 +20,6 @@ data class PrivateMessageImpl<T: MessageContent>(
    override val replyMarkup: InlineKeyboardMarkup?,
    override val senderBot: CommonBot?,
    val paymentInfo: SuccessfulPaymentInfo?
-) : PrivateMessage<T>
+) : PrivateContentMessage<T>
+@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("PrivateContentMessageImpl", "dev.inmo.tgbotapi.types.message.PrivateContentMessageImpl"))
+typealias PrivateMessageImpl<T> = PrivateContentMessageImpl<T>
--- 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,
--- 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<T: MessageContent> : PossiblySentViaBotCommonMessage<T>, SignedMessage, WithSenderChatMessage {
+interface ChannelContentMessage<T: MessageContent> : PossiblySentViaBotCommonMessage<T>, 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<T> = ChannelContentMessage<T>
--- 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<T : MessageContent> : PublicMessage<T> {
+interface GroupContentMessage<T : MessageContent> : PublicContentMessage<T> {
    override val chat: GroupChat
 }
+@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("GroupContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.GroupContentMessage"))
+typealias GroupMessage<T> = GroupContentMessage<T>

-interface FromChannelGroupMessage<T : MessageContent> : GroupMessage<T>, SignedMessage, WithSenderChatMessage {
+
+interface FromChannelGroupContentMessage<T : MessageContent> : GroupContentMessage<T>, SignedMessage, WithSenderChatMessage {
    val channel: ChannelChat
    override val senderChat: ChannelChat
        get() = channel
 }
-interface AnonymousGroupMessage<T : MessageContent> : GroupMessage<T>, SignedMessage, WithSenderChatMessage {
+@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("FromChannelGroupContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.FromChannelGroupContentMessage"))
+typealias FromChannelGroupMessage<T> = FromChannelGroupContentMessage<T>
+
+interface AnonymousGroupContentMessage<T : MessageContent> : GroupContentMessage<T>, SignedMessage, WithSenderChatMessage {
    override val senderChat: GroupChat
        get() = chat
 }
-interface CommonGroupMessage<T : MessageContent> : GroupMessage<T>, FromUserMessage
+@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("AnonymousGroupContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.AnonymousGroupContentMessage"))
+typealias AnonymousGroupMessage<T> = AnonymousGroupContentMessage<T>
+
+interface CommonGroupContentMessage<T : MessageContent> : GroupContentMessage<T>, FromUserMessage
+@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("CommonGroupContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.CommonGroupContentMessage"))
+typealias CommonGroupMessage<T> = CommonGroupContentMessage<T>
--- 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<T: MessageContent> : PossiblySentViaBotCommonMessage<T>, FromUserMessage
+interface PrivateContentMessage<T: MessageContent> : PossiblySentViaBotCommonMessage<T>, FromUserMessage
+@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("PrivateContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.PrivateContentMessage"))
+typealias PrivateMessage<T> = PrivateContentMessage<T>
--- 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<T: MessageContent> : PossiblySentViaBotCommonMessage<T> {
+interface PublicContentMessage<T: MessageContent> : PossiblySentViaBotCommonMessage<T> {
    override val chat: PublicChat
 }
+@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("PublicContentMessage", "dev.inmo.tgbotapi.types.message.PublicContentMessage"))
+typealias PublicMessage<T> = PublicContentMessage<T>