fix ci/cd
Continuous integration / Check (push) Successful in 32s
Continuous integration / Rustfmt (push) Successful in 26s
Continuous integration / build (push) Successful in 29s
Continuous integration / build-release (push) Successful in 57s
Continuous integration / Check (pull_request) Successful in 33s
Continuous integration / Rustfmt (pull_request) Successful in 30s
Continuous integration / build (pull_request) Successful in 31s
Continuous integration / build-release (pull_request) Successful in 56s
Continuous integration / Check (push) Successful in 32s
Continuous integration / Rustfmt (push) Successful in 26s
Continuous integration / build (push) Successful in 29s
Continuous integration / build-release (push) Successful in 57s
Continuous integration / Check (pull_request) Successful in 33s
Continuous integration / Rustfmt (pull_request) Successful in 30s
Continuous integration / build (pull_request) Successful in 31s
Continuous integration / build-release (pull_request) Successful in 56s
This commit is contained in:
1 parent
5a26ac8690
commit
ab25ef7ba8
1 file changed
+233
-177
+233
-177
@@ -1,29 +1,25 @@
|
|||||||
use axum::{
|
use axum::{
|
||||||
|
Router,
|
||||||
extract::{
|
extract::{
|
||||||
|
Json, Multipart, Query, State,
|
||||||
ws::{Message, WebSocket, WebSocketUpgrade},
|
ws::{Message, WebSocket, WebSocketUpgrade},
|
||||||
State, Json, Query, Multipart,
|
|
||||||
},
|
},
|
||||||
response::Response,
|
response::Response,
|
||||||
routing::{get, post, delete},
|
routing::{get, post},
|
||||||
Router,
|
|
||||||
};
|
};
|
||||||
|
use bcrypt::{DEFAULT_COST, hash, verify};
|
||||||
|
use chrono::{Duration, Utc};
|
||||||
use config::{Config as ConfigLoader, File, FileFormat};
|
use config::{Config as ConfigLoader, File, FileFormat};
|
||||||
use serde::{Deserialize, Serialize};
|
use futures_util::{SinkExt, StreamExt};
|
||||||
use sqlx::{sqlite::SqlitePool, Row};
|
|
||||||
use std::{
|
|
||||||
collections::HashMap,
|
|
||||||
net::SocketAddr,
|
|
||||||
sync::Arc,
|
|
||||||
};
|
|
||||||
use tokio::sync::{mpsc, RwLock};
|
|
||||||
use tower_http::services::ServeDir;
|
|
||||||
use futures_util::{StreamExt, SinkExt};
|
|
||||||
use bcrypt::{hash, verify, DEFAULT_COST};
|
|
||||||
use rand::distributions::Alphanumeric;
|
use rand::distributions::Alphanumeric;
|
||||||
use rand::{thread_rng, Rng};
|
use rand::{Rng, thread_rng};
|
||||||
use chrono::{Utc, Duration};
|
use serde::{Deserialize, Serialize};
|
||||||
use uuid::Uuid;
|
use sqlx::{Row, sqlite::SqlitePool};
|
||||||
use std::io::Cursor;
|
use std::io::Cursor;
|
||||||
|
use std::{collections::HashMap, net::SocketAddr, sync::Arc};
|
||||||
|
use tokio::sync::{RwLock, mpsc};
|
||||||
|
use tower_http::services::ServeDir;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
// Types for shared state
|
// Types for shared state
|
||||||
type UserMap = Arc<RwLock<HashMap<String, mpsc::UnboundedSender<Message>>>>;
|
type UserMap = Arc<RwLock<HashMap<String, mpsc::UnboundedSender<Message>>>>;
|
||||||
@@ -58,7 +54,7 @@ struct FilesConfig {
|
|||||||
|
|
||||||
#[derive(Debug, Deserialize, Clone)]
|
#[derive(Debug, Deserialize, Clone)]
|
||||||
struct LimitsConfig {
|
struct LimitsConfig {
|
||||||
max_message_length: usize,
|
// max_message_length: usize,
|
||||||
max_username_length: usize,
|
max_username_length: usize,
|
||||||
min_password_length: usize,
|
min_password_length: usize,
|
||||||
}
|
}
|
||||||
@@ -114,10 +110,10 @@ struct ChatMessage {
|
|||||||
message_type: String,
|
message_type: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize)]
|
// #[derive(Debug, Serialize, Deserialize)]
|
||||||
struct UserList {
|
// struct UserList {
|
||||||
users: Vec<String>,
|
// users: Vec<String>,
|
||||||
}
|
// }
|
||||||
|
|
||||||
// Структуры для аутентификации
|
// Структуры для аутентификации
|
||||||
#[derive(Debug, Deserialize)]
|
#[derive(Debug, Deserialize)]
|
||||||
@@ -331,10 +327,15 @@ async fn register_handler(
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if payload.username.len() < 3 || payload.username.len() > state.config.limits.max_username_length {
|
if payload.username.len() < 3
|
||||||
|
|| payload.username.len() > state.config.limits.max_username_length
|
||||||
|
{
|
||||||
return Json(AuthResponse {
|
return Json(AuthResponse {
|
||||||
success: false,
|
success: false,
|
||||||
message: format!("Username must be between 3 and {} characters", state.config.limits.max_username_length),
|
message: format!(
|
||||||
|
"Username must be between 3 and {} characters",
|
||||||
|
state.config.limits.max_username_length
|
||||||
|
),
|
||||||
username: None,
|
username: None,
|
||||||
token: None,
|
token: None,
|
||||||
});
|
});
|
||||||
@@ -343,7 +344,10 @@ async fn register_handler(
|
|||||||
if payload.password.len() < state.config.limits.min_password_length {
|
if payload.password.len() < state.config.limits.min_password_length {
|
||||||
return Json(AuthResponse {
|
return Json(AuthResponse {
|
||||||
success: false,
|
success: false,
|
||||||
message: format!("Password must be at least {} characters", state.config.limits.min_password_length),
|
message: format!(
|
||||||
|
"Password must be at least {} characters",
|
||||||
|
state.config.limits.min_password_length
|
||||||
|
),
|
||||||
username: None,
|
username: None,
|
||||||
token: None,
|
token: None,
|
||||||
});
|
});
|
||||||
@@ -363,14 +367,12 @@ async fn register_handler(
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Insert user into database
|
// Insert user into database
|
||||||
let result = sqlx::query(
|
let result = sqlx::query("INSERT INTO users (phone, username, password_hash) VALUES (?, ?, ?)")
|
||||||
"INSERT INTO users (phone, username, password_hash) VALUES (?, ?, ?)"
|
.bind(&payload.phone)
|
||||||
)
|
.bind(&payload.username)
|
||||||
.bind(&payload.phone)
|
.bind(&password_hash)
|
||||||
.bind(&payload.username)
|
.execute(&state.db_pool)
|
||||||
.bind(&password_hash)
|
.await;
|
||||||
.execute(&state.db_pool)
|
|
||||||
.await;
|
|
||||||
|
|
||||||
match result {
|
match result {
|
||||||
Ok(_) => {
|
Ok(_) => {
|
||||||
@@ -380,7 +382,7 @@ async fn register_handler(
|
|||||||
|
|
||||||
// Store session
|
// Store session
|
||||||
let _ = sqlx::query(
|
let _ = sqlx::query(
|
||||||
"INSERT INTO sessions (token, username, phone, expires_at) VALUES (?, ?, ?, ?)"
|
"INSERT INTO sessions (token, username, phone, expires_at) VALUES (?, ?, ?, ?)",
|
||||||
)
|
)
|
||||||
.bind(&token)
|
.bind(&token)
|
||||||
.bind(&payload.username)
|
.bind(&payload.username)
|
||||||
@@ -397,9 +399,15 @@ async fn register_handler(
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
let error_message = if e.to_string().contains("UNIQUE constraint failed: users.phone") {
|
let error_message = if e
|
||||||
|
.to_string()
|
||||||
|
.contains("UNIQUE constraint failed: users.phone")
|
||||||
|
{
|
||||||
"Phone number already registered".to_string()
|
"Phone number already registered".to_string()
|
||||||
} else if e.to_string().contains("UNIQUE constraint failed: users.username") {
|
} else if e
|
||||||
|
.to_string()
|
||||||
|
.contains("UNIQUE constraint failed: users.username")
|
||||||
|
{
|
||||||
"Username already taken".to_string()
|
"Username already taken".to_string()
|
||||||
} else {
|
} else {
|
||||||
"Registration failed".to_string()
|
"Registration failed".to_string()
|
||||||
@@ -420,12 +428,10 @@ async fn login_handler(
|
|||||||
Json(payload): Json<LoginRequest>,
|
Json(payload): Json<LoginRequest>,
|
||||||
) -> Json<AuthResponse> {
|
) -> Json<AuthResponse> {
|
||||||
// Get user from database
|
// Get user from database
|
||||||
let user_result = sqlx::query(
|
let user_result = sqlx::query("SELECT username, password_hash FROM users WHERE phone = ?")
|
||||||
"SELECT username, password_hash FROM users WHERE phone = ?"
|
.bind(&payload.phone)
|
||||||
)
|
.fetch_optional(&state.db_pool)
|
||||||
.bind(&payload.phone)
|
.await;
|
||||||
.fetch_optional(&state.db_pool)
|
|
||||||
.await;
|
|
||||||
|
|
||||||
match user_result {
|
match user_result {
|
||||||
Ok(Some(row)) => {
|
Ok(Some(row)) => {
|
||||||
@@ -493,12 +499,10 @@ async fn validate_token_handler(
|
|||||||
match verify_token(&state.db_pool, &payload.token).await {
|
match verify_token(&state.db_pool, &payload.token).await {
|
||||||
Ok(Some(username)) => {
|
Ok(Some(username)) => {
|
||||||
// Get user details
|
// Get user details
|
||||||
let user_result = sqlx::query(
|
let user_result = sqlx::query("SELECT phone, avatar_url FROM users WHERE username = ?")
|
||||||
"SELECT phone, avatar_url FROM users WHERE username = ?"
|
.bind(&username)
|
||||||
)
|
.fetch_optional(&state.db_pool)
|
||||||
.bind(&username)
|
.await;
|
||||||
.fetch_optional(&state.db_pool)
|
|
||||||
.await;
|
|
||||||
|
|
||||||
match user_result {
|
match user_result {
|
||||||
Ok(Some(row)) => {
|
Ok(Some(row)) => {
|
||||||
@@ -572,7 +576,7 @@ async fn debug_messages_handler(
|
|||||||
WHERE from_user = ? OR to_user = ?
|
WHERE from_user = ? OR to_user = ?
|
||||||
ORDER BY timestamp DESC
|
ORDER BY timestamp DESC
|
||||||
LIMIT 100
|
LIMIT 100
|
||||||
"#
|
"#,
|
||||||
)
|
)
|
||||||
.bind(&username)
|
.bind(&username)
|
||||||
.bind(&username)
|
.bind(&username)
|
||||||
@@ -590,7 +594,7 @@ async fn debug_messages_handler(
|
|||||||
) as partner_count
|
) as partner_count
|
||||||
FROM messages
|
FROM messages
|
||||||
WHERE from_user = ? OR to_user = ?
|
WHERE from_user = ? OR to_user = ?
|
||||||
"#
|
"#,
|
||||||
)
|
)
|
||||||
.bind(&username)
|
.bind(&username)
|
||||||
.bind(&username)
|
.bind(&username)
|
||||||
@@ -630,9 +634,7 @@ async fn debug_messages_handler(
|
|||||||
"messages": result
|
"messages": result
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => Json(serde_json::json!({"error": format!("Database error: {}", e)})),
|
||||||
Json(serde_json::json!({"error": format!("Database error: {}", e)}))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -681,7 +683,10 @@ async fn get_chats_handler(
|
|||||||
|
|
||||||
let partner_usernames = match chat_partners {
|
let partner_usernames = match chat_partners {
|
||||||
Ok(rows) => {
|
Ok(rows) => {
|
||||||
let partners: Vec<String> = rows.iter().map(|row| row.get::<String, _>("partner_username")).collect();
|
let partners: Vec<String> = rows
|
||||||
|
.iter()
|
||||||
|
.map(|row| row.get::<String, _>("partner_username"))
|
||||||
|
.collect();
|
||||||
println!("🤝 Found partner usernames: {:?}", partners);
|
println!("🤝 Found partner usernames: {:?}", partners);
|
||||||
partners
|
partners
|
||||||
}
|
}
|
||||||
@@ -706,7 +711,10 @@ async fn get_chats_handler(
|
|||||||
match message_count {
|
match message_count {
|
||||||
Ok(row) => {
|
Ok(row) => {
|
||||||
let count: i64 = row.get("count");
|
let count: i64 = row.get("count");
|
||||||
println!("📊 User {} has {} total messages in database", username, count);
|
println!(
|
||||||
|
"📊 User {} has {} total messages in database",
|
||||||
|
username, count
|
||||||
|
);
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!("❌ Error counting messages: {}", e);
|
eprintln!("❌ Error counting messages: {}", e);
|
||||||
@@ -723,12 +731,11 @@ async fn get_chats_handler(
|
|||||||
println!("📞 Getting details for partner: {}", partner_username);
|
println!("📞 Getting details for partner: {}", partner_username);
|
||||||
|
|
||||||
// Получаем информацию о пользователе
|
// Получаем информацию о пользователе
|
||||||
let user_result = sqlx::query(
|
let user_result =
|
||||||
"SELECT username, phone, avatar_url FROM users WHERE username = ?"
|
sqlx::query("SELECT username, phone, avatar_url FROM users WHERE username = ?")
|
||||||
)
|
.bind(&partner_username)
|
||||||
.bind(&partner_username)
|
.fetch_optional(&state.db_pool)
|
||||||
.fetch_optional(&state.db_pool)
|
.await;
|
||||||
.await;
|
|
||||||
|
|
||||||
match user_result {
|
match user_result {
|
||||||
Ok(Some(user_row)) => {
|
Ok(Some(user_row)) => {
|
||||||
@@ -761,7 +768,10 @@ async fn get_chats_handler(
|
|||||||
Ok(Some(row)) => {
|
Ok(Some(row)) => {
|
||||||
let content: String = row.get("content");
|
let content: String = row.get("content");
|
||||||
let timestamp: i64 = row.get("timestamp");
|
let timestamp: i64 = row.get("timestamp");
|
||||||
println!("💬 Last message with {}: '{}' at {}", partner_name, content, timestamp);
|
println!(
|
||||||
|
"💬 Last message with {}: '{}' at {}",
|
||||||
|
partner_name, content, timestamp
|
||||||
|
);
|
||||||
(Some(content), Some(timestamp))
|
(Some(content), Some(timestamp))
|
||||||
}
|
}
|
||||||
Ok(None) => {
|
Ok(None) => {
|
||||||
@@ -800,27 +810,37 @@ async fn get_chats_handler(
|
|||||||
unread_count,
|
unread_count,
|
||||||
};
|
};
|
||||||
|
|
||||||
println!("✅ Added chat with {} (phone: {}), last_message: {:?}, unread: {}",
|
println!(
|
||||||
chat.username, chat.phone, chat.last_message, chat.unread_count);
|
"✅ Added chat with {} (phone: {}), last_message: {:?}, unread: {}",
|
||||||
|
chat.username, chat.phone, chat.last_message, chat.unread_count
|
||||||
|
);
|
||||||
chats.push(chat);
|
chats.push(chat);
|
||||||
}
|
}
|
||||||
Ok(None) => {
|
Ok(None) => {
|
||||||
eprintln!("❌ User not found: {}", partner_username);
|
eprintln!("❌ User not found: {}", partner_username);
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!("❌ Error fetching user details for {}: {}", partner_username, e);
|
eprintln!(
|
||||||
|
"❌ Error fetching user details for {}: {}",
|
||||||
|
partner_username, e
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Сортируем по времени последнего сообщения (новые сверху)
|
// Сортируем по времени последнего сообщения (новые сверху)
|
||||||
chats.sort_by(|a, b| {
|
chats.sort_by(|a, b| {
|
||||||
b.last_message_time.unwrap_or(0).cmp(&a.last_message_time.unwrap_or(0))
|
b.last_message_time
|
||||||
|
.unwrap_or(0)
|
||||||
|
.cmp(&a.last_message_time.unwrap_or(0))
|
||||||
});
|
});
|
||||||
|
|
||||||
println!("🎉 Final chat list for {}: {} chats", username, chats.len());
|
println!("🎉 Final chat list for {}: {} chats", username, chats.len());
|
||||||
for chat in &chats {
|
for chat in &chats {
|
||||||
println!(" - {}: {:?} (unread: {})", chat.username, chat.last_message, chat.unread_count);
|
println!(
|
||||||
|
" - {}: {:?} (unread: {})",
|
||||||
|
chat.username, chat.last_message, chat.unread_count
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
Json(chats)
|
Json(chats)
|
||||||
@@ -830,20 +850,20 @@ async fn get_chats_handler(
|
|||||||
async fn search_users_handler(
|
async fn search_users_handler(
|
||||||
State(state): State<Arc<AppState>>,
|
State(state): State<Arc<AppState>>,
|
||||||
Query(params): Query<SearchQuery>,
|
Query(params): Query<SearchQuery>,
|
||||||
headers: axum::http::HeaderMap,
|
// headers: axum::http::HeaderMap,
|
||||||
) -> Json<Vec<ChatPartner>> {
|
) -> Json<Vec<ChatPartner>> {
|
||||||
// Extract token from header
|
// Extract token from header
|
||||||
let token = if let Some(auth_header) = headers.get("authorization") {
|
// let token = if let Some(auth_header) = headers.get("authorization") {
|
||||||
auth_header.to_str().unwrap_or("").replace("Bearer ", "")
|
// auth_header.to_str().unwrap_or("").replace("Bearer ", "")
|
||||||
} else {
|
// } else {
|
||||||
return Json(Vec::new());
|
// return Json(Vec::new());
|
||||||
};
|
// };
|
||||||
|
|
||||||
// Get current user from token
|
// Get current user from token
|
||||||
let current_user = match verify_token(&state.db_pool, &token).await {
|
// let current_user = match verify_token(&state.db_pool, &token).await {
|
||||||
Ok(Some(user)) => user,
|
// Ok(Some(user)) => user,
|
||||||
_ => return Json(Vec::new()),
|
// _ => return Json(Vec::new()),
|
||||||
};
|
// };
|
||||||
|
|
||||||
let search_pattern = format!("%{}%", params.q);
|
let search_pattern = format!("%{}%", params.q);
|
||||||
|
|
||||||
@@ -852,13 +872,13 @@ async fn search_users_handler(
|
|||||||
SELECT username, phone, avatar_url
|
SELECT username, phone, avatar_url
|
||||||
FROM users
|
FROM users
|
||||||
WHERE (username LIKE ? OR phone LIKE ?)
|
WHERE (username LIKE ? OR phone LIKE ?)
|
||||||
AND username != ?
|
|
||||||
LIMIT 20
|
LIMIT 20
|
||||||
"#
|
"#,
|
||||||
)
|
)
|
||||||
|
// AND username != ?
|
||||||
.bind(&search_pattern)
|
.bind(&search_pattern)
|
||||||
.bind(&search_pattern)
|
.bind(&search_pattern)
|
||||||
.bind(¤t_user)
|
// .bind(¤t_user)
|
||||||
.fetch_all(&state.db_pool)
|
.fetch_all(&state.db_pool)
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
@@ -936,19 +956,19 @@ async fn delete_message_handler(
|
|||||||
// Get current user from token
|
// Get current user from token
|
||||||
let username = match verify_token(&state.db_pool, &token).await {
|
let username = match verify_token(&state.db_pool, &token).await {
|
||||||
Ok(Some(user)) => user,
|
Ok(Some(user)) => user,
|
||||||
_ => return Json(DeleteMessageResponse {
|
_ => {
|
||||||
success: false,
|
return Json(DeleteMessageResponse {
|
||||||
message: "Invalid token".to_string(),
|
success: false,
|
||||||
}),
|
message: "Invalid token".to_string(),
|
||||||
|
});
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Получаем информацию о сообщении
|
// Получаем информацию о сообщении
|
||||||
let message_result = sqlx::query(
|
let message_result = sqlx::query("SELECT from_user, to_user FROM messages WHERE id = ?")
|
||||||
"SELECT from_user, to_user FROM messages WHERE id = ?"
|
.bind(&payload.message_id)
|
||||||
)
|
.fetch_optional(&state.db_pool)
|
||||||
.bind(&payload.message_id)
|
.await;
|
||||||
.fetch_optional(&state.db_pool)
|
|
||||||
.await;
|
|
||||||
|
|
||||||
let message = match message_result {
|
let message = match message_result {
|
||||||
Ok(Some(row)) => row,
|
Ok(Some(row)) => row,
|
||||||
@@ -987,12 +1007,10 @@ async fn delete_message_handler(
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
let result = sqlx::query(
|
let result = sqlx::query("UPDATE messages SET deleted_for_everyone = TRUE WHERE id = ?")
|
||||||
"UPDATE messages SET deleted_for_everyone = TRUE WHERE id = ?"
|
.bind(&payload.message_id)
|
||||||
)
|
.execute(&state.db_pool)
|
||||||
.bind(&payload.message_id)
|
.await;
|
||||||
.execute(&state.db_pool)
|
|
||||||
.await;
|
|
||||||
|
|
||||||
match result {
|
match result {
|
||||||
Ok(_) => {
|
Ok(_) => {
|
||||||
@@ -1028,7 +1046,10 @@ async fn delete_message_handler(
|
|||||||
"deleted_for_receiver"
|
"deleted_for_receiver"
|
||||||
};
|
};
|
||||||
|
|
||||||
let query = format!("UPDATE messages SET {} = TRUE WHERE id = ?", field_to_update);
|
let query = format!(
|
||||||
|
"UPDATE messages SET {} = TRUE WHERE id = ?",
|
||||||
|
field_to_update
|
||||||
|
);
|
||||||
|
|
||||||
let result = sqlx::query(&query)
|
let result = sqlx::query(&query)
|
||||||
.bind(&payload.message_id)
|
.bind(&payload.message_id)
|
||||||
@@ -1071,11 +1092,13 @@ async fn upload_avatar_handler(
|
|||||||
// Get current user from token
|
// Get current user from token
|
||||||
let username = match verify_token(&state.db_pool, &token).await {
|
let username = match verify_token(&state.db_pool, &token).await {
|
||||||
Ok(Some(user)) => user,
|
Ok(Some(user)) => user,
|
||||||
_ => return Json(UploadAvatarResponse {
|
_ => {
|
||||||
success: false,
|
return Json(UploadAvatarResponse {
|
||||||
avatar_url: None,
|
success: false,
|
||||||
message: "Invalid token".to_string(),
|
avatar_url: None,
|
||||||
}),
|
message: "Invalid token".to_string(),
|
||||||
|
});
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Process multipart form
|
// Process multipart form
|
||||||
@@ -1090,7 +1113,10 @@ async fn upload_avatar_handler(
|
|||||||
return Json(UploadAvatarResponse {
|
return Json(UploadAvatarResponse {
|
||||||
success: false,
|
success: false,
|
||||||
avatar_url: None,
|
avatar_url: None,
|
||||||
message: format!("Image too large (max {} bytes)", state.config.files.max_avatar_size),
|
message: format!(
|
||||||
|
"Image too large (max {} bytes)",
|
||||||
|
state.config.files.max_avatar_size
|
||||||
|
),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1114,13 +1140,11 @@ async fn upload_avatar_handler(
|
|||||||
let avatar_url = format!("/avatars/{}", filename);
|
let avatar_url = format!("/avatars/{}", filename);
|
||||||
|
|
||||||
// Update user in database
|
// Update user in database
|
||||||
let result = sqlx::query(
|
let result = sqlx::query("UPDATE users SET avatar_url = ? WHERE username = ?")
|
||||||
"UPDATE users SET avatar_url = ? WHERE username = ?"
|
.bind(&avatar_url)
|
||||||
)
|
.bind(&username)
|
||||||
.bind(&avatar_url)
|
.execute(&state.db_pool)
|
||||||
.bind(&username)
|
.await;
|
||||||
.execute(&state.db_pool)
|
|
||||||
.await;
|
|
||||||
|
|
||||||
match result {
|
match result {
|
||||||
Ok(_) => {
|
Ok(_) => {
|
||||||
@@ -1195,29 +1219,28 @@ async fn profile_handler(
|
|||||||
// Get current user from token
|
// Get current user from token
|
||||||
let username = match verify_token(&state.db_pool, &token).await {
|
let username = match verify_token(&state.db_pool, &token).await {
|
||||||
Ok(Some(user)) => user,
|
Ok(Some(user)) => user,
|
||||||
_ => return Json(UserProfile {
|
_ => {
|
||||||
username: "user".to_string(),
|
return Json(UserProfile {
|
||||||
phone: "+1234567890".to_string(),
|
username: "user".to_string(),
|
||||||
avatar_url: None,
|
phone: "+1234567890".to_string(),
|
||||||
}),
|
avatar_url: None,
|
||||||
|
});
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Get user details
|
// Get user details
|
||||||
let user_result = sqlx::query(
|
let user_result =
|
||||||
"SELECT username, phone, avatar_url FROM users WHERE username = ?"
|
sqlx::query("SELECT username, phone, avatar_url FROM users WHERE username = ?")
|
||||||
)
|
.bind(&username)
|
||||||
.bind(&username)
|
.fetch_optional(&state.db_pool)
|
||||||
.fetch_optional(&state.db_pool)
|
.await;
|
||||||
.await;
|
|
||||||
|
|
||||||
match user_result {
|
match user_result {
|
||||||
Ok(Some(row)) => {
|
Ok(Some(row)) => Json(UserProfile {
|
||||||
Json(UserProfile {
|
username: row.get("username"),
|
||||||
username: row.get("username"),
|
phone: row.get("phone"),
|
||||||
phone: row.get("phone"),
|
avatar_url: row.get("avatar_url"),
|
||||||
avatar_url: row.get("avatar_url"),
|
}),
|
||||||
})
|
|
||||||
}
|
|
||||||
_ => Json(UserProfile {
|
_ => Json(UserProfile {
|
||||||
username: "user".to_string(),
|
username: "user".to_string(),
|
||||||
phone: "+1234567890".to_string(),
|
phone: "+1234567890".to_string(),
|
||||||
@@ -1227,10 +1250,7 @@ async fn profile_handler(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// WebSocket handlers
|
// WebSocket handlers
|
||||||
async fn websocket_handler(
|
async fn websocket_handler(ws: WebSocketUpgrade, State(state): State<Arc<AppState>>) -> Response {
|
||||||
ws: WebSocketUpgrade,
|
|
||||||
State(state): State<Arc<AppState>>,
|
|
||||||
) -> Response {
|
|
||||||
ws.on_upgrade(|socket| handle_websocket(socket, state))
|
ws.on_upgrade(|socket| handle_websocket(socket, state))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1243,32 +1263,43 @@ async fn handle_websocket(socket: WebSocket, state: Arc<AppState>) {
|
|||||||
Some(Ok(Message::Text(auth_msg))) => {
|
Some(Ok(Message::Text(auth_msg))) => {
|
||||||
match serde_json::from_str::<serde_json::Value>(&auth_msg) {
|
match serde_json::from_str::<serde_json::Value>(&auth_msg) {
|
||||||
Ok(auth) => {
|
Ok(auth) => {
|
||||||
if let (Some(token), Some(auth_type)) = (auth["token"].as_str(), auth["type"].as_str()) {
|
if let (Some(token), Some(auth_type)) =
|
||||||
|
(auth["token"].as_str(), auth["type"].as_str())
|
||||||
|
{
|
||||||
if auth_type == "auth" {
|
if auth_type == "auth" {
|
||||||
match verify_token(&state.db_pool, token).await {
|
match verify_token(&state.db_pool, token).await {
|
||||||
Ok(Some(user_username)) => {
|
Ok(Some(user_username)) => {
|
||||||
if state.users.read().await.contains_key(&user_username) {
|
if state.users.read().await.contains_key(&user_username) {
|
||||||
let _ = sender.send(Message::Text(
|
let _ = sender
|
||||||
serde_json::json!({
|
.send(Message::Text(
|
||||||
"type": "error",
|
serde_json::json!({
|
||||||
"content": "User already connected"
|
"type": "error",
|
||||||
}).to_string(),
|
"content": "User already connected"
|
||||||
)).await;
|
})
|
||||||
|
.to_string(),
|
||||||
|
))
|
||||||
|
.await;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
state.users.write().await.insert(user_username.clone(), tx);
|
state.users.write().await.insert(user_username.clone(), tx);
|
||||||
|
|
||||||
let _ = sender.send(Message::Text(
|
let _ = sender
|
||||||
serde_json::json!({
|
.send(Message::Text(
|
||||||
"type": "system",
|
serde_json::json!({
|
||||||
"content": "Connected successfully"
|
"type": "system",
|
||||||
}).to_string(),
|
"content": "Connected successfully"
|
||||||
)).await;
|
})
|
||||||
|
.to_string(),
|
||||||
|
))
|
||||||
|
.await;
|
||||||
|
|
||||||
broadcast_user_list(&state.users).await;
|
broadcast_user_list(&state.users).await;
|
||||||
|
|
||||||
if let Ok(messages) = get_message_history(&state.db_pool, &user_username, "").await {
|
if let Ok(messages) =
|
||||||
|
get_message_history(&state.db_pool, &user_username, "")
|
||||||
|
.await
|
||||||
|
{
|
||||||
for msg in messages {
|
for msg in messages {
|
||||||
let message_json = serde_json::to_string(&msg).unwrap();
|
let message_json = serde_json::to_string(&msg).unwrap();
|
||||||
let _ = sender.send(Message::Text(message_json)).await;
|
let _ = sender.send(Message::Text(message_json)).await;
|
||||||
@@ -1278,26 +1309,36 @@ async fn handle_websocket(socket: WebSocket, state: Arc<AppState>) {
|
|||||||
user_username
|
user_username
|
||||||
}
|
}
|
||||||
Ok(None) => {
|
Ok(None) => {
|
||||||
let _ = sender.send(Message::Text(
|
let _ = sender
|
||||||
serde_json::json!({
|
.send(Message::Text(
|
||||||
"type": "error",
|
serde_json::json!({
|
||||||
"content": "Invalid or expired token"
|
"type": "error",
|
||||||
}).to_string(),
|
"content": "Invalid or expired token"
|
||||||
)).await;
|
})
|
||||||
|
.to_string(),
|
||||||
|
))
|
||||||
|
.await;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Err(_) => {
|
Err(_) => {
|
||||||
let _ = sender.send(Message::Text(
|
let _ = sender
|
||||||
serde_json::json!({
|
.send(Message::Text(
|
||||||
"type": "error",
|
serde_json::json!({
|
||||||
"content": "Authentication error"
|
"type": "error",
|
||||||
}).to_string(),
|
"content": "Authentication error"
|
||||||
)).await;
|
})
|
||||||
|
.to_string(),
|
||||||
|
))
|
||||||
|
.await;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else { return; }
|
} else {
|
||||||
} else { return; }
|
return;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Err(_) => return,
|
Err(_) => return,
|
||||||
}
|
}
|
||||||
@@ -1342,20 +1383,22 @@ async fn handle_websocket(socket: WebSocket, state: Arc<AppState>) {
|
|||||||
let message_json = serde_json::to_string(&chat_msg).unwrap();
|
let message_json = serde_json::to_string(&chat_msg).unwrap();
|
||||||
let _ = sender_tx.send(Message::Text(message_json));
|
let _ = sender_tx.send(Message::Text(message_json));
|
||||||
}
|
}
|
||||||
} else if let Ok(delete_msg) = serde_json::from_str::<serde_json::Value>(&text) {
|
} // else if let Ok(delete_msg) = serde_json::from_str::<serde_json::Value>(&text)
|
||||||
// Обработка удаления сообщений через WebSocket
|
// {
|
||||||
if let (Some(msg_type), Some(message_id)) = (
|
// Обработка удаления сообщений через WebSocket
|
||||||
delete_msg["type"].as_str(),
|
// if let (Some(msg_type), Some(_message_id)) = (
|
||||||
delete_msg["message_id"].as_str()
|
// delete_msg["type"].as_str(),
|
||||||
) {
|
// delete_msg["message_id"].as_str(),
|
||||||
if msg_type == "delete_message" {
|
// ) {
|
||||||
let for_everyone = delete_msg["for_everyone"].as_bool().unwrap_or(false);
|
// if msg_type == "delete_message" {
|
||||||
|
// let for_everyone =
|
||||||
|
// delete_msg["for_everyone"].as_bool().unwrap_or(false);
|
||||||
|
|
||||||
// Здесь можно добавить логику удаления через WebSocket
|
// // Здесь можно добавить логику удаления через WebSocket
|
||||||
// Пока что используем HTTP API
|
// // Пока что используем HTTP API
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
Ok(Message::Close(_)) => break,
|
Ok(Message::Close(_)) => break,
|
||||||
Err(_) => break,
|
Err(_) => break,
|
||||||
@@ -1385,7 +1428,7 @@ fn generate_token() -> String {
|
|||||||
|
|
||||||
async fn verify_token(pool: &SqlitePool, token: &str) -> Result<Option<String>, sqlx::Error> {
|
async fn verify_token(pool: &SqlitePool, token: &str) -> Result<Option<String>, sqlx::Error> {
|
||||||
let result = sqlx::query(
|
let result = sqlx::query(
|
||||||
"SELECT username FROM sessions WHERE token = ? AND expires_at > datetime('now')"
|
"SELECT username FROM sessions WHERE token = ? AND expires_at > datetime('now')",
|
||||||
)
|
)
|
||||||
.bind(token)
|
.bind(token)
|
||||||
.fetch_optional(pool)
|
.fetch_optional(pool)
|
||||||
@@ -1422,7 +1465,11 @@ async fn save_message(pool: &SqlitePool, msg: &ChatMessage) -> Result<(), sqlx::
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn get_message_history(pool: &SqlitePool, username: &str, other_user: &str) -> Result<Vec<ChatMessage>, sqlx::Error> {
|
async fn get_message_history(
|
||||||
|
pool: &SqlitePool,
|
||||||
|
username: &str,
|
||||||
|
other_user: &str,
|
||||||
|
) -> Result<Vec<ChatMessage>, sqlx::Error> {
|
||||||
// Если указан конкретный собеседник, помечаем сообщения как прочитанные
|
// Если указан конкретный собеседник, помечаем сообщения как прочитанные
|
||||||
if !other_user.is_empty() {
|
if !other_user.is_empty() {
|
||||||
mark_messages_as_read(pool, other_user, username).await?;
|
mark_messages_as_read(pool, other_user, username).await?;
|
||||||
@@ -1486,7 +1533,11 @@ async fn get_message_history(pool: &SqlitePool, username: &str, other_user: &str
|
|||||||
Ok(messages)
|
Ok(messages)
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn mark_messages_as_read(pool: &SqlitePool, from_user: &str, to_user: &str) -> Result<(), sqlx::Error> {
|
async fn mark_messages_as_read(
|
||||||
|
pool: &SqlitePool,
|
||||||
|
from_user: &str,
|
||||||
|
to_user: &str,
|
||||||
|
) -> Result<(), sqlx::Error> {
|
||||||
let result = sqlx::query(
|
let result = sqlx::query(
|
||||||
"UPDATE messages SET read = TRUE WHERE from_user = ? AND to_user = ? AND read = FALSE AND deleted_for_everyone = FALSE"
|
"UPDATE messages SET read = TRUE WHERE from_user = ? AND to_user = ? AND read = FALSE AND deleted_for_everyone = FALSE"
|
||||||
)
|
)
|
||||||
@@ -1495,6 +1546,11 @@ async fn mark_messages_as_read(pool: &SqlitePool, from_user: &str, to_user: &str
|
|||||||
.execute(pool)
|
.execute(pool)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
println!("✅ Marked {} messages as read from {} to {}", result.rows_affected(), from_user, to_user);
|
println!(
|
||||||
|
"✅ Marked {} messages as read from {} to {}",
|
||||||
|
result.rows_affected(),
|
||||||
|
from_user,
|
||||||
|
to_user
|
||||||
|
);
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user