From 2a48944a00daab7e52cbb9305020d3eb86fdbc38 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Sat, 6 Jan 2024 10:38:35 +0200 Subject: [PATCH] Bot API 7.0: Giveaway (#134) * Bot API 7.0: Giveaway * Bot API 7.0: Other changes (#135) --- src/objects.rs | 93 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 70 insertions(+), 23 deletions(-) diff --git a/src/objects.rs b/src/objects.rs index 8fa23c7..519e6b7 100644 --- a/src/objects.rs +++ b/src/objects.rs @@ -503,6 +503,22 @@ pub struct Chat { #[builder(setter(into, strip_option), default)] pub available_reactions: Option>, + #[serde(skip_serializing_if = "Option::is_none")] + #[builder(setter(into, strip_option), default)] + pub accent_color_id: Option, + + #[serde(skip_serializing_if = "Option::is_none")] + #[builder(setter(into, strip_option), default)] + pub background_custom_emoji_id: Option, + + #[serde(skip_serializing_if = "Option::is_none")] + #[builder(setter(into, strip_option), default)] + pub profile_accent_color_id: Option, + + #[serde(skip_serializing_if = "Option::is_none")] + #[builder(setter(into, strip_option), default)] + pub profile_background_custom_emoji_id: Option, + #[serde(skip_serializing_if = "Option::is_none")] #[builder(setter(into, strip_option), default)] pub emoji_status_custom_emoji_id: Option, @@ -567,6 +583,10 @@ pub struct Chat { #[builder(setter(into, strip_option), default)] pub has_protected_content: Option, + #[serde(skip_serializing_if = "Option::is_none")] + #[builder(setter(into, strip_option), default)] + pub has_visible_history: Option, + #[serde(skip_serializing_if = "Option::is_none")] #[builder(setter(into, strip_option), default)] pub sticker_set_name: Option, @@ -607,27 +627,7 @@ pub struct Message { #[serde(skip_serializing_if = "Option::is_none")] #[builder(setter(into, strip_option), default)] - pub forward_from: Option>, - - #[serde(skip_serializing_if = "Option::is_none")] - #[builder(setter(into, strip_option), default)] - pub forward_from_chat: Option>, - - #[serde(skip_serializing_if = "Option::is_none")] - #[builder(setter(into, strip_option), default)] - pub forward_from_message_id: Option, - - #[serde(skip_serializing_if = "Option::is_none")] - #[builder(setter(into, strip_option), default)] - pub forward_signature: Option, - - #[serde(skip_serializing_if = "Option::is_none")] - #[builder(setter(into, strip_option), default)] - pub forward_sender_name: Option, - - #[serde(skip_serializing_if = "Option::is_none")] - #[builder(setter(into, strip_option), default)] - pub forward_date: Option, + pub forward_origin: Option>, #[serde(skip_serializing_if = "Option::is_none")] #[builder(setter(into, strip_option), default)] @@ -799,7 +799,7 @@ pub struct Message { #[serde(skip_serializing_if = "Option::is_none")] #[builder(setter(into, strip_option), default)] - pub pinned_message: Option>, + pub pinned_message: Option>, #[serde(skip_serializing_if = "Option::is_none")] #[builder(setter(into, strip_option), default)] @@ -857,6 +857,22 @@ pub struct Message { #[builder(setter(into, strip_option), default)] pub general_forum_topic_unhidden: Option>, + #[serde(skip_serializing_if = "Option::is_none")] + #[builder(setter(into, strip_option), default)] + pub giveaway_created: Option, + + #[serde(skip_serializing_if = "Option::is_none")] + #[builder(setter(into, strip_option), default)] + pub giveaway: Option, + + #[serde(skip_serializing_if = "Option::is_none")] + #[builder(setter(into, strip_option), default)] + pub giveaway_winners: Option, + + #[serde(skip_serializing_if = "Option::is_none")] + #[builder(setter(into, strip_option), default)] + pub giveaway_completed: Option, + #[serde(skip_serializing_if = "Option::is_none")] #[builder(setter(into, strip_option), default)] pub video_chat_started: Option>, @@ -1745,7 +1761,7 @@ pub struct CallbackQuery { #[serde(skip_serializing_if = "Option::is_none")] #[builder(setter(into, strip_option), default)] - pub message: Option, + pub message: Option, #[serde(skip_serializing_if = "Option::is_none")] #[builder(setter(into, strip_option), default)] @@ -3468,6 +3484,9 @@ pub struct GameHighScore { pub score: i32, } +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Builder)] +pub struct GiveawayCreated {} + #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Builder)] pub struct Giveaway { pub chats: Vec, @@ -3534,6 +3553,19 @@ pub struct GiveawayWinners { pub prize_description: Option, } +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Builder)] +pub struct GiveawayCompleted { + pub winner_count: u32, + + #[serde(skip_serializing_if = "Option::is_none")] + #[builder(setter(into, strip_option), default)] + pub unclaimed_prize_count: Option, + + #[serde(skip_serializing_if = "Option::is_none")] + #[builder(setter(into, strip_option), default)] + pub giveaway_message: Option>, +} + #[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq, Builder)] pub struct ChatAdministratorRights { pub is_anonymous: bool, @@ -3669,6 +3701,21 @@ pub struct UserChatBoosts { pub boosts: Vec, } +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)] +pub enum MaybeInaccessibleMessage { + Message(Message), + InaccessibleMessage(InaccessibleMessage), +} + +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Builder)] +pub struct InaccessibleMessage { + pub chat: Chat, + + pub message_id: i32, + + pub date: u64, +} + #[cfg(test)] mod serde_tests { use super::*;