mirror of
https://github.com/InsanusMokrassar/TelegramBotAPI.git
synced 2026-07-03 00:25:29 +00:00
Rename RichMessage -> RichTextInfo
The Telegram type backing rich-formatted message info is RichMessage, but the class name collided conceptually with the in-progress rich-message builders. Rename the data class (and its file) to RichTextInfo and update all references (RawMessage, RichMessageContent, serialization test) plus the API dump. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -50,7 +50,7 @@ import dev.inmo.tgbotapi.types.polls.Poll
|
||||
import dev.inmo.tgbotapi.types.polls.PollOptionPersistentId
|
||||
import dev.inmo.tgbotapi.types.request.ChatShared
|
||||
import dev.inmo.tgbotapi.types.request.UsersShared
|
||||
import dev.inmo.tgbotapi.types.rich.RichMessage
|
||||
import dev.inmo.tgbotapi.types.rich.RichTextInfo
|
||||
import dev.inmo.tgbotapi.types.stories.Story
|
||||
import dev.inmo.tgbotapi.types.venue.Venue
|
||||
import dev.inmo.tgbotapi.utils.isFakeTelegramUser
|
||||
@@ -93,7 +93,7 @@ internal data class RawMessage(
|
||||
private val caption_entities: RawMessageEntities? = null,
|
||||
private val has_media_spoiler: Boolean? = null,
|
||||
private val story: Story? = null,
|
||||
private val rich_message: RichMessage? = null,
|
||||
private val rich_message: RichTextInfo? = null,
|
||||
private val audio: AudioFile? = null,
|
||||
private val document: DocumentFile? = null,
|
||||
private val paid_media: PaidMediaInfo? = null,
|
||||
|
||||
@@ -8,14 +8,14 @@ import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
|
||||
import dev.inmo.tgbotapi.types.chat.Chat
|
||||
import dev.inmo.tgbotapi.types.message.SuggestedPostParameters
|
||||
import dev.inmo.tgbotapi.types.message.abstracts.ChatContentMessage
|
||||
import dev.inmo.tgbotapi.types.rich.RichMessage
|
||||
import dev.inmo.tgbotapi.types.rich.RichTextInfo
|
||||
import kotlinx.serialization.Serializable
|
||||
|
||||
@Serializable
|
||||
data class RichMessageContent(
|
||||
private val chat: Chat,
|
||||
private val messageId: MessageId,
|
||||
val richMessage: RichMessage
|
||||
val richMessage: RichTextInfo
|
||||
) : MessageContent {
|
||||
override fun createResend(
|
||||
chatId: ChatIdentifier,
|
||||
|
||||
@@ -11,7 +11,7 @@ import kotlinx.serialization.Serializable
|
||||
* @see <a href="https://core.telegram.org/bots/api#richmessage">RichMessage</a>
|
||||
*/
|
||||
@Serializable
|
||||
data class RichMessage(
|
||||
data class RichTextInfo(
|
||||
@SerialName(blocksField)
|
||||
val blocks: List<RichBlock>,
|
||||
@SerialName(isRtlField)
|
||||
@@ -2,7 +2,6 @@ package dev.inmo.tgbotapi.types
|
||||
|
||||
import dev.inmo.tgbotapi.types.rich.*
|
||||
import kotlinx.serialization.json.Json
|
||||
import kotlinx.serialization.encodeToString
|
||||
import kotlin.test.Test
|
||||
import kotlin.test.assertEquals
|
||||
import kotlin.test.assertTrue
|
||||
@@ -29,7 +28,7 @@ class RichMessageSerializationTest {
|
||||
}
|
||||
""".trimIndent()
|
||||
|
||||
val message = json.decodeFromString(RichMessage.serializer(), source)
|
||||
val message = json.decodeFromString(RichTextInfo.serializer(), source)
|
||||
assertEquals(4, message.blocks.size)
|
||||
|
||||
val paragraph = message.blocks[0] as RichBlockParagraph
|
||||
@@ -50,7 +49,7 @@ class RichMessageSerializationTest {
|
||||
|
||||
@Test
|
||||
fun roundTripsRichMessage() {
|
||||
val message = RichMessage(
|
||||
val message = RichTextInfo(
|
||||
blocks = listOf(
|
||||
RichBlockParagraph(
|
||||
RichTextGroup(
|
||||
@@ -65,8 +64,8 @@ class RichMessageSerializationTest {
|
||||
)
|
||||
)
|
||||
|
||||
val encoded = json.encodeToString(RichMessage.serializer(), message)
|
||||
val decoded = json.decodeFromString(RichMessage.serializer(), encoded)
|
||||
val encoded = json.encodeToString(RichTextInfo.serializer(), message)
|
||||
val decoded = json.decodeFromString(RichTextInfo.serializer(), encoded)
|
||||
assertEquals(message, decoded)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user