do more later

Cargo.toml

@@ -25,3 +25,4 @@ once_cell = "1.19.0"
 ammonia = "4.0.0"
 kuchikiki = "0.8.2"
 js-sys = "0.3.69"
+uuid = { version = "1.8.0", features = ["v4", "fast-rng"] }

src/main.rs

@@ -111,7 +111,7 @@ async fn handle_socket(socket: WebSocket, _who: SocketAddr, state: Arc<AppState>
     let mut rx = state.tx.subscribe();
 
     // Now send the "joined" message to all subscribers.
-    let msg = format!("user {0} connected.", user.lock().unwrap().name);
+    let msg = format!("user with id {0} connected.", user.lock().unwrap().id);
     tracing::debug!("{msg}");
 
     let msg_vec = (*MESSAGES.lock().unwrap().clone()).to_vec();
@@ -176,10 +176,11 @@ async fn handle_socket(socket: WebSocket, _who: SocketAddr, state: Arc<AppState>
                         }
                     }
                 },
-                MessageTypes::UserJoin(mut request) => {
-                    /*let _ = state.tx.send(
-                        serde_json::to_string(&(UserJoin { userjoin: user.lock().unwrap().name.clone() })).expect("")
-                    );*/
+                MessageTypes::UserJoin(request) => {
+                    user_recv.lock().unwrap().name = request.user;
+                    let _ = state.tx.send(
+                        serde_json::to_string(&(UserJoin { userjoin: user_recv.lock().unwrap().name.clone() })).expect("")
+                    );
                     continue;
                 }
                 _ => {

src/message/model.rs

@@ -27,11 +27,11 @@ pub struct RetrieveMessages {
 // User related messages
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct UserJoin {
-    pub userjoin: String
+    pub user: String
 }
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct UserLeft {
-    pub userleft: String
+    pub user: String
 }
 
 // Moderation related messages

src/user/model.rs

@@ -1,11 +1,26 @@
 use std::error::Error;
 use rustrict::{Censor, Type};
+use serde::{Serialize, Deserialize};
+use uuid::Uuid
 
+/// What am I?
+/// A class meant to hold all the values the server uses to compute messages.
+/// *Do not send me. Ever.*
 #[derive(Clone)]
 pub struct User {
     pub name: String,
     pub id: i32,
-    pub glass: GlassModeration
+    pub glass: GlassModeration,
+    //pub sendable_user: SendableUser
+}
+
+/// What am I?
+/// A stripped down version of the `User` struct so that you can send something to the other clients.
+#[derive(Serialize, Deserialize, Clone)]
+pub struct SendableUser {
+    pub name: String,
+    pub id: i32,
+    pub uuid: Uuid
 }
 
 impl User {
@@ -18,6 +33,8 @@ impl User {
     }
 }
 
+/// What am I?
+/// A struct meant to hold all the values and functions for the cauto-mod/censoring of Arcs.
 #[derive(Clone, Default)]
 pub struct GlassModeration {
     reports: i32,