OpenSource/teloxide
OpenSource/teloxide
1
0
Fork 0
mirror of https://github.com/teloxide/teloxide.git synced 2025-01-10 20:12:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #229 from Crax97/master

Browse source 
Bugfix: fix Message::parse_caption_entities
This commit is contained in:
Waffle Maybe 2022-06-20 02:20:27 +04:00 committed by GitHub
commit 038cd5d86d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 76 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## unreleased
### Fixed
- Fix `Message::parse_caption_entities` ([#229][pr229])
[pr229]: https://github.com/teloxide/teloxide-core/pull/229
## 0.6.2 - 2022-06-16
### Fixed

72
src/types/message.rs
View file

@ -1250,8 +1250,8 @@ impl Message {
///
/// [`parse_entities`]: Message::parse_entities
pub fn parse_caption_entities(&self) -> Option<Vec<MessageEntityRef<'_>>> {
self.text()
.zip(self.entities())
self.caption()
.zip(self.caption_entities())
.map(|(t, e)| MessageEntityRef::parse(t, e))
}
}
@ -1631,4 +1631,72 @@ mod tests {
// cases inclusing this
// assert!(message.sender_chat().is_some());
}
#[test]
fn parse_caption_entities() {
let json = r#"
{
"message_id": 3460,
"from": {
"id": 27433968,
"is_bot": false,
"first_name": "Crax | rats addict",
"username": "tacocrasco",
"language_code": "en"
},
"chat": {
"id": 27433968,
"first_name": "Crax | rats addict",
"username": "tacocrasco",
"type": "private"
},
"date": 1655671349,
"photo": [
{
"file_id": "AgACAgQAAxkBAAINhGKvijUVSn2i3980bQIIc1fqWGNCAAJpvDEbEmaBUfuA43fR-BnlAQADAgADcwADJAQ",
"file_unique_id": "AQADabwxGxJmgVF4",
"file_size": 2077,
"width": 90,
"height": 90
},
{
"file_id": "AgACAgQAAxkBAAINhGKvijUVSn2i3980bQIIc1fqWGNCAAJpvDEbEmaBUfuA43fR-BnlAQADAgADbQADJAQ",
"file_unique_id": "AQADabwxGxJmgVFy",
"file_size": 27640,
"width": 320,
"height": 320
},
{
"file_id": "AgACAgQAAxkBAAINhGKvijUVSn2i3980bQIIc1fqWGNCAAJpvDEbEmaBUfuA43fR-BnlAQADAgADeAADJAQ",
"file_unique_id": "AQADabwxGxJmgVF9",
"file_size": 99248,
"width": 800,
"height": 800
},
{
"file_id": "AgACAgQAAxkBAAINhGKvijUVSn2i3980bQIIc1fqWGNCAAJpvDEbEmaBUfuA43fR-BnlAQADAgADeQADJAQ",
"file_unique_id": "AQADabwxGxJmgVF-",
"file_size": 162061,
"width": 1280,
"height": 1280
}
],
"caption": "www.example.com",
"caption_entities": [
{
"offset": 0,
"length": 15,
"type": "url"
}
]
}"#;
let message: Message = serde_json::from_str(json).unwrap();
let entities = message.parse_caption_entities();
assert!(entities.is_some());
let entities = entities.unwrap();
assert!(!entities.is_empty());
assert_eq!(entities[0].kind().clone(), MessageEntityKind::Url);
}
}