OpenSource/teloxide
OpenSource/teloxide
1
0
Fork 0
mirror of https://github.com/teloxide/teloxide.git synced 2025-03-26 16:28:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #133 from teloxide/derive_from_for_reply_markup

Browse source 
Derive From for reply markup
This commit is contained in:
Temirkhan Myrzamadi 2020-01-10 19:32:40 +06:00 • committed by GitHub
commit 1d352d9f56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/types/reply_markup.rs
View file

@ -1,14 +1,28 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use derive_more::From;
use crate::types::{ use crate::types::{
ForceReply, InlineKeyboardMarkup, ReplyKeyboardMarkup, ReplyKeyboardRemove, ForceReply, InlineKeyboardMarkup, ReplyKeyboardMarkup, ReplyKeyboardRemove,
}; };
#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)] #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, From)]
#[serde(untagged)] #[serde(untagged)]
pub enum ReplyMarkup { pub enum ReplyMarkup {
Inline(InlineKeyboardMarkup), InlineKeyboardMarkup(InlineKeyboardMarkup),
Reply(ReplyKeyboardMarkup), ReplyKeyboardMarkup(ReplyKeyboardMarkup),
ReplyKeyboardRemove(ReplyKeyboardRemove), ReplyKeyboardRemove(ReplyKeyboardRemove),
ForceReply(ForceReply), ForceReply(ForceReply),
} }
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn inline_keyboard_markup() {
let data = InlineKeyboardMarkup::new();
let expected = ReplyMarkup::InlineKeyboardMarkup(data.clone());
let actual: ReplyMarkup = data.into();
assert_eq!(actual, expected)
}
}