mirror of
https://github.com/teloxide/teloxide.git
synced 2024-12-23 06:51:01 +01:00
divided TextFilter into MessageTextFilter and MessageCaptionFilter
This commit is contained in:
parent
03b0e41fa0
commit
720a34932f
2 changed files with 99 additions and 6 deletions
|
@ -0,0 +1,98 @@
|
|||
use crate::dispatching::Filter;
|
||||
use crate::types::Message;
|
||||
|
||||
pub struct MessageCaptionFilter {
|
||||
text: String,
|
||||
}
|
||||
|
||||
impl Filter<Message> for MessageCaptionFilter {
|
||||
fn test(&self, value: &Message) -> bool {
|
||||
match value.caption() {
|
||||
Some(caption) => self.text == caption,
|
||||
None => false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl MessageCaptionFilter {
|
||||
pub fn new(text: String) -> Self {
|
||||
Self {
|
||||
text
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn captions_are_equal() {
|
||||
let filter = MessageCaptionFilter::new("caption".to_string());
|
||||
let json = r#"{
|
||||
"message_id": 199785,
|
||||
"from": {
|
||||
"id": 250918540,
|
||||
"is_bot": false,
|
||||
"first_name": "Андрей",
|
||||
"last_name": "Власов",
|
||||
"username": "aka_dude",
|
||||
"language_code": "en"
|
||||
},
|
||||
"chat": {
|
||||
"id": 250918540,
|
||||
"first_name": "Андрей",
|
||||
"last_name": "Власов",
|
||||
"username": "aka_dude",
|
||||
"type": "private"
|
||||
},
|
||||
"date": 1568289890,
|
||||
"photo": [
|
||||
{
|
||||
"file_id": "AgADAgAD36sxG-PX0UvQSXIn9rccdw-ACA4ABAEAAwIAA20AAybcBAABFgQ",
|
||||
"file_size": 18188,
|
||||
"width": 320,
|
||||
"height": 239
|
||||
}
|
||||
],
|
||||
"caption": "caption"
|
||||
}"#;
|
||||
let message = serde_json::from_str::<Message>(json).unwrap();
|
||||
assert!(filter.test(&message));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn captions_are_not_equal() {
|
||||
let filter = MessageCaptionFilter::new("text".to_string());
|
||||
let json = r#"{
|
||||
"message_id": 199785,
|
||||
"from": {
|
||||
"id": 250918540,
|
||||
"is_bot": false,
|
||||
"first_name": "Андрей",
|
||||
"last_name": "Власов",
|
||||
"username": "aka_dude",
|
||||
"language_code": "en"
|
||||
},
|
||||
"chat": {
|
||||
"id": 250918540,
|
||||
"first_name": "Андрей",
|
||||
"last_name": "Власов",
|
||||
"username": "aka_dude",
|
||||
"type": "private"
|
||||
},
|
||||
"date": 1568289890,
|
||||
"photo": [
|
||||
{
|
||||
"file_id": "AgADAgAD36sxG-PX0UvQSXIn9rccdw-ACA4ABAEAAwIAA20AAybcBAABFgQ",
|
||||
"file_size": 18188,
|
||||
"width": 320,
|
||||
"height": 239
|
||||
}
|
||||
],
|
||||
"caption": "not equal caption"
|
||||
}"#;
|
||||
let message = serde_json::from_str::<Message>(json).unwrap();
|
||||
assert_eq!(filter.test(&message), false);
|
||||
}
|
||||
}
|
|
@ -9,12 +9,7 @@ impl Filter<Message> for MessageTextFilter {
|
|||
fn test(&self, value: &Message) -> bool {
|
||||
match value.text() {
|
||||
Some(text) => self.text == text,
|
||||
None => {
|
||||
match value.caption() {
|
||||
Some(caption) => self.text == caption,
|
||||
None => false
|
||||
}
|
||||
}
|
||||
None => false
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue