Dice#emoji support

CHANGELOG.md

@@ -20,7 +20,10 @@
     * Field `Poll#scheduledCloseInfo` was added
     * Sealed class `MultipleAnswersPoll` was added
         * Class `RegularPoll` now extends `MultipleAnswersPoll`
-    
+    * `Dice` class was replaced into new package
+    * Sealed class `DiceAnimationType` was added
+        * Field `Dice#animationType` was added as `emoji` API representation
+        * `SendDice` now receive `animationType` as second parameter
 
 ## 0.26.0
 

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendDice.kt

@@ -5,6 +5,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ReplyMes
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.ReplyingMarkupSendMessageRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
+import com.github.insanusmokrassar.TelegramBotAPI.types.dice.DiceAnimationType
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.DiceContent
@@ -17,6 +18,8 @@ internal val DiceContentMessageResultDeserializer: DeserializationStrategy<Conte
 data class SendDice(
     @SerialName(chatIdField)
     override val chatId: ChatIdentifier,
+    @SerialName(emojiField)
+    val animationType: DiceAnimationType? = null,
     @SerialName(disableNotificationField)
     override val disableNotification: Boolean = false,
     @SerialName(replyToMessageIdField)

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/Dice.kt

@@ -1,10 +1,9 @@
 package com.github.insanusmokrassar.TelegramBotAPI.types
 
-import kotlinx.serialization.SerialName
+import com.github.insanusmokrassar.TelegramBotAPI.types.dice.Dice
-import kotlinx.serialization.Serializable
 
-@Serializable
+@Deprecated(
-data class Dice(
+    "Replaced",
-    @SerialName(valueField)
+    ReplaceWith("Dice", "com.github.insanusmokrassar.TelegramBotAPI.types.dice.Dice")
-    val value: DiceResult
 )
+typealias Dice = Dice

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/dice/Dice.kt

@@ -0,0 +1,12 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.dice
+
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import kotlinx.serialization.*
+
+@Serializable
+data class Dice(
+    @SerialName(valueField)
+    val value: DiceResult,
+    @SerialName(emojiField)
+    val animationType: DiceAnimationType
+)

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/dice/DiceAnimationType.kt

@@ -0,0 +1,36 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.dice
+
+import kotlinx.serialization.*
+
+@Serializable(DiceAnimationTypeSerializer::class)
+sealed class DiceAnimationType {
+    abstract val emoji: String
+}
+@Serializable(DiceAnimationTypeSerializer::class)
+object CubeDiceAnimationType : DiceAnimationType() {
+    override val emoji: String = "\uD83C\uDFB2"
+}
+@Serializable(DiceAnimationTypeSerializer::class)
+object DartsDiceAnimationType : DiceAnimationType() {
+    override val emoji: String = "\uD83C\uDFAF"
+}
+@Serializable(DiceAnimationTypeSerializer::class)
+class UnknownDiceAnimationType(
+    override val emoji: String
+) : DiceAnimationType()
+
+@Serializer(DiceAnimationType::class)
+internal object DiceAnimationTypeSerializer : KSerializer<DiceAnimationType> {
+    override val descriptor: SerialDescriptor = PrimitiveDescriptor("DiceAnimationType", PrimitiveKind.STRING)
+    override fun deserialize(decoder: Decoder): DiceAnimationType {
+        return when (val type = decoder.decodeString()) {
+            CubeDiceAnimationType.emoji -> CubeDiceAnimationType
+            DartsDiceAnimationType.emoji -> DartsDiceAnimationType
+            else -> UnknownDiceAnimationType(type)
+        }
+    }
+
+    override fun serialize(encoder: Encoder, value: DiceAnimationType) {
+        encoder.encodeString(value.emoji)
+    }
+}

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/RawMessage.kt

@@ -5,6 +5,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.RawMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.asTextParts
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.dice.Dice
 import com.github.insanusmokrassar.TelegramBotAPI.types.files.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.games.RawGame
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.*

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/DiceContent.kt

@@ -4,6 +4,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.SendDice
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
+import com.github.insanusmokrassar.TelegramBotAPI.types.dice.Dice
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent
 
@@ -15,5 +16,11 @@ data class DiceContent(
         disableNotification: Boolean,
         replyToMessageId: MessageIdentifier?,
         replyMarkup: KeyboardMarkup?
-    ): Request<ContentMessage<DiceContent>> = SendDice(chatId, disableNotification, replyToMessageId, replyMarkup)
+    ): Request<ContentMessage<DiceContent>> = SendDice(
+        chatId,
+        dice.animationType,
+        disableNotification,
+        replyToMessageId,
+        replyMarkup
+    )
 }