bhcli

commit 52b76291e696ccf0bc356b43a90fd7f800f3b2d5
parent 3e2cc11e57d4515c64ed70b011dd7c5feff6c87b
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Mon, 27 Mar 2023 15:53:02 -0700

cleanup tor client function

Diffstat:
M
src/main.rs
 | 
30
+++++++-----------------------

1 file changed, 7 insertions(+), 23 deletions(-)
diff --git a/src/main.rs b/src/main.rs
@@ -1995,30 +1995,14 @@ fn get_guest_color(wanted: Option<String>) -> String {
 }
 
 fn get_tor_client(socks_proxy_url: &str) -> Client {
-    // Create client
-    let mut builder = reqwest::blocking::ClientBuilder::new()
+    let ua = "Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0";
+    let proxy = reqwest::Proxy::all(socks_proxy_url).unwrap();
+    reqwest::blocking::ClientBuilder::new()
         .cookie_store(true)
-        .user_agent("Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0");
-
-    if socks_proxy_url != "" {
-        let proxy = match reqwest::Proxy::all(socks_proxy_url) {
-            Ok(p) => p,
-            Err(e) => {
-                eprintln!("{}", e);
-                process::exit(1);
-            }
-        };
-        builder = builder.proxy(proxy);
-    }
-
-    let client = match builder.build() {
-        Ok(c) => c,
-        Err(e) => {
-            eprintln!("{}", e);
-            process::exit(1);
-        }
-    };
-    client
+        .user_agent(ua)
+        .proxy(proxy)
+        .build()
+        .unwrap()
 }
 
 fn ask_username(username: Option<String>) -> String {