bhcli

commit d61ca3d5b54ec562208b34bf233a4b298e547e2c
parent 09cb373aa565d44a37e16f9ba1283e641ac95b6c
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Mon, 27 Mar 2023 16:21:29 -0700

simplify code, remove useless lifetime annotations

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

1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/main.rs b/src/main.rs
@@ -220,10 +220,10 @@ struct BaseClient {
     password: String,
 }
 
-struct LeChatPHPClient<'a> {
+struct LeChatPHPClient {
     base_client: BaseClient,
     guest_color: String,
-    client: &'a Client,
+    client: Client,
     session: String,
     config: LeChatPHPConfig,
     dkf_api_key: Option<String>,
@@ -242,7 +242,7 @@ struct LeChatPHPClient<'a> {
     color_rx: Arc<Mutex<crossbeam_channel::Receiver<()>>>,
 }
 
-impl<'a> LeChatPHPClient<'a> {
+impl LeChatPHPClient {
     fn run_forever(&mut self) {
         let max_retry = self.max_login_retry;
         let mut attempt = 0;
@@ -1804,18 +1804,18 @@ fn ban_imposters(tx: &crossbeam_channel::Sender<PostType>, account_username: &st
     }
 }
 
-struct CustomClient<'a> {
-    le_chat_php_client: LeChatPHPClient<'a>,
+struct CustomClient {
+    le_chat_php_client: LeChatPHPClient,
 }
 
-impl ChatClient for CustomClient<'_> {
+impl ChatClient for CustomClient {
     fn run_forever(&mut self) {
         self.le_chat_php_client.run_forever();
     }
 }
 
-impl<'a> CustomClient<'a> {
-    fn new(params: Params<'a>) -> Self {
+impl CustomClient {
+    fn new(params: Params) -> Self {
         let mut c = new_default_le_chat_php_client(params.clone());
         c.config.url = params.url.unwrap_or("".to_owned());
         c.config.page_php = params.page_php.unwrap_or("chat.php".to_owned());
@@ -1828,11 +1828,11 @@ impl<'a> CustomClient<'a> {
     }
 }
 
-struct BHClient<'a> {
-    le_chat_php_client: LeChatPHPClient<'a>,
+struct BHClient {
+    le_chat_php_client: LeChatPHPClient,
 }
 
-impl ChatClient for BHClient<'_> {
+impl ChatClient for BHClient {
     fn run_forever(&mut self) {
         self.le_chat_php_client.run_forever();
     }
@@ -1865,8 +1865,8 @@ fn new_default_le_chat_php_client(params: Params) -> LeChatPHPClient {
     }
 }
 
-impl<'a> BHClient<'a> {
-    fn new(params: Params<'a>) -> Self {
+impl BHClient {
+    fn new(params: Params) -> Self {
         let mut c = new_default_le_chat_php_client(params);
         c.config = LeChatPHPConfig::new_black_hat_chat_config();
         c.manual_captcha = true;
@@ -1880,18 +1880,18 @@ trait ChatClient {
     fn run_forever(&mut self);
 }
 
-struct DanClient<'a> {
-    le_chat_php_client: LeChatPHPClient<'a>,
+struct DanClient {
+    le_chat_php_client: LeChatPHPClient,
 }
 
-impl ChatClient for DanClient<'_> {
+impl ChatClient for DanClient {
     fn run_forever(&mut self) {
         self.le_chat_php_client.run_forever();
     }
 }
 
-impl<'a> DanClient<'a> {
-    fn new(params: Params<'a>) -> Self {
+impl DanClient {
+    fn new(params: Params) -> Self {
         let mut c = new_default_le_chat_php_client(params);
         c.config = LeChatPHPConfig::new_dans_chat_config();
         c.manual_captcha = true;
@@ -1902,7 +1902,7 @@ impl<'a> DanClient<'a> {
 }
 
 #[derive(Debug, Clone)]
-struct Params<'a> {
+struct Params {
     url: Option<String>,
     page_php: Option<String>,
     datetime_fmt: Option<String>,
@@ -1910,7 +1910,7 @@ struct Params<'a> {
     username: String,
     password: String,
     guest_color: String,
-    client: &'a Client,
+    client: Client,
     dkf_api_key: Option<String>,
     manual_captcha: bool,
     refresh_rate: u64,
@@ -2146,7 +2146,7 @@ fn main() -> Result<()> {
         username,
         password,
         guest_color,
-        client: &client,
+        client: client.clone(),
         dkf_api_key: opts.dkf_api_key,
         manual_captcha: opts.manual_captcha,
         refresh_rate: opts.refresh_rate,