From 721a79cf74724ab80460a3228a79b3b3b93ce48c Mon Sep 17 00:00:00 2001 From: Leo dev Date: Mon, 13 Oct 2025 12:30:42 +0200 Subject: [PATCH] Working supabase structure --- src/requests/auth.rs | 6 +++--- src/requests/message.rs | 43 ++++++++++++++++++++++------------------- src/requests/mod.rs | 2 +- src/server.rs | 6 +++--- src/types.rs | 20 +++++++++++-------- src/utils/client.rs | 13 ++++++++----- src/utils/database.rs | 26 ++++++++++++------------- 7 files changed, 63 insertions(+), 53 deletions(-) diff --git a/src/requests/auth.rs b/src/requests/auth.rs index 62dd2ba..779e283 100644 --- a/src/requests/auth.rs +++ b/src/requests/auth.rs @@ -9,17 +9,17 @@ logger!(LOGGER "Auth"); #[derive(Debug, Deserialize)] struct AuthApiRes { - user_id: u32, + user_id: String, } -pub fn auth(_server: &Arc, client: &mut Client, token: &str) -> crate::Result { +pub fn auth(_server: &Arc, client: &mut Client, token: &str) -> crate::Result { let mut res = ureq::get(format!( "http://localhost:3000/api/auth?intents=server&token={token}" )) .call() .context("Failed to authenticate")?; let api_res: AuthApiRes = serde_json::from_str(&res.body_mut().read_to_string()?)?; - client.set_uuid(api_res.user_id); + client.set_uuid(&api_res.user_id); LOGGER.info(format!("{} successfully authenticated", api_res.user_id)); Ok(api_res.user_id) } diff --git a/src/requests/message.rs b/src/requests/message.rs index 6c08a3a..2be29ee 100644 --- a/src/requests/message.rs +++ b/src/requests/message.rs @@ -7,7 +7,7 @@ crate::logger!(LOGGER "Message Manager"); pub fn send( server: &Arc, client: &Client, - channel_id: u32, + channel_id: &str, contents: &str, ) -> crate::Result<()> { LOGGER.info(format!("SendMessage to {channel_id}: {contents}")); @@ -22,32 +22,35 @@ pub fn send( let msg = server.db.insert_message( channel_id, - client.get_uuid()?, + &client.get_uuid()?, &contents, chrono::Utc::now().timestamp(), )?; - let server = server.clone(); - - for c in server.clients.lock().unwrap().iter() { - let c = c.clone(); + if msg.from != msg.channel_id { let server = server.clone(); - let msg = msg.clone(); - std::thread::spawn(move || { - if let Some(uuid) = - LOGGER.extract(server.wrap_err(&c, c.get_uuid()), "Unable send message") - { - if uuid != channel_id { - return; + for c in server.clients.lock().unwrap().iter() { + let c = c.clone(); + let server = server.clone(); + let msg = msg.clone(); + let channel_id = channel_id.to_string(); + + std::thread::spawn(move || { + 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(&c, c.send(types::ServerMessage::MessageCreate(msg))), - "Failed to send message", - ); - } - }); + }); + } } LOGGER.extract( diff --git a/src/requests/mod.rs b/src/requests/mod.rs index 2d053cc..7f45b5c 100644 --- a/src/requests/mod.rs +++ b/src/requests/mod.rs @@ -21,7 +21,7 @@ impl Server { channel_id, contents, } => { - message::send(self, client, *channel_id, contents)?; + message::send(self, client, channel_id, contents)?; } ClientMessage::EditMessage { diff --git a/src/server.rs b/src/server.rs index 508df39..155f11d 100644 --- a/src/server.rs +++ b/src/server.rs @@ -117,11 +117,11 @@ impl Server { self.wrap_err( &client, client.send(types::ServerMessage::Authenticated { - uuid, + uuid: uuid.clone(), messages: if let Some(i) = last_message { - self.wrap_err(&client, self.db.get_messages_after_id(uuid, i))? + self.wrap_err(&client, self.db.get_messages_after_id(&uuid, i))? } else { - self.wrap_err(&client, self.db.get_messages_after_id(uuid, 0))? + self.wrap_err(&client, self.db.get_messages_after_id(&uuid, 0))? }, }), )?; diff --git a/src/types.rs b/src/types.rs index b291e20..4abb434 100644 --- a/src/types.rs +++ b/src/types.rs @@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize}; pub enum ClientMessage { /// Send a message to a channel SendMessage { - channel_id: u32, + channel_id: String, contents: String, }, @@ -26,7 +26,7 @@ pub enum ClientMessage { pub enum ServerMessage { /// Successful authentication Authenticated { - uuid: u32, + uuid: Author, messages: Vec, }, @@ -42,20 +42,20 @@ pub enum ServerMessage { /// A message was deleted MessageDelete { - channel_id: u32, + channel_id: String, message_id: usize, }, /// Presence updates PresenceUpdate { - user_id: String, + user_id: Author, status: String, }, /// Typing indicator Typing { - user_id: String, - channel_id: u32, + user_id: Author, + channel_id: String, }, } @@ -77,15 +77,19 @@ pub enum WsMessage Deserialize<'de>> { String(String), } +pub type Author = String; + /// Shared data structures pub mod data { use serde::{Deserialize, Serialize}; + use crate::types::Author; + #[derive(Debug, Clone, Serialize, Deserialize)] pub struct Message { pub id: i64, - pub channel_id: u32, - pub from: u32, + pub channel_id: String, + pub from: Author, pub contents: String, pub timestamp: i64, } diff --git a/src/utils/client.rs b/src/utils/client.rs index fbc5827..180099a 100644 --- a/src/utils/client.rs +++ b/src/utils/client.rs @@ -100,7 +100,7 @@ pub mod handshake { } } -pub struct Client(TcpStream, Option, u64); +pub struct Client(TcpStream, Option, u64); impl Client { /// Create a client with no timeouts @@ -324,12 +324,15 @@ impl Client { self.read_t() } - pub fn get_uuid(&self) -> crate::Result { - self.1.ok_or(anyhow!("Invalid UUID")) + pub fn get_uuid(&self) -> crate::Result { + match &self.1 { + Some(v) => Ok(v.clone()), + None => Err(anyhow!("Client ({}) UUID not set", self.2).into()), + } } - pub fn set_uuid(&mut self, uuid: u32) { - self.1 = Some(uuid) + pub fn set_uuid(&mut self, uuid: &str) { + self.1 = Some(uuid.to_string()) } #[deprecated] diff --git a/src/utils/database.rs b/src/utils/database.rs index 91d599e..5e0ce76 100644 --- a/src/utils/database.rs +++ b/src/utils/database.rs @@ -1,4 +1,4 @@ -use crate::{server::ServerConfig, types::data::Message}; +use crate::{ServerConfig, types::data::Message}; use rusqlite::{Connection, Result, params}; pub struct Database(Connection); @@ -11,8 +11,8 @@ impl Database { conn.execute( "CREATE TABLE IF NOT EXISTS chat ( id INTEGER PRIMARY KEY AUTOINCREMENT, - channel_id INTEGER NOT NULL, - user_id INTEGER NOT NULL, + channel_id TEXT NOT NULL, + user_id TEXT NOT NULL, contents TEXT NOT NULL, timestamp INTEGER NOT NULL )", @@ -29,8 +29,8 @@ impl Database { /// Insert a message into the DB pub fn insert_message( &self, - channel_id: u32, - user_id: u32, + channel_id: &str, + user_id: &str, contents: &str, timestamp: i64, ) -> Result { @@ -44,8 +44,8 @@ impl Database { Ok(Message { id, - channel_id, - from: user_id, + channel_id: channel_id.to_string(), + from: user_id.to_string(), contents: contents.to_string(), timestamp, }) @@ -73,7 +73,7 @@ impl Database { } /// Get a message by its ID - pub fn get_message_by_id(&self, message_id: usize) -> Result> { + pub fn get_message_by_id(&self, message_id: &str) -> Result> { let mut stmt = self.0.prepare( "SELECT id, channel_id, user_id, contents, timestamp FROM chat @@ -83,7 +83,7 @@ impl Database { let mut rows = stmt.query_map(params![message_id], |row| { Ok(( row.get::<_, i64>(0)?, // id - row.get::<_, u32>(1)?, // channel_id + row.get::<_, String>(1)?, // channel_id row.get::<_, u32>(2)?, // user_id row.get::<_, String>(3)?, // contents row.get::<_, i64>(4)?, // timestamp @@ -95,7 +95,7 @@ impl Database { return Ok(Some(Message { id, channel_id, - from: user_id, + from: user_id.to_string(), contents, timestamp, })); @@ -106,7 +106,7 @@ impl Database { /// Get all messages with an ID greater than the given one pub fn get_messages_after_id( &self, - channel_id: u32, + channel_id: &str, message_id: usize, ) -> Result> { let mut stmt = self.0.prepare( @@ -120,8 +120,8 @@ impl Database { let rows = stmt.query_map(params![message_id, channel_id], |row| { Ok(Message { id: row.get::<_, i64>(0)?, - channel_id: row.get::<_, u32>(1)?, - from: row.get::<_, u32>(2)?, + channel_id: row.get::<_, String>(1)?, + from: row.get::<_, String>(2)?, contents: row.get::<_, String>(3)?, timestamp: row.get::<_, i64>(4)?, })