From 3c30284097ff700a39abf190b6f4dad9d5c274a6 Mon Sep 17 00:00:00 2001
From: myOmikron <git@omikron.dev>
Date: Thu, 7 Sep 2023 13:10:28 +0200
Subject: [PATCH] Updated dehashed

---
 Cargo.lock                        | 22 ++++------------------
 leech/Cargo.toml                  |  2 +-
 leech/src/modules/dehashed/mod.rs | 10 +++++++---
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6e4e0983e..b34516cbc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1036,23 +1036,9 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
 
 [[package]]
 name = "dehashed-rs"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "383f137c213fe1c5371d3b5e781bb9c66576644b78323e6a9f453aebb6ee3357"
-dependencies = [
- "log",
- "reqwest",
- "rustc_version",
- "serde",
- "serde_json",
- "tokio",
-]
-
-[[package]]
-name = "dehashed-rs"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fd886b923849670dac019ef9bafe7561a29f0401fef16236bea713af6a174d1"
+checksum = "f3d5b0b5aa40f563957faa3949a89b16544cff8a4e99000019143a5fc75f1e72"
 dependencies = [
  "log",
  "reqwest",
@@ -1844,7 +1830,7 @@ dependencies = [
  "bytes",
  "chrono",
  "clap",
- "dehashed-rs 0.3.1",
+ "dehashed-rs",
  "futures",
  "ipnet",
  "log",
@@ -1889,7 +1875,7 @@ dependencies = [
  "byte-unit",
  "chrono",
  "clap",
- "dehashed-rs 0.2.0",
+ "dehashed-rs",
  "env_logger",
  "futures",
  "ipnet",
diff --git a/leech/Cargo.toml b/leech/Cargo.toml
index c4849b21a..cdd388927 100644
--- a/leech/Cargo.toml
+++ b/leech/Cargo.toml
@@ -73,7 +73,7 @@ reqwest = { version = "~0.11", features = ["json", "trust-dns", "rustls-tls-nati
 url = { version = "~2" }
 
 # dehashed api
-dehashed-rs = { version = "0.3", features = ["tokio"] }
+dehashed-rs = { version = "~0.3", features = ["tokio"] }
 
 [build-dependencies]
 tonic-build = { version = "~0.9" }
diff --git a/leech/src/modules/dehashed/mod.rs b/leech/src/modules/dehashed/mod.rs
index 53d1064cc..3a05ff341 100644
--- a/leech/src/modules/dehashed/mod.rs
+++ b/leech/src/modules/dehashed/mod.rs
@@ -17,14 +17,18 @@ pub async fn query(
     let api = DehashedApi::new(email, api_key)?;
     let scheduler = api.start_scheduler();
     let s_tx = scheduler.retrieve_sender();
-    let (tx, mut rx) = oneshot::channel();
+    let (tx, rx) = oneshot::channel();
     if let Err(err) = s_tx.send(ScheduledRequest::new(query, tx)).await {
         error!("Couldn't send to dehashed scheduler: {err}");
         return Err(DehashedError::DehashedSchedulerUnreachable);
     }
 
-    match rx.try_recv() {
+    match rx.await {
         Ok(x) => Ok(x?),
-        Err(_) => Err(DehashedError::DehashedSchedulerUnreachable),
+        Err(x) => {
+            error!("{x}");
+
+            Err(DehashedError::DehashedSchedulerUnreachable)
+        }
     }
 }