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

Throttle: make comment up to date & add channel fn

Browse source
This commit is contained in:
Waffle 2021-02-16 19:07:50 +03:00
parent 72306c39d9
commit 80329f8a1e
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/adaptors/throttle.rs
View file

@ -13,7 +13,7 @@ use futures::{
use never::Never; use never::Never;
use tokio::sync::{ use tokio::sync::{
mpsc, mpsc,
oneshot::{channel, Receiver, Sender}, oneshot::{self, Receiver, Sender},
}; };
use vecrem::VecExt; use vecrem::VecExt;
@ -129,7 +129,6 @@ impl Default for Limits {
/// ```no_run (throttle fails to spawn task without tokio runtime) /// ```no_run (throttle fails to spawn task without tokio runtime)
/// use teloxide_core::{adaptors::throttle::Limits, requests::RequesterExt, Bot}; /// use teloxide_core::{adaptors::throttle::Limits, requests::RequesterExt, Bot};
/// ///
/// # #[allow(deprecated)]
/// let bot = Bot::new("TOKEN").throttle(Limits::default()); /// let bot = Bot::new("TOKEN").throttle(Limits::default());
/// ///
/// /* send many requests here */ /// /* send many requests here */
@ -149,7 +148,7 @@ impl Default for Limits {
/// wrapper. /// wrapper.
pub struct Throttle<B> { pub struct Throttle<B> {
bot: B, bot: B,
// Sender<Never> is used to pass the signal to unlock by closing the channel. // `RequestLock` allows to unlock requests (allowing them to be sent).
queue: mpsc::Sender<(ChatIdHash, RequestLock)>, queue: mpsc::Sender<(ChatIdHash, RequestLock)>,
} }
@ -533,8 +532,6 @@ where
fn send(self) -> Self::Send { fn send(self) -> Self::Send {
let (tx, rx) = channel(); let (tx, rx) = channel();
let tx = RequestLock(tx);
let rx = RequestWaiter(rx);
let chat_id = (self.chat_id)(self.payload_ref()); let chat_id = (self.chat_id)(self.payload_ref());
let send = self.worker.send1((chat_id, tx)); let send = self.worker.send1((chat_id, tx));
@ -549,8 +546,6 @@ where
fn send_ref(&self) -> Self::SendRef { fn send_ref(&self) -> Self::SendRef {
let (tx, rx) = channel(); let (tx, rx) = channel();
let tx = RequestLock(tx);
let rx = RequestWaiter(rx);
let chat_id = (self.chat_id)(self.payload_ref()); let chat_id = (self.chat_id)(self.payload_ref());
let send = self.worker.clone().send1((chat_id, tx)); let send = self.worker.clone().send1((chat_id, tx));
@ -745,6 +740,13 @@ impl<R: Request> Future for ThrottlingSendRef<R> {
} }
} }
fn channel() -> (RequestLock, RequestWaiter) {
let (tx, rx) = oneshot::channel();
let tx = RequestLock(tx);
let rx = RequestWaiter(rx);
(tx, rx)
}
#[must_use] #[must_use]
struct RequestLock(Sender<Never>); struct RequestLock(Sender<Never>);