From 71b5741ebd00a0b63fceecf487ebf1b0cd102666 Mon Sep 17 00:00:00 2001
From: user0-07161 <user0thenyancat@proton.me>
Date: Sun, 15 Feb 2026 18:03:36 +0100
Subject: [PATCH] chore: fully eliminate dbg!()

---
 src/client/mod.rs           | 2 --
 src/main.rs                 | 8 +++++---
 src/ts6/commands/mod.rs     | 3 ++-
 src/ts6/commands/privmsg.rs | 4 ----
 src/ts6/commands/uid.rs     | 2 --
 src/ts6/structs.rs          | 2 --
 src/userid_gen.rs           | 8 ++++++--
 7 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/client/mod.rs b/src/client/mod.rs
index c8e6f27..d6884e9 100644
--- a/src/client/mod.rs
+++ b/src/client/mod.rs
@@ -153,8 +153,6 @@ impl Client {
                     }
                 }
 
-                dbg!(&message);
-
                 if match message.clone().receiver {
                     MsgReceiver::UserId(userid) => {
                         debug!("{userid} ?= {}", user.user_id);
diff --git a/src/main.rs b/src/main.rs
index 5be212c..7303a87 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -202,8 +202,6 @@ mod tests {
                 userid_gen::manually_set_user_id(['Z', 'Z', 'Z', 'Z', 'Z', 'Y'].to_vec()).await;
                 break;
             }
-
-            dbg!(userid);
         }
 
         while let Ok(userid) = userid_gen::increase_user_id().await {
@@ -211,8 +209,12 @@ mod tests {
                 // ff a bit
                 userid_gen::manually_set_user_id(['Z', '1', '2', '3', '4', '5'].to_vec()).await;
             }
+        }
 
-            dbg!(userid);
+        if let Err(userid_gen::UidIncreaseError::UserCapReached(userid)) =
+            userid_gen::increase_user_id().await
+        {
+            assert_eq!(userid.as_slice(), ['Z', '9', '9', '9', '9', '9']);
         }
     }
 }
diff --git a/src/ts6/commands/mod.rs b/src/ts6/commands/mod.rs
index c6b61fa..f87d99d 100644
--- a/src/ts6/commands/mod.rs
+++ b/src/ts6/commands/mod.rs
@@ -15,6 +15,7 @@ use crate::{
 use anyhow::anyhow;
 use async_trait::async_trait;
 use tokio::{io::BufWriter, net::TcpStream};
+use tracing::debug;
 
 mod capab;
 mod ping;
@@ -77,7 +78,7 @@ impl Ts6Command {
         if split_command[0].starts_with(":") {
             let sender = split_command.remove(0).to_string().replace(":", "");
 
-            dbg!(&sender);
+            debug!("{split_command:?} from {sender}");
 
             match sender.len() {
                 3 => {
diff --git a/src/ts6/commands/privmsg.rs b/src/ts6/commands/privmsg.rs
index 068229d..f6b7c3b 100644
--- a/src/ts6/commands/privmsg.rs
+++ b/src/ts6/commands/privmsg.rs
@@ -26,8 +26,6 @@ impl Ts6Handler for Privmsg {
         'priv_msg: {
             let mut sending_user: Option<UserUnwrapped> = None;
 
-            dbg!(&sender);
-
             if let Ok(user_id) = UserId::try_from(command[0].clone()) {
                 if let Some(CommandSender::User(command_sender)) = sender {
                     let foreign_users = FOREIGN_CONNECTED_USERS.lock().await;
@@ -38,7 +36,6 @@ impl Ts6Handler for Privmsg {
                         }
                     }
                 } else {
-                    dbg!("sender");
                     break 'priv_msg vec![];
                 }
 
@@ -50,7 +47,6 @@ impl Ts6Handler for Privmsg {
                     }),
                 )]
             } else {
-                dbg!("userid");
                 vec![]
             }
         }
diff --git a/src/ts6/commands/uid.rs b/src/ts6/commands/uid.rs
index 8ee556b..e028137 100644
--- a/src/ts6/commands/uid.rs
+++ b/src/ts6/commands/uid.rs
@@ -48,8 +48,6 @@ impl Ts6Handler for Uid {
             ip,
         };
 
-        dbg!(&user);
-
         let mut foreign_users = FOREIGN_CONNECTED_USERS.lock().await;
         foreign_users.insert(user.clone());
 
diff --git a/src/ts6/structs.rs b/src/ts6/structs.rs
index 04c2066..90a43fb 100644
--- a/src/ts6/structs.rs
+++ b/src/ts6/structs.rs
@@ -46,8 +46,6 @@ impl TryFrom<String> for UserId {
     type Error = &'static str;
 
     fn try_from(value: String) -> Result<Self, Self::Error> {
-        dbg!(&value);
-
         let chars = value.chars().into_iter().collect::<Vec<char>>();
 
         if chars.len() != 9 || !ServerId::is_server_id(&value[..3]) {
diff --git a/src/userid_gen.rs b/src/userid_gen.rs
index 160dcfe..de8e4ea 100644
--- a/src/userid_gen.rs
+++ b/src/userid_gen.rs
@@ -10,7 +10,7 @@ static ZZZZZZ_REACHED: Lazy<Mutex<bool>> = Lazy::new(|| Mutex::new(false));
 #[derive(Debug, Error)]
 pub enum UidIncreaseError {
     #[error("cap reached")]
-    UserCapReached,
+    UserCapReached(Vec<char>),
 }
 
 pub async fn increase_user_id() -> Result<Vec<char>, UidIncreaseError> {
@@ -19,6 +19,10 @@ pub async fn increase_user_id() -> Result<Vec<char>, UidIncreaseError> {
 
     let mut idx = 5;
 
+    if current_id.as_slice() == ['Z', '9', '9', '9', '9', '9'] {
+        return Err(UidIncreaseError::UserCapReached(current_id.to_vec()));
+    }
+
     'id_increaser: {
         if !zzzzzz_reached.clone() {
             loop {
@@ -56,7 +60,7 @@ pub async fn increase_user_id() -> Result<Vec<char>, UidIncreaseError> {
                     current_id[idx] = (current_id[idx] as u8 + 1) as char;
                     idx = 5;
                 } else {
-                    return Err(UidIncreaseError::UserCapReached);
+                    return Err(UidIncreaseError::UserCapReached(current_id.to_vec()));
                 }
             }
         }