Fixup Dice and DiceEmoji

crates/teloxide-core/CHANGELOG.md

@@ -52,6 +52,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Renamed `ForumTopic::message_thread_id` into `thread_id` ([#887][pr887])
 - `ForumTopic::thread_id` and `Message::thread_id` now use `ThreadId` instead of `i32` ([#887][pr887])
 - `message_thread_id` method parameters now use `ThreadId` instead of `i32` ([#887][pr887])
+- `DiceEmoji` variant order ([#887][pr887])
+- `Dice::value` now use `u8`, instead of `i32` ([#887][pr887])
 
 [pr852]: https://github.com/teloxide/teloxide/pull/853
 [pr859]: https://github.com/teloxide/teloxide/pull/859

crates/teloxide-core/src/types/dice.rs

@@ -11,11 +11,7 @@ pub struct Dice {
 
     /// Value of the dice.
     ///
-    /// 1-6 for [`DiceEmoji::Dice`] and [`DiceEmoji::Darts`], 1-5 for
+    /// Value of the dice, 1-6 for 🎲, 🎯 and 🎳 base emoji, 1-5 for 🏀 and ⚽
-    /// [`DiceEmoji::Basketball`].
+    /// base emoji, 1-64 for 🎰 base emoji
-    ///
+    pub value: u8,
-    /// [`DiceEmoji::Dice`]: crate::types::DiceEmoji::Dice
-    /// [`DiceEmoji::Darts`]:crate::types::DiceEmoji::Darts
-    /// [`DiceEmoji::Basketball`]:crate::types::DiceEmoji::Basketball
-    pub value: i32,
 }

crates/teloxide-core/src/types/dice_emoji.rs

@@ -2,27 +2,27 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Copy, Debug, Clone, PartialEq, Eq, Hash, Deserialize, Serialize)]
 pub enum DiceEmoji {
-    /// Values from 1-6. Defaults to this variant.
+    /// "🎲" emoji. Values from 1-6. Defaults to this variant.
     #[serde(rename = "🎲")]
     Dice,
 
-    /// Values from 1-6.
+    /// "🎯" emoji. Values from 1-6.
     #[serde(rename = "🎯")]
     Darts,
 
-    /// Values from 1-5.
+    /// "🎳" emoji. Values 1-6
-    #[serde(rename = "🏀")]
-    Basketball,
-
-    /// Values 1-5
-    #[serde(rename = "⚽")]
-    Football,
-
-    /// Values 1-5
     #[serde(rename = "🎳")]
     Bowling,
 
-    /// Values 1-64
+    /// "🏀" emoji. Values from 1-5.
+    #[serde(rename = "🏀")]
+    Basketball,
+
+    /// "⚽" emoji. Values 1-5
+    #[serde(rename = "⚽")]
+    Football,
+
+    /// "🎰" emoji. Values 1-64
     #[serde(rename = "🎰")]
     SlotMachine,
 }