diff --git a/src/data/messages.rs b/src/data/messages.rs index d2ecf22..6c613da 100644 --- a/src/data/messages.rs +++ b/src/data/messages.rs @@ -53,7 +53,7 @@ impl MessageStore { author_pubkey TEXT NOT NULL, content TEXT NOT NULL, timestamp INTEGER NOT NULL, - signature TEXT NOT NULL, + signature TEXT NOT NULL )", [], )?; @@ -74,7 +74,7 @@ impl MessageStore { self.with_channel(channel_id, |conn| { conn.execute( "INSERT INTO messages (id, author_pubkey, content, timestamp, signature) - VALUES (?1, ?2, ?3, ?4, ?5, ?6)", + VALUES (?1, ?2, ?3, ?4, ?5)", params![ msg.id, msg.author, diff --git a/src/protocol/message.rs b/src/protocol/message.rs index de7d09b..b5a8458 100644 --- a/src/protocol/message.rs +++ b/src/protocol/message.rs @@ -1,7 +1,7 @@ use crate::data::messages::{MessageData, StoredMessage}; use crate::server::Server; use axum::extract::ws::WebSocket; -use ed25519_dalek::{Signature, Verifier, VerifyingKey}; +use ed25519_dalek::{Verifier, VerifyingKey}; use std::sync::Arc; use std::time::{SystemTime, UNIX_EPOCH}; use tokio::sync::Mutex; @@ -9,7 +9,7 @@ use tokio::sync::Mutex; pub async fn send_message( server: &Arc, verifying_key: VerifyingKey, - socket: &Arc>, + _socket: &Arc>, message: MessageData, channel_id: String, ) -> anyhow::Result<()> { diff --git a/src/server.rs b/src/server.rs index 3406455..6497b57 100644 --- a/src/server.rs +++ b/src/server.rs @@ -37,7 +37,7 @@ impl Server { key: crate::signature::get().await?, config: Config::get().await?, clients: Mutex::new(HashMap::new()), - message_store: MessageStore::new(PathBuf::from("item"))?, + message_store: MessageStore::new(PathBuf::from("messages"))?, })) } } diff --git a/src/types.rs b/src/types.rs index 98fde83..9a0ef5a 100644 --- a/src/types.rs +++ b/src/types.rs @@ -1,9 +1,14 @@ use serde::{Deserialize, Serialize}; #[derive(Debug, Clone, Serialize, Deserialize)] -pub struct ClientMeta {} +#[serde(rename_all = "camelCase")] +pub struct ClientMeta { + pub display_name: String, + pub avatar: Option, +} #[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] pub struct ServerMeta { pub name: String, pub description: String,