OpenSource/teloxide
OpenSource/teloxide
1
0
Fork 0
mirror of https://github.com/teloxide/teloxide.git synced 2024-10-24 01:47:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Avoid code duplication in src/bot/mod.rs

Browse source
This commit is contained in:
Temirkhan Myrzamadi 2020-07-25 04:11:58 +06:00
parent 4c78414771
commit 1006a7d187
1 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/bot/mod.rs
View file

@ -31,9 +31,7 @@ impl Bot {
/// [`reqwest::Client`]: https://docs.rs/reqwest/0.10.1/reqwest/struct.Client.html
#[allow(deprecated)]
pub fn from_env() -> Self {
Self::from_env_with_client(
sound_bot().build().expect("creating reqwest::Client"),
)
Self::from_env_with_client(build_sound_bot())
}
/// Creates a new `Bot` with the `TELOXIDE_TOKEN` environmental variable (a
@ -51,11 +49,7 @@ impl Bot {
#[deprecated]
#[allow(deprecated)]
pub fn from_env_with_client(client: Client) -> Self {
Self::with_client(
&std::env::var("TELOXIDE_TOKEN")
.expect("Cannot get the TELOXIDE_TOKEN env variable"),
client,
)
Self::with_client(&get_token_from_env(), client)
}
/// Creates a new `Bot` with the specified token and the default
@ -71,10 +65,7 @@ impl Bot {
where
S: Into<String>,
{
Self::with_client(
token,
sound_bot().build().expect("creating reqwest::Client"),
)
Self::with_client(token, build_sound_bot())
}
/// Creates a new `Bot` with the specified token and your
@ -120,6 +111,15 @@ pub(crate) fn sound_bot() -> ClientBuilder {
.default_headers(headers)
}
pub(crate) fn build_sound_bot() -> Client {
sound_bot().build().expect("creating reqwest::Client")
}
fn get_token_from_env() -> String {
std::env::var("TELOXIDE_TOKEN")
.expect("Cannot get the TELOXIDE_TOKEN env variable")
}
impl Bot {
// TODO: const fn
pub fn token(&self) -> &str {
@ -215,16 +215,8 @@ impl BotBuilder {
#[must_use]
pub fn build(self) -> Bot {
Bot {
client: self.client.unwrap_or_else(|| {
sound_bot().build().expect("creating reqwest::Client")
}),
token: self
.token
.unwrap_or_else(|| {
std::env::var("TELOXIDE_TOKEN")
.expect("Cannot get the TELOXIDE_TOKEN env variable")
})
.into(),
client: self.client.unwrap_or_else(build_sound_bot),
token: self.token.unwrap_or_else(get_token_from_env).into(),
parse_mode: Arc::new(self.parse_mode),
}
}