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

revert tryable repls

Browse source
This commit is contained in:
jrx 2023-08-31 23:03:54 +02:00
parent e861454413
commit 8d858c43ff
3 changed files with 6 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,7 +60,7 @@
#![allow(clippy::nonstandard_macro_braces)] #![allow(clippy::nonstandard_macro_braces)]
#[cfg(feature = "ctrlc_handler")] #[cfg(feature = "ctrlc_handler")]
pub use repls::{repl, repl_with_listener, try_repl, try_repl_with_listener}; pub use repls::{repl, repl_with_listener};
#[cfg(feature = "ctrlc_handler")] #[cfg(feature = "ctrlc_handler")]
#[allow(deprecated)] #[allow(deprecated)]

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

@ -14,4 +14,4 @@ mod repl;
pub use commands_repl::CommandReplExt; pub use commands_repl::CommandReplExt;
#[allow(deprecated)] #[allow(deprecated)]
pub use commands_repl::{commands_repl, commands_repl_with_listener}; pub use commands_repl::{commands_repl, commands_repl_with_listener};
pub use repl::{repl, repl_with_listener, try_repl, try_repl_with_listener}; pub use repl::{repl, repl_with_listener};

122
crates/teloxide/src/repls/repl.rs
View file

@ -50,65 +50,13 @@ use std::fmt::Debug;
/// ///
#[cfg(feature = "ctrlc_handler")] #[cfg(feature = "ctrlc_handler")]
pub async fn repl<R, H, Args>(bot: R, handler: H) pub async fn repl<R, H, Args>(bot: R, handler: H)
where
R: Requester + Send + Sync + Clone + 'static,
<R as Requester>::GetUpdates: Send,
H: Injectable<DependencyMap, ResponseResult<()>, Args> + Send + Sync + 'static,
{
try_repl(bot, handler).await.expect("try_repl failed")
}
/// Same as `repl` but returns a Result<_> instead of panicking
///
/// A [REPL] for messages.
//
///
//
#[doc = include_str!("preamble.md")]
///
/// [REPL]: https://en.wikipedia.org/wiki/Read-eval-print_loop
///
/// ## Signature
///
/// Don't be scared by many trait bounds in the signature, in essence they
/// require:
///
/// 1. `bot` is a bot, client for the Telegram bot API. It is represented via
/// the [`Requester`] trait.
/// 2. `handler` is an `async` function that takes arguments from
/// [`DependencyMap`] (see below) and returns [`ResponseResult`].
///
/// ## Handler arguments
///
/// `teloxide` provides the following types to the `handler`:
/// - [`Message`]
/// - `R` (type of the `bot`)
/// - [`Me`]
///
/// Each of these types can be accepted as a handler parameter. Note that they
/// aren't all required at the same time: e.g., you can take only the bot and
/// the message without [`Me`].
///
/// [`Me`]: crate::types::Me
/// [`Message`]: crate::types::Message
///
/// ## Stopping
//
#[doc = include_str!("stopping.md")]
///
/// ## Caution
//
#[doc = include_str!("caution.md")]
///
#[cfg(feature = "ctrlc_handler")]
pub async fn try_repl<R, H, Args>(bot: R, handler: H) -> Result<(), R::Err>
where where
R: Requester + Send + Sync + Clone + 'static, R: Requester + Send + Sync + Clone + 'static,
<R as Requester>::GetUpdates: Send, <R as Requester>::GetUpdates: Send,
H: Injectable<DependencyMap, ResponseResult<()>, Args> + Send + Sync + 'static, H: Injectable<DependencyMap, ResponseResult<()>, Args> + Send + Sync + 'static,
{ {
let cloned_bot = bot.clone(); let cloned_bot = bot.clone();
try_repl_with_listener(bot, handler, update_listeners::polling_default(cloned_bot).await).await repl_with_listener(bot, handler, update_listeners::polling_default(cloned_bot).await).await;
} }
/// A [REPL] for messages, with a custom [`UpdateListener`]. /// A [REPL] for messages, with a custom [`UpdateListener`].
@ -156,66 +104,6 @@ where
/// ///
#[cfg(feature = "ctrlc_handler")] #[cfg(feature = "ctrlc_handler")]
pub async fn repl_with_listener<R, H, L, Args>(bot: R, handler: H, listener: L) pub async fn repl_with_listener<R, H, L, Args>(bot: R, handler: H, listener: L)
where
R: Requester + Clone + Send + Sync + 'static,
H: Injectable<DependencyMap, ResponseResult<()>, Args> + Send + Sync + 'static,
L: UpdateListener + Send,
L::Err: Debug,
{
try_repl_with_listener(bot, handler, listener).await.expect("try_repl_with_listener failed")
}
/// Same as `repl_with_listener` but returns a Result<_> instead of panicking
///
/// A [REPL] for messages, with a custom [`UpdateListener`].
//
///
//
#[doc = include_str!("preamble.md")]
///
/// [REPL]: https://en.wikipedia.org/wiki/Read-eval-print_loop
/// [`UpdateListener`]: crate::update_listeners::UpdateListener
///
/// ## Signature
///
/// Don't be scared by many trait bounds in the signature, in essence they
/// require:
///
/// 1. `bot` is a bot, client for the Telegram bot API. It is represented via
/// the [`Requester`] trait.
/// 2. `handler` is an `async` function that takes arguments from
/// [`DependencyMap`] (see below) and returns [`ResponseResult`].
/// 3. `listener` is something that takes updates from a Telegram server and
/// implements [`UpdateListener`].
///
/// ## Handler arguments
///
/// `teloxide` provides the following types to the `handler`:
/// - [`Message`]
/// - `R` (type of the `bot`)
/// - [`Me`]
///
/// Each of these types can be accepted as a handler parameter. Note that they
/// aren't all required at the same time: e.g., you can take only the bot and
/// the message without [`Me`].
///
/// [`Me`]: crate::types::Me
/// [`Message`]: crate::types::Message
///
/// ## Stopping
//
#[doc = include_str!("stopping.md")]
///
/// ## Caution
//
#[doc = include_str!("caution.md")]
///
#[cfg(feature = "ctrlc_handler")]
pub async fn try_repl_with_listener<R, H, L, Args>(
bot: R,
handler: H,
listener: L,
) -> Result<(), R::Err>
where where
R: Requester + Clone + Send + Sync + 'static, R: Requester + Clone + Send + Sync + 'static,
H: Injectable<DependencyMap, ResponseResult<()>, Args> + Send + Sync + 'static, H: Injectable<DependencyMap, ResponseResult<()>, Args> + Send + Sync + 'static,
@ -232,13 +120,11 @@ where
.default_handler(ignore_update) .default_handler(ignore_update)
.enable_ctrlc_handler() .enable_ctrlc_handler()
.build() .build()
.try_dispatch_with_listener( .dispatch_with_listener(
listener, listener,
LoggingErrorHandler::with_custom_text("An error from the update listener"), LoggingErrorHandler::with_custom_text("An error from the update listener"),
) )
.await?; .await;
Ok(())
} }
#[test] #[test]
@ -248,4 +134,4 @@ fn repl_is_send() {
assert_send(&repl); assert_send(&repl);
fn assert_send(_: &impl Send) {} fn assert_send(_: &impl Send) {}
} }