some little fixes

src/api/debug.rs

@@ -1,94 +1,94 @@
-use crate::state;
-use crate::utils;
-use axum::extract::{Json, State};
-use sqlx::Row;
-use std::sync::Arc;
+// use crate::state;
+// use crate::utils;
+// use axum::extract::{Json, State};
+// use sqlx::Row;
+// use std::sync::Arc;
 
-// Debug endpoint to see all messages
-pub async fn debug_messages_handler(
-    State(state): State<Arc<state::AppState>>,
-    headers: axum::http::HeaderMap,
-) -> Json<serde_json::Value> {
-    // Extract token from header
-    let token = if let Some(auth_header) = headers.get("authorization") {
-        auth_header.to_str().unwrap_or("").replace("Bearer ", "")
-    } else {
-        return Json(serde_json::json!({"error": "No token"}));
-    };
+// // Debug endpoint to see all messages
+// pub async fn debug_messages_handler(
+//     State(state): State<Arc<state::AppState>>,
+//     headers: axum::http::HeaderMap,
+// ) -> Json<serde_json::Value> {
+//     // Extract token from header
+//     let token = if let Some(auth_header) = headers.get("authorization") {
+//         auth_header.to_str().unwrap_or("").replace("Bearer ", "")
+//     } else {
+//         return Json(serde_json::json!({"error": "No token"}));
+//     };
 
-    // Get current user from token
-    let username = match utils::verify_token(&state.db_pool, &token).await {
-        Ok(Some(user)) => user,
-        _ => return Json(serde_json::json!({"error": "Invalid token"})),
-    };
+//     // Get current user from token
+//     let username = match utils::verify_token(&state.db_pool, &token).await {
+//         Ok(Some(user)) => user,
+//         _ => return Json(serde_json::json!({"error": "Invalid token"})),
+//     };
 
-    // Get all messages for this user
-    let messages = sqlx::query(
-        r#"
-        SELECT id, from_user, to_user, content, timestamp, message_type, read,
-               deleted_for_sender, deleted_for_receiver, deleted_for_everyone
-        FROM messages
-        WHERE from_user = ? OR to_user = ?
-        ORDER BY timestamp DESC
-        LIMIT 100
-        "#,
-    )
-    .bind(&username)
-    .bind(&username)
-    .fetch_all(&state.db_pool)
-    .await;
+//     // Get all messages for this user
+//     let messages = sqlx::query(
+//         r#"
+//         SELECT id, from_user, to_user, content, timestamp, message_type, read,
+//                deleted_for_sender, deleted_for_receiver, deleted_for_everyone
+//         FROM messages
+//         WHERE from_user = ? OR to_user = ?
+//         ORDER BY timestamp DESC
+//         LIMIT 100
+//         "#,
+//     )
+//     .bind(&username)
+//     .bind(&username)
+//     .fetch_all(&state.db_pool)
+//     .await;
 
-    // Get chat partners count
-    let partners_result = sqlx::query(
-        r#"
-        SELECT COUNT(DISTINCT
-            CASE
-                WHEN from_user = ? THEN to_user
-                ELSE from_user
-            END
-        ) as partner_count
-        FROM messages
-        WHERE from_user = ? OR to_user = ?
-        "#,
-    )
-    .bind(&username)
-    .bind(&username)
-    .bind(&username)
-    .fetch_one(&state.db_pool)
-    .await;
+//     // Get chat partners count
+//     let partners_result = sqlx::query(
+//         r#"
+//         SELECT COUNT(DISTINCT
+//             CASE
+//                 WHEN from_user = ? THEN to_user
+//                 ELSE from_user
+//             END
+//         ) as partner_count
+//         FROM messages
+//         WHERE from_user = ? OR to_user = ?
+//         "#,
+//     )
+//     .bind(&username)
+//     .bind(&username)
+//     .bind(&username)
+//     .fetch_one(&state.db_pool)
+//     .await;
 
-    match messages {
-        Ok(rows) => {
-            let mut result = Vec::new();
-            for row in rows {
-                result.push(serde_json::json!({
-                    "id": row.get::<String, _>("id"),
-                    "from_user": row.get::<String, _>("from_user"),
-                    "to_user": row.get::<String, _>("to_user"),
-                    "content": row.get::<String, _>("content"),
-                    "timestamp": row.get::<i64, _>("timestamp"),
-                    "message_type": row.get::<String, _>("message_type"),
-                    "read": row.get::<bool, _>("read"),
-                    "deleted_for_sender": row.get::<bool, _>("deleted_for_sender"),
-                    "deleted_for_receiver": row.get::<bool, _>("deleted_for_receiver"),
-                    "deleted_for_everyone": row.get::<bool, _>("deleted_for_everyone"),
-                    "is_current_user_from": row.get::<String, _>("from_user") == username,
-                    "is_current_user_to": row.get::<String, _>("to_user") == username,
-                }));
-            }
+//     match messages {
+//         Ok(rows) => {
+//             let mut result = Vec::new();
+//             for row in rows {
+//                 result.push(serde_json::json!({
+//                     "id": row.get::<String, _>("id"),
+//                     "from_user": row.get::<String, _>("from_user"),
+//                     "to_user": row.get::<String, _>("to_user"),
+//                     "content": row.get::<String, _>("content"),
+//                     "timestamp": row.get::<i64, _>("timestamp"),
+//                     "message_type": row.get::<String, _>("message_type"),
+//                     "read": row.get::<bool, _>("read"),
+//                     "deleted_for_sender": row.get::<bool, _>("deleted_for_sender"),
+//                     "deleted_for_receiver": row.get::<bool, _>("deleted_for_receiver"),
+//                     "deleted_for_everyone": row.get::<bool, _>("deleted_for_everyone"),
+//                     "is_current_user_from": row.get::<String, _>("from_user") == username,
+//                     "is_current_user_to": row.get::<String, _>("to_user") == username,
+//                 }));
+//             }
 
-            let partner_count = match partners_result {
-                Ok(row) => row.get::<i64, _>("partner_count"),
-                Err(_) => 0,
-            };
+//             let partner_count = match partners_result {
+//                 Ok(row) => row.get::<i64, _>("partner_count"),
+//                 Err(_) => 0,
+//             };
 
-            Json(serde_json::json!({
-                "user": username,
-                "total_messages": result.len(),
-                "chat_partners_count": partner_count,
-                "messages": result
-            }))
-        }
-        Err(e) => Json(serde_json::json!({"error": format!("Database error: {}", e)})),
-    }
-}
+//             Json(serde_json::json!({
+//                 "user": username,
+//                 "total_messages": result.len(),
+//                 "chat_partners_count": partner_count,
+//                 "messages": result
+//             }))
+//         }
+//         Err(e) => Json(serde_json::json!({"error": format!("Database error: {}", e)})),
+//     }
+// }

src/api/websock.rs

@@ -60,7 +60,7 @@ async fn handle_websocket(socket: WebSocket, state: Arc<state::AppState>) {
                                         ))
                                         .await;
 
-                                    utils::broadcast_user_list(&state.users).await;
+                                    // utils::broadcast_user_list(&state.users).await;
 
                                     if let Ok(messages) = utils::get_message_history(
                                         &state.db_pool,
@@ -169,6 +169,6 @@ async fn handle_websocket(socket: WebSocket, state: Arc<state::AppState>) {
     }
 
     state_clone.users.write().await.remove(&username_clone);
-    utils::broadcast_user_list(&state_clone.users).await;
+    // utils::broadcast_user_list(&state_clone.users).await;
     println!("User {} disconnected", username_clone);
 }