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

Removed multiple messages sugar functionality

Browse source
This commit is contained in:
LasterAlex 2024-09-03 13:43:50 +03:00
parent 4ac9226f83
commit 9f7d980a70
No known key found for this signature in database
3 changed files with 30 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crates/teloxide-core/src/types/message.rs
View file

@ -1816,16 +1816,6 @@ impl Message {
} }
} }
/// Implemented for syntax sugar, see issue <https://github.com/teloxide/teloxide/issues/1143>
impl IntoIterator for Message {
type Item = Message;
type IntoIter = std::vec::IntoIter<Self::Item>;
fn into_iter(self) -> Self::IntoIter {
vec![self].into_iter()
}
}
/// Implemented for syntax sugar, see issue <https://github.com/teloxide/teloxide/issues/1143> /// Implemented for syntax sugar, see issue <https://github.com/teloxide/teloxide/issues/1143>
#[allow(clippy::from_over_into)] #[allow(clippy::from_over_into)]
impl Into<MessageId> for Message { impl Into<MessageId> for Message {

2
crates/teloxide/src/sugar.rs
View file

@ -1,4 +1,4 @@
//! Some non-detrimental, but nice additions //! Some syntax sugar support for TBA functionality
pub mod bot; pub mod bot;
pub mod request; pub mod request;

134
crates/teloxide/src/sugar/bot.rs
View file

@ -2,90 +2,55 @@
//! //!
//! [`Bot`]: crate::Bot //! [`Bot`]: crate::Bot
use crate::{prelude::*, types::*}; use crate::{prelude::*, types::*};
use std::collections::HashSet;
use teloxide_core::{payloads::*, requests::JsonRequest}; use teloxide_core::{payloads::*, requests::JsonRequest};
/// Adds useful manipulations with [`Message`] structs /// Adds useful manipulations with [`Message`] structs
/// ///
/// [`Message`]: crate::types::Message /// [`Message`]: crate::types::Message
pub trait BotMessagesExt { pub trait BotMessagesExt {
/// This function is the same as [`Bot::forward_messages`], /// This function is the same as [`Bot::forward_message`],
/// but can take in [`Message`], including just one. /// but can take in [`Message`] to forward it.
/// ///
/// [`Bot::forward_messages`]: crate::Bot::forward_messages /// [`Bot::forward_message`]: crate::Bot::forward_message
/// [`Message`]: crate::types::Message /// [`Message`]: crate::types::Message
fn forward<C, M>(&self, to_chat_id: C, messages: M) -> JsonRequest<ForwardMessages> fn forward<C>(&self, to_chat_id: C, message: Message) -> JsonRequest<ForwardMessage>
where where
C: Into<Recipient>, C: Into<Recipient>;
M: IntoIterator<Item = Message>;
/// This function is the same as [`Bot::copy_messages`], /// This function is the same as [`Bot::copy_message`],
/// but can take in [`Message`], including just one. /// but can take in [`Message`] to copy it.
/// ///
/// [`Bot::copy_messages`]: crate::Bot::copy_messages /// [`Bot::copy_messages`]: crate::Bot::copy_message
/// [`Message`]: crate::types::Message /// [`Message`]: crate::types::Message
fn copy<C, M>(&self, to_chat_id: C, messages: M) -> JsonRequest<CopyMessages> fn copy<C>(&self, to_chat_id: C, message: Message) -> JsonRequest<CopyMessage>
where where
C: Into<Recipient>, C: Into<Recipient>;
M: IntoIterator<Item = Message>;
/// This function is the same as [`Bot::delete_messages`], /// This function is the same as [`Bot::delete_message`],
/// but can take in [`Message`], including just one. /// but can take in [`Message`] to delete it.
/// ///
/// [`Bot::delete_messages`]: crate::Bot::delete_messages /// [`Bot::delete_message`]: crate::Bot::delete_message
/// [`Message`]: crate::types::Message /// [`Message`]: crate::types::Message
fn delete<M>(&self, messages: M) -> JsonRequest<DeleteMessages> fn delete(&self, message: Message) -> JsonRequest<DeleteMessage>;
where
M: IntoIterator<Item = Message>;
}
fn compress_chat_messages<M>(messages: M) -> (ChatId, Vec<MessageId>)
where
M: IntoIterator<Item = Message>,
{
let (message_ids, unique_chat_ids): (Vec<MessageId>, HashSet<ChatId>) =
messages.into_iter().map(|m| (m.id, m.chat.id)).unzip();
if unique_chat_ids.is_empty() {
panic!("There needs to be at least one message!");
} else if unique_chat_ids.len() > 1 {
panic!(
"Messages shouldn't come from different chats! Current chat ids: {:?}",
unique_chat_ids.into_iter().map(|c| c.0).collect::<Vec<i64>>()
);
}
// Unwrap: length is checked to be non-zero before
let chat_id = unique_chat_ids.into_iter().next().unwrap();
(chat_id, message_ids)
} }
impl BotMessagesExt for Bot { impl BotMessagesExt for Bot {
fn forward<C, M>(&self, to_chat_id: C, messages: M) -> JsonRequest<ForwardMessages> fn forward<C>(&self, to_chat_id: C, message: Message) -> JsonRequest<ForwardMessage>
where where
C: Into<Recipient>, C: Into<Recipient>,
M: IntoIterator<Item = Message>,
{ {
let (from_chat_id, message_ids) = compress_chat_messages(messages); self.forward_message(to_chat_id, message.chat.id, message.id)
self.forward_messages(to_chat_id, from_chat_id, message_ids)
} }
fn copy<C, M>(&self, to_chat_id: C, messages: M) -> JsonRequest<CopyMessages> fn copy<C>(&self, to_chat_id: C, message: Message) -> JsonRequest<CopyMessage>
where where
C: Into<Recipient>, C: Into<Recipient>,
M: IntoIterator<Item = Message>,
{ {
let (from_chat_id, message_ids) = compress_chat_messages(messages); self.copy_message(to_chat_id, message.chat.id, message.id)
self.copy_messages(to_chat_id, from_chat_id, message_ids)
} }
fn delete<M>(&self, messages: M) -> JsonRequest<DeleteMessages> fn delete(&self, message: Message) -> JsonRequest<DeleteMessage> {
where self.delete_message(message.chat.id, message.id)
M: IntoIterator<Item = Message>,
{
let (chat_id, message_ids) = compress_chat_messages(messages);
self.delete_messages(chat_id, message_ids)
} }
} }
@ -170,17 +135,10 @@ pub(crate) mod tests {
let to_chat_id = ChatId(12345); let to_chat_id = ChatId(12345);
let from_chat_id = ChatId(6789); let from_chat_id = ChatId(6789);
let message_ids = vec![MessageId(100), MessageId(101), MessageId(102)]; let message_id = MessageId(100);
let sugar_forward_req = bot.forward( let sugar_forward_req = bot.forward(to_chat_id, make_message(from_chat_id, message_id));
to_chat_id, let real_forward_req = bot.forward_message(to_chat_id, from_chat_id, message_id);
vec![
make_message(from_chat_id, message_ids[0]),
make_message(from_chat_id, message_ids[1]),
make_message(from_chat_id, message_ids[2]),
],
);
let real_forward_req = bot.forward_messages(to_chat_id, from_chat_id, message_ids);
assert_eq!(sugar_forward_req.deref(), real_forward_req.deref()) assert_eq!(sugar_forward_req.deref(), real_forward_req.deref())
} }
@ -191,17 +149,10 @@ pub(crate) mod tests {
let to_chat_id = ChatId(12345); let to_chat_id = ChatId(12345);
let from_chat_id = ChatId(6789); let from_chat_id = ChatId(6789);
let message_ids = vec![MessageId(100), MessageId(101), MessageId(102)]; let message_id = MessageId(100);
let sugar_copy_req = bot.copy( let sugar_copy_req = bot.copy(to_chat_id, make_message(from_chat_id, message_id));
to_chat_id, let real_copy_req = bot.copy_message(to_chat_id, from_chat_id, message_id);
vec![
make_message(from_chat_id, message_ids[0]),
make_message(from_chat_id, message_ids[1]),
make_message(from_chat_id, message_ids[2]),
],
);
let real_copy_req = bot.copy_messages(to_chat_id, from_chat_id, message_ids);
assert_eq!(sugar_copy_req.deref(), real_copy_req.deref()) assert_eq!(sugar_copy_req.deref(), real_copy_req.deref())
} }
@ -211,41 +162,14 @@ pub(crate) mod tests {
let bot = Bot::new("TOKEN"); let bot = Bot::new("TOKEN");
let chat_id = ChatId(6789); let chat_id = ChatId(6789);
let message_ids = vec![MessageId(100), MessageId(101), MessageId(102)]; let message_id = MessageId(100);
let sugar_delete_req = bot.delete(vec![ let sugar_delete_req = bot.delete(make_message(chat_id, message_id));
make_message(chat_id, message_ids[0]), let real_delete_req = bot.delete_message(chat_id, message_id);
make_message(chat_id, message_ids[1]),
make_message(chat_id, message_ids[2]),
]);
let real_delete_req = bot.delete_messages(chat_id, message_ids);
assert_eq!(sugar_delete_req.deref(), real_delete_req.deref()) assert_eq!(sugar_delete_req.deref(), real_delete_req.deref())
} }
#[test]
#[should_panic]
fn test_forward_many_chats() {
// They all use the same validation, only one check is enough
let bot = Bot::new("TOKEN");
let _ = bot.forward(
ChatId(12345),
vec![
make_message(ChatId(6789), MessageId(100)),
make_message(ChatId(6789), MessageId(101)),
make_message(ChatId(9012), MessageId(102)),
],
);
}
#[test]
fn message_to_iterator() {
// Just to make sure one message still can be passed in
let message = make_message(ChatId(1), MessageId(1));
assert_eq!(message.clone().into_iter().next(), Some(message));
}
#[test] #[test]
fn message_to_message_id() { fn message_to_message_id() {
// Just to make sure message still can be in Into<MessageId> // Just to make sure message still can be in Into<MessageId>