Merge branch 'refactor-guess-a-number-bot' of https://github.com/teloxide/teloxide into refactor-guess-a-number-bot

src/bot/mod.rs

@@ -20,10 +20,7 @@ impl Bot {
     ///
     /// [`reqwest::Client`]: https://docs.rs/reqwest/0.10.1/reqwest/struct.Client.html
     pub fn from_env() -> Arc<Self> {
-        Self::new(
+        Self::from_env_with_client(Client::new())
-            std::env::var("TELOXIDE_TOKEN")
-                .expect("Cannot get the TELOXIDE_TOKEN env variable"),
-        )
     }
 
     /// Creates a new `Bot` with the `TELOXIDE_TOKEN` environmental variable (a
@@ -35,7 +32,7 @@ impl Bot {
     /// [`reqwest::Client`]: https://docs.rs/reqwest/0.10.1/reqwest/struct.Client.html
     pub fn from_env_with_client(client: Client) -> Arc<Self> {
         Self::with_client(
-            std::env::var("TELOXIDE_TOKEN")
+            &std::env::var("TELOXIDE_TOKEN")
                 .expect("Cannot get the TELOXIDE_TOKEN env variable"),
             client,
         )

src/utils/client_from_env.rs

@@ -0,0 +1,11 @@
+pub fn client_from_env() -> reqwest::Client {
+    use reqwest::{Client, Proxy};
+
+    match std::env::var("TELOXIDE_PROXY").ok() {
+        Some(proxy) => Client::builder()
+            .proxy(Proxy::all(&proxy).expect("creating reqwest::Proxy"))
+            .build()
+            .expect("creating reqwest::Client"),
+        None => Client::new(),
+    }
+}

src/utils/mod.rs

@@ -1,5 +1,6 @@
 //! Some useful utilities.
 
+pub mod client_from_env;
 pub mod command;
 pub mod html;
 pub mod markdown;