OpenSource/teloxide
OpenSource/teloxide
1
0
Fork 0
mirror of https://github.com/teloxide/teloxide.git synced 2024-12-22 14:35:36 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add CallbackQuery::regular_message getter

Browse source
This commit is contained in:
Сырцев Вадим Игоревич 2024-07-31 15:50:02 +03:00 committed by Andrey Brusnik
parent a353439e3b
commit 0cb716a9ac
No known key found for this signature in database
GPG key ID: D33232F28CFF442C
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
crates/teloxide-core/CHANGELOG.md
View file

@ -119,6 +119,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Other Changes - Other Changes
- Add fields `ChafFullInfo::{has_visible_history, accent_color_id, background_custom_emoji_id, profile_accent_color_id, profile_background_custom_emoji_id}` - Add fields `ChafFullInfo::{has_visible_history, accent_color_id, background_custom_emoji_id, profile_accent_color_id, profile_background_custom_emoji_id}`
- Add `RequestId` type - Add `RequestId` type
- Add `CallbackQuery::regular_message` getter
[pr851]: https://github.com/teloxide/teloxide/pull/851 [pr851]: https://github.com/teloxide/teloxide/pull/851
[pr887]: https://github.com/teloxide/teloxide/pull/887 [pr887]: https://github.com/teloxide/teloxide/pull/887

8
crates/teloxide-core/src/types/callback_query.rs
View file

@ -60,13 +60,15 @@ impl CallbackQuery {
use crate::util::flatten; use crate::util::flatten;
use std::iter::once; use std::iter::once;
once(&self.from).chain(flatten( once(&self.from).chain(flatten(self.regular_message().map(Message::mentioned_users)))
}
#[must_use]
pub fn regular_message(&self) -> Option<&Message> {
self.message self.message
.as_ref() .as_ref()
// If we can access the message // If we can access the message
.and_then(|maybe| maybe.message()) .and_then(|maybe| maybe.message())
.map(Message::mentioned_users),
))
} }
} }