From cff4c435d267021f17e0932002c8a499d0350e4f Mon Sep 17 00:00:00 2001
From: trafficlunar <hello@trafficlunar.net>
Date: Sat, 22 Mar 2025 12:39:06 +0000
Subject: [PATCH] fix: replace `left_clicks` and `right_clicks` with generic
 `clicks`

---
 src/computer.rs  | 33 ++++++++-------------------------
 src/websocket.rs |  7 +++----
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/src/computer.rs b/src/computer.rs
index 9324beb..aa2b640 100644
--- a/src/computer.rs
+++ b/src/computer.rs
@@ -15,12 +15,10 @@ pub fn start_sending(socket: &mut WebSocket<MaybeTlsStream<TcpStream>>) {
     let mut sys = System::new();
 
     let key_counter = Arc::new(Mutex::new(0_u16));
-    let left_click_counter = Arc::new(Mutex::new(0_u16));
-    let right_click_counter = Arc::new(Mutex::new(0_u16));
+    let click_counter = Arc::new(Mutex::new(0_u16));
 
     let key_counter_clone = Arc::clone(&key_counter);
-    let left_click_counter_clone = Arc::clone(&left_click_counter);
-    let right_click_counter_clone = Arc::clone(&right_click_counter);
+    let click_counter_clone = Arc::clone(&click_counter);
 
     thread::spawn(move || {
         KeybdKey::bind_all(move |_| {
@@ -29,12 +27,8 @@ pub fn start_sending(socket: &mut WebSocket<MaybeTlsStream<TcpStream>>) {
         });
 
         MouseButton::bind_all(move |event| match event {
-            MouseButton::LeftButton => {
-                let mut count = left_click_counter_clone.lock().unwrap();
-                *count += 1;
-            }
-            MouseButton::RightButton => {
-                let mut count = right_click_counter_clone.lock().unwrap();
+            MouseButton::LeftButton | MouseButton::RightButton => {
+                let mut count = click_counter_clone.lock().unwrap();
                 *count += 1;
             }
             _ => {}
@@ -56,25 +50,14 @@ pub fn start_sending(socket: &mut WebSocket<MaybeTlsStream<TcpStream>>) {
         let mut key_guard = key_counter.lock().unwrap();
         let key_presses = *key_guard;
 
-        let mut left_guard = left_click_counter.lock().unwrap();
-        let left_clicks = *left_guard;
+        let mut click_guard = click_counter.lock().unwrap();
+        let clicks = *click_guard;
 
-        let mut right_guard = right_click_counter.lock().unwrap();
-        let right_clicks = *right_guard;
-
-        websocket::send(
-            socket,
-            cpu_usage,
-            memory_usage,
-            key_presses,
-            left_clicks,
-            right_clicks,
-        );
+        websocket::send(socket, cpu_usage, memory_usage, key_presses, clicks);
 
         // Reset counters after sending
         *key_guard = 0;
-        *left_guard = 0;
-        *right_guard = 0;
+        *click_guard = 0;
 
         thread::sleep(Duration::from_secs(60));
     }
diff --git a/src/websocket.rs b/src/websocket.rs
index f636065..9d4ac94 100644
--- a/src/websocket.rs
+++ b/src/websocket.rs
@@ -48,12 +48,11 @@ pub fn send(
     cpu: u8,
     ram: u8,
     key_presses: u16,
-    left_clicks: u16,
-    right_clicks: u16,
+    clicks: u16,
 ) {
     let message = format!(
-        "{{ \"cpu\": {}, \"ram\": {}, \"key_presses\": {}, \"left_clicks\": {}, \"right_clicks\": {} }}",
-        cpu, ram, key_presses, left_clicks, right_clicks
+        "{{ \"cpu\": {}, \"ram\": {}, \"key_presses\": {}, \"clicks\": {} }}",
+        cpu, ram, key_presses, clicks
     );
 
     println!("Sending to WebSocket: {}", message);