From 423495d1c7f9356ef03f20929cf3e25c864ca119 Mon Sep 17 00:00:00 2001 From: Maximilian Siling Date: Tue, 11 Feb 2020 19:28:46 +0300 Subject: [PATCH] Fix parsing for posts in private channels --- src/types/message.rs | 4 ++-- src/types/message_entity.rs | 4 ++-- src/types/update.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/types/message.rs b/src/types/message.rs index 277287da..46c341b3 100644 --- a/src/types/message.rs +++ b/src/types/message.rs @@ -35,7 +35,7 @@ pub enum MessageKind { Common { /// Sender, empty for messages sent to channels. #[serde(flatten)] - from: Sender, + from: Option, #[serde(flatten)] forward_kind: ForwardKind, @@ -352,7 +352,7 @@ mod getters { /// NOTE: this is getter for both `from` and `author_signature` pub fn from(&self) -> Option<&Sender> { match &self.kind { - Common { from, .. } => Some(from), + Common { from, .. } => from.as_ref(), _ => None, } } diff --git a/src/types/message_entity.rs b/src/types/message_entity.rs index 75ae45b7..550145d2 100644 --- a/src/types/message_entity.rs +++ b/src/types/message_entity.rs @@ -116,14 +116,14 @@ mod tests { photo: None, }, kind: MessageKind::Common { - from: Sender::User(User { + from: Some(Sender::User(User { id: 0, is_bot: false, first_name: "".to_string(), last_name: None, username: None, language_code: None, - }), + })), forward_kind: ForwardKind::Origin { reply_to_message: None, }, diff --git a/src/types/update.rs b/src/types/update.rs index e3e18a0d..66ee1bfd 100644 --- a/src/types/update.rs +++ b/src/types/update.rs @@ -158,14 +158,14 @@ mod test { photo: None, }, kind: MessageKind::Common { - from: Sender::User(User { + from: Some(Sender::User(User { id: 218_485_655, is_bot: false, first_name: String::from("Waffle"), last_name: None, username: Some(String::from("WaffleLapkin")), language_code: Some(LanguageCode::EN), - }), + })), forward_kind: ForwardKind::Origin { reply_to_message: None, },