Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/core/types.rs
This commit is contained in:
fedechkin_alexey 2019-09-02 11:23:53 +07:00
commit 07af8204fc

View file

@ -28,52 +28,19 @@ pub struct Chat {
}
#[derive(Debug, Deserialize)]
pub struct Message {
message_id: i64,
from: Option<User>,
date: i64,
chat: Chat,
forward_from: Option<User>,
forward_from_chat: Option<Chat>,
forward_from_message_id: Option<i64>,
forward_signature: Option<String>,
forward_sender_name: Option<String>,
forward_date: Option<i64>,
reply_to_message: Option<Message>,
edit_date: Option<i64>,
media_group_id: Option<String>,
author_signature: Option<String>,
text: Option<String>,
entities: Option<Vec<MessageEntity>>,
caption_entities: Option<Vec<MessageEntity>>,
audio: Option<Audio>,
document: Option<Document>,
animation: Option<Animation>,
game: Option<Game>,
photo: Option<Vec<PhotoSize>>,
sticker: Option<Stickers>,
video: Option<Video>,
voice: Option<Voice>,
video_note: Option< VideoNote>,
caption: Option<String>,
contact: Option<Contact>,
location: Option<Location>,
venue: Option<Venue>,
poll: Option<Poll>,
new_chat_members: Option<Vec<User>>,
left_chat_member: Option<User>,
new_chat_title: Option<String>,
new_chat_photo: Option<Vec<PhotoSize>>,
delete_chat_photo: Option<Bool>,
group_chat_created: Option<Bool>,
supergroup_chat_created: Option<Bool>,
channel_chat_created: Option<Bool>,
migrate_to_chat_id: Option<i64>,
migrate_from_chat_id: Option<i64>,
pinned_message: Optional<Message>,
invoice: Option<Invoice>,
successful_payment: Optiona<SuccessfulPayment>,
connected_website: Option<String>,
passport_data: Option<PassportData>,
reply_markup: Option<InlineKeyboardMarkup>,
pub struct ChatPhoto {
small_file_id: String,
big_file_id: String,
}
#[derive(Debug, Deserialize)]
pub struct ChatPermissions {
can_send_messages: Option<bool>,
can_send_media_messages: Option<bool>,
can_send_polls: Option<bool>,
can_send_other_messages: Option<bool>,
can_add_web_page_previews: Option<bool>,
can_change_info: Option<bool>,
can_invite_users: Option<bool>,
can_pin_messages: Option<bool>,
}