From 4bd671de4cae52b778bc8271bc9d458ecf37f58e Mon Sep 17 00:00:00 2001
From: Leo dev <klesti.selimay@icloud.com>
Date: Sat, 4 Oct 2025 21:59:35 +0200
Subject: [PATCH] Improved messaging and fixed direct sending problems as well
 as uuid

---
 src/requests/message.rs | 24 +++++++++++++++++++++---
 src/utils/client.rs     |  5 ++++-
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/requests/message.rs b/src/requests/message.rs
index b4a4b41..6c08a3a 100644
--- a/src/requests/message.rs
+++ b/src/requests/message.rs
@@ -33,13 +33,31 @@ pub fn send(
         let c = c.clone();
         let server = server.clone();
         let msg = msg.clone();
+
         std::thread::spawn(move || {
-            server
-                .wrap_err(&c, c.send(types::ServerMessage::MessageCreate(msg)))
-                .expect("Failed to broadcast");
+            if let Some(uuid) =
+                LOGGER.extract(server.wrap_err(&c, c.get_uuid()), "Unable send message")
+            {
+                if uuid != channel_id {
+                    return;
+                }
+
+                LOGGER.extract(
+                    server.wrap_err(&c, c.send(types::ServerMessage::MessageCreate(msg))),
+                    "Failed to send message",
+                );
+            }
         });
     }
 
+    LOGGER.extract(
+        server.wrap_err(
+            &client,
+            client.send(types::ServerMessage::MessageCreate(msg)),
+        ),
+        "Failed to send message",
+    );
+
     Ok(())
 }
 
diff --git a/src/utils/client.rs b/src/utils/client.rs
index 792f9cd..66626b2 100644
--- a/src/utils/client.rs
+++ b/src/utils/client.rs
@@ -339,7 +339,10 @@ impl Client {
 
 impl Clone for Client {
     fn clone(&self) -> Self {
-        Client(self.0.try_clone().expect("failed to clone TcpStream"), None)
+        Client(
+            self.0.try_clone().expect("failed to clone TcpStream"),
+            self.1.clone(),
+        )
     }
 }