cargo update

ProtobufBot · Aug 24, 2022 · 68fd1cc · 68fd1cc
1 parent e0c1a53
commit 68fd1cc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/bot/bots.rs b/src/bot/bots.rs
@@ -3,9 +3,10 @@ use std::time::Duration;
 
 use dashmap::DashMap;
 use lazy_static::lazy_static;
+use ricq::client::DefaultConnector;
 use ricq::{
     ext::common::after_login,
-    ext::reconnect::{auto_reconnect, Credential, DefaultConnector},
+    ext::reconnect::{auto_reconnect, Credential},
     handler::QEvent,
     Client,
 };

diff --git a/src/handler/password.rs b/src/handler/password.rs
@@ -4,10 +4,11 @@ use axum::Json;
 use dashmap::DashMap;
 use lazy_static::lazy_static;
 use rand::{prelude::StdRng, SeedableRng};
+use ricq::client::{Connector, DefaultConnector};
 use ricq::{
     client::NetworkStatus,
     device::Device,
-    ext::reconnect::{Connector, Credential, DefaultConnector, Password},
+    ext::reconnect::{Credential, Password},
     handler::QEvent,
     version::{get_version, Protocol},
     Client, LoginDeviceLocked, LoginNeedCaptcha, LoginResponse,

diff --git a/src/handler/qrcode.rs b/src/handler/qrcode.rs
@@ -6,6 +6,7 @@ use dashmap::DashMap;
 use lazy_static::lazy_static;
 use rand::rngs::StdRng;
 use rand::SeedableRng;
+use ricq::client::{Connector, DefaultConnector};
 use ricq::{
     client::NetworkStatus,
     device::Device,
@@ -79,9 +80,8 @@ pub async fn create(Json(req): Json<CreateClientReq>) -> RCResult<Json<CreateCli
     };
     let (sender, receiver) = tokio::sync::broadcast::channel(10);
     let cli = Arc::new(Client::new(device, get_version(protocol), sender));
-    let stream = tokio::net::TcpStream::connect(cli.get_address())
-        .await
-        .map_err(RCError::IO)?;
+    let connector = DefaultConnector;
+    let stream = connector.connect(&cli).await?;
     let c = cli.clone();
     let network_join_handle = tokio::spawn(async move { c.start(stream).await });
     tokio::task::yield_now().await;