From 09ad929a3d71579c07bbe68c3968839327dc3810 Mon Sep 17 00:00:00 2001
From: Klesti Selimaj <klesti.selimay@icloud.com>
Date: Sun, 16 Aug 2026 07:08:52 +0200
Subject: [PATCH 1/9] Fix config

---
 src/config.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index 7bf6349..5e4793b 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -22,9 +22,9 @@ impl Config {
 
             port: 3415,
 
-            public_hostname: "localhost:3000".to_string(),
+            public_hostname: "localhost:3415".to_string(),
 
-            hostnames: HashSet::from_iter(["localhost:3000".to_string()]),
+            hostnames: HashSet::from_iter(["localhost:3415".to_string()]),
         }
     }
 

From 5c80cacbff7257a92b76eb91e42122ce385a9e58 Mon Sep 17 00:00:00 2001
From: Klesti Selimaj <klesti.selimay@icloud.com>
Date: Sun, 16 Aug 2026 07:17:28 +0200
Subject: [PATCH 2/9] Fix timestamp

---
 src/protocol/initialize.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/protocol/initialize.rs b/src/protocol/initialize.rs
index 2a50b8b..e72f910 100644
--- a/src/protocol/initialize.rs
+++ b/src/protocol/initialize.rs
@@ -37,9 +37,9 @@ impl UserConnections {
             ));
         };
 
-        let server_timestamp = SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs();
+        let server_timestamp = SystemTime::now().duration_since(UNIX_EPOCH)?.as_millis() as u64;
 
-        if server_timestamp - timestamp > 2 {
+        if server_timestamp.saturating_sub(timestamp) > 2000 {
             send_socket(
                 &mut socket,
                 &ClientMethod::Error {

From ddc8b0bf0f0dd545d2874860b5b95bfc65fd44f9 Mon Sep 17 00:00:00 2001
From: Klesti Selimaj <klesti.selimay@icloud.com>
Date: Sun, 16 Aug 2026 07:19:06 +0200
Subject: [PATCH 3/9] Fix hostname

---
 src/protocol/initialize.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/protocol/initialize.rs b/src/protocol/initialize.rs
index e72f910..eb059e6 100644
--- a/src/protocol/initialize.rs
+++ b/src/protocol/initialize.rs
@@ -53,7 +53,8 @@ impl UserConnections {
             return Err(anyhow::anyhow!("Client tampstamp wasn't correct"));
         }
 
-        if !server.config.hostnames.contains(&hostname) {
+        if hostname != server.config.public_hostname || !server.config.hostnames.contains(&hostname)
+        {
             send_socket(
                 &mut socket,
                 &ClientMethod::Error {

From 0aefaa4c186c338d24755cabd531005834db811a Mon Sep 17 00:00:00 2001
From: Klesti Selimaj <klesti.selimay@icloud.com>
Date: Mon, 17 Aug 2026 04:49:54 +0200
Subject: [PATCH 4/9] Client cleanup

---
 src/server.rs | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/server.rs b/src/server.rs
index f76a9e4..426d1da 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -49,7 +49,7 @@ impl Server {
 
                     let mut clients_meta = s.clients.lock().await;
 
-                    let client_meta =
+                    let clients =
                         clients_meta
                             .entry(public_key)
                             .or_insert_with(|| UserConnections {
@@ -59,18 +59,23 @@ impl Server {
                                 connections: HashMap::new(),
                             });
 
-                    client_meta.connections.insert(
-                        client_meta
-                            .counter
-                            .fetch_add(1, std::sync::atomic::Ordering::Relaxed),
-                        client.clone(),
-                    );
+                    let conid = clients
+                        .counter
+                        .fetch_add(1, std::sync::atomic::Ordering::Relaxed);
+
+                    clients.connections.insert(conid, client.clone());
 
                     if let Err(e) = read_loop(&client).await {
                         eprintln!("Failed to handle client: {e}");
                     } else {
                         println!("Client connection closed")
                     }
+
+                    clients.connections.remove(&conid);
+
+                    if clients.connections.len() == 0 {
+                        clients_meta.remove(&public_key);
+                    }
                 }
 
                 Err(e) => {

From be266c571d4e35e692d4a80ca1702f7af183effe Mon Sep 17 00:00:00 2001
From: Klesti Selimaj <klesti.selimay@icloud.com>
Date: Mon, 17 Aug 2026 05:11:50 +0200
Subject: [PATCH 5/9] Fix sig

---
 src/protocol/initialize.rs | 7 +++----
 src/signature.rs           | 4 ++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/protocol/initialize.rs b/src/protocol/initialize.rs
index eb059e6..650cc48 100644
--- a/src/protocol/initialize.rs
+++ b/src/protocol/initialize.rs
@@ -101,10 +101,9 @@ impl UserConnections {
                 &mut socket,
                 &ClientMethod::Initialized {
                     public_key: crate::signature::to_string(&server.key.verifying_key()),
-                    signature: server
-                        .key
-                        .sign(format!("{timestamp}@{hostname}@{public_key_string}").as_bytes())
-                        .to_string(),
+                    signature: crate::signature::to_string_sig(&server.key.sign(
+                        format!("{server_timestamp}@{hostname}@{public_key_string}").as_bytes(),
+                    )),
 
                     timestamp: server_timestamp,
                     hostname,
diff --git a/src/signature.rs b/src/signature.rs
index 851b9eb..fc80df4 100644
--- a/src/signature.rs
+++ b/src/signature.rs
@@ -41,3 +41,7 @@ pub fn from_string_sig(signature: &str) -> anyhow::Result<Signature> {
             .map_err(|_| anyhow::anyhow!("Invalid public key"))?,
     ))
 }
+
+pub fn to_string_sig(signature: &Signature) -> String {
+    bs58::encode(signature.to_bytes()).into_string()
+}

From afcb96c93876325ad9a0259c62cac35cf7297130 Mon Sep 17 00:00:00 2001
From: Klesti Selimaj <klesti.selimay@icloud.com>
Date: Mon, 17 Aug 2026 16:03:39 +0200
Subject: [PATCH 6/9] Fix invalid sig

---
 src/signature.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/signature.rs b/src/signature.rs
index fc80df4..3dd0753 100644
--- a/src/signature.rs
+++ b/src/signature.rs
@@ -24,6 +24,10 @@ pub fn to_string(key: &VerifyingKey) -> String {
     bs58::encode(key.to_bytes()).into_string()
 }
 
+pub fn to_string_sig(signature: &Signature) -> String {
+    bs58::encode(signature.to_bytes()).into_string()
+}
+
 pub fn from_string(key: &str) -> anyhow::Result<VerifyingKey> {
     Ok(VerifyingKey::from_bytes(
         &bs58::decode(key)
@@ -38,10 +42,6 @@ pub fn from_string_sig(signature: &str) -> anyhow::Result<Signature> {
         &bs58::decode(signature)
             .into_vec()?
             .try_into()
-            .map_err(|_| anyhow::anyhow!("Invalid public key"))?,
+            .map_err(|_| anyhow::anyhow!("Invalid signature"))?,
     ))
 }
-
-pub fn to_string_sig(signature: &Signature) -> String {
-    bs58::encode(signature.to_bytes()).into_string()
-}

From 7b63911a7d92d705d7853bfcf725dc765b76d91c Mon Sep 17 00:00:00 2001
From: Klesti Selimaj <klesti.selimay@icloud.com>
Date: Tue, 18 Aug 2026 13:58:17 +0200
Subject: [PATCH 7/9] Icon

---
 .DS_Store   | Bin 0 -> 6148 bytes
 Cargo.lock  |  67 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 Cargo.toml  |   1 +
 icon.png    | Bin 0 -> 5094 bytes
 src/main.rs |   2 ++
 5 files changed, 70 insertions(+)
 create mode 100644 .DS_Store
 create mode 100644 icon.png

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..70a47c54e6cad3d8f4e5b3e5307c27e071a287c8
GIT binary patch
literal 6148
zcmeHKy-ve05I(m7rGlXol+90oRH5#nN|BHlkUFuIwlp9mN(E(M%7ZYm^$8ew0Y(-E
zo`9J*=y$f&#)L8gLU+>nbMD9Ie2H=~5vlI&xJ}d~q7cehYhd_7*w0##nzL*J6|a#d
z?fxjwrj<xB{8a|{*#)#u30=|5dw%LDE&H-Oj)!SJgf0A-A3vS#Js<l1@wfizW$E46
z;P;K{bVJuP@~YCoeB~+Ee0Y64dD}HLU0#;2DptK-JsNPmO`6d;DkgN{-)pCFH~H)@
z*PguG_jX#Qwzo!k2kT<W`{=x%@;*d_0bxKG_-zKzvsuC|i!urW!hkTaWPra98p;?s
zEG(K&2L^Kl00uA{!QA}Y0W}+dk;B3wED&W=fi_jSBZji+uxl3=IV>#NbW)}=)^U}U
zJE1639d>QPNktZA6b6I=pMko)Y;ynatv~<!Npd9&2m}9$0TsmkxQknIy|r?4+-o&-
q0A=C0!s0Ro6Vr+j%dNNtH3GZl2{3Y4ScC;4KLUmZ8H9l!Wncl4q+`GU

literal 0
HcmV?d00001

diff --git a/Cargo.lock b/Cargo.lock
index b649c17..12ee0c4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -81,6 +81,12 @@ version = "1.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
 
+[[package]]
+name = "bitflags"
+version = "2.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da"
+
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -226,6 +232,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tokio",
+ "tower-http",
 ]
 
 [[package]]
@@ -349,6 +356,12 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "http-range-header"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9171a2ea8a68358193d15dd5d70c1c10a2afc3e7e4c5bc92bc9f025cebd7359c"
+
 [[package]]
 name = "httparse"
 version = "1.10.1"
@@ -432,6 +445,16 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
+[[package]]
+name = "mime_guess"
+version = "2.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
+dependencies = [
+ "mime",
+ "unicase",
+]
+
 [[package]]
 name = "mio"
 version = "1.2.2"
@@ -820,6 +843,19 @@ dependencies = [
  "tungstenite",
 ]
 
+[[package]]
+name = "tokio-util"
+version = "0.7.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "494815d09bf52b5548659851081238f0ca39ff638363907596da739561c62c52"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "tower"
 version = "0.5.3"
@@ -836,6 +872,31 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "tower-http"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b11f75e912b0c2be01b63d8cf8057b8c3f97cf34abb3d431a3a4c8675498e233"
+dependencies = [
+ "bitflags",
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "http-range-header",
+ "httpdate",
+ "mime",
+ "mime_guess",
+ "percent-encoding",
+ "pin-project-lite",
+ "tokio",
+ "tokio-util",
+ "tower-layer",
+ "tower-service",
+]
+
 [[package]]
 name = "tower-layer"
 version = "0.3.3"
@@ -890,6 +951,12 @@ version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
 
+[[package]]
+name = "unicase"
+version = "2.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.24"
diff --git a/Cargo.toml b/Cargo.toml
index 3072733..2df5dc5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,3 +12,4 @@ tokio = { version = "1.53.1", features = ["rt", "rt-multi-thread", "macros", "sy
 ed25519-dalek = { version = "2", features = ["rand_core"] }
 rand = "0.8"
 bs58 = "0.5.1"
+tower-http = { version = "0.7.0", features = ["fs"] }
diff --git a/icon.png b/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd31e2b9b10a314247ecabe766c3a6d3c2eff480
GIT binary patch
literal 5094
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

literal 0
HcmV?d00001

diff --git a/src/main.rs b/src/main.rs
index cd992dd..467870b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -14,6 +14,7 @@ use axum::{
     response::Response,
     routing::{any, get},
 };
+use tower_http::services::ServeFile;
 
 use crate::server::Server;
 
@@ -24,6 +25,7 @@ async fn main() -> anyhow::Result<()> {
     let app = Router::new()
         .route("/meta", get(meta))
         .route("/", any(ws_handler))
+        .route_service("/icon", ServeFile::new("./icon.png"))
         .with_state(server.clone());
 
     let listener = tokio::net::TcpListener::bind(SocketAddr::new(

From e5c5d7265a713c6b0194751fbf2c605ef9f15e22 Mon Sep 17 00:00:00 2001
From: Klesti Selimaj <klesti.selimay@icloud.com>
Date: Tue, 18 Aug 2026 22:55:45 +0200
Subject: [PATCH 8/9] cors

---
 Cargo.toml  |  2 +-
 src/main.rs | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 2df5dc5..ec9225b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,4 +12,4 @@ tokio = { version = "1.53.1", features = ["rt", "rt-multi-thread", "macros", "sy
 ed25519-dalek = { version = "2", features = ["rand_core"] }
 rand = "0.8"
 bs58 = "0.5.1"
-tower-http = { version = "0.7.0", features = ["fs"] }
+tower-http = { version = "0.7.0", features = ["fs", "cors"] }
diff --git a/src/main.rs b/src/main.rs
index 467870b..8897bfd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -14,7 +14,10 @@ use axum::{
     response::Response,
     routing::{any, get},
 };
-use tower_http::services::ServeFile;
+use tower_http::{
+    cors::{Any, CorsLayer},
+    services::ServeFile,
+};
 
 use crate::server::Server;
 
@@ -22,11 +25,17 @@ use crate::server::Server;
 async fn main() -> anyhow::Result<()> {
     let server = Server::new().await?;
 
+    let cors = CorsLayer::new()
+        .allow_origin(Any)
+        .allow_methods(Any)
+        .allow_headers(Any);
+
     let app = Router::new()
         .route("/meta", get(meta))
         .route("/", any(ws_handler))
         .route_service("/icon", ServeFile::new("./icon.png"))
-        .with_state(server.clone());
+        .with_state(server.clone())
+        .layer(cors);
 
     let listener = tokio::net::TcpListener::bind(SocketAddr::new(
         IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)),

From c37e9d0fde94698a53187ae9a21a77810dcd1bd0 Mon Sep 17 00:00:00 2001
From: Klesti Selimaj <klesti.selimay@icloud.com>
Date: Wed, 19 Aug 2026 03:10:35 +0200
Subject: [PATCH 9/9] Channelsc

---
 src/config.rs       | 15 ++++++++++++++-
 src/main.rs         |  1 +
 src/protocol/mod.rs | 11 ++---------
 src/server.rs       |  3 ++-
 src/types.rs        | 29 +++++++++++++++++++++++++++++
 5 files changed, 48 insertions(+), 11 deletions(-)
 create mode 100644 src/types.rs

diff --git a/src/config.rs b/src/config.rs
index 5e4793b..ea4141b 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -2,7 +2,7 @@ use std::{collections::HashSet, path::PathBuf};
 
 use serde::{Deserialize, Serialize};
 
-use crate::protocol::ServerMeta;
+use crate::types::{Channel, ChannelKind, ServerMeta};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Config {
@@ -18,6 +18,19 @@ impl Config {
             meta: ServerMeta {
                 name: "New Server".to_string(),
                 description: String::new(),
+
+                channels: vec![Channel {
+                    id: "text-channels".to_string(),
+                    name: "Text Channels".to_string(),
+
+                    data: ChannelKind::Category {
+                        channels: vec![Channel {
+                            id: "general".to_string(),
+                            name: "General".to_string(),
+                            data: ChannelKind::Text,
+                        }],
+                    },
+                }],
             },
 
             port: 3415,
diff --git a/src/main.rs b/src/main.rs
index 8897bfd..25696ca 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,6 +2,7 @@ pub mod config;
 pub mod protocol;
 pub mod server;
 pub mod signature;
+pub mod types;
 
 use std::{
     net::{IpAddr, Ipv4Addr, SocketAddr},
diff --git a/src/protocol/mod.rs b/src/protocol/mod.rs
index 0503573..a8ee7c5 100644
--- a/src/protocol/mod.rs
+++ b/src/protocol/mod.rs
@@ -4,17 +4,10 @@ use axum::extract::ws::{Message, Utf8Bytes, WebSocket};
 use serde::{Deserialize, Serialize};
 use tokio::sync::Mutex;
 
+use crate::types::ClientMeta;
+
 pub mod initialize;
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct ClientMeta {}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct ServerMeta {
-    pub name: String,
-    pub description: String,
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(tag = "method")]
 pub enum ClientMethod {
diff --git a/src/server.rs b/src/server.rs
index 426d1da..41365e0 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -12,7 +12,8 @@ use tokio::sync::Mutex;
 
 use crate::{
     config::Config,
-    protocol::{ClientMeta, ClientMethod, read_loop, send_socket},
+    protocol::{ClientMethod, read_loop, send_socket},
+    types::ClientMeta,
 };
 
 pub struct UserConnections {
diff --git a/src/types.rs b/src/types.rs
new file mode 100644
index 0000000..98fde83
--- /dev/null
+++ b/src/types.rs
@@ -0,0 +1,29 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ClientMeta {}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ServerMeta {
+    pub name: String,
+    pub description: String,
+    pub channels: Vec<Channel>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(tag = "kind")]
+#[serde(rename_all = "camelCase")]
+pub enum ChannelKind {
+    Text,
+    Category { channels: Vec<Channel> },
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Channel {
+    pub id: String,
+    pub name: String,
+
+    #[serde(flatten)]
+    pub data: ChannelKind,
+}